ch16 revisions

ChrisMayfield · ChrisMayfield · commit 33b1e75301e0 · 2020-06-16T14:41:35.000-04:00
diff --git a/ch16/Automaton.java b/ch16/Automaton.java
@@ -13,23 +13,6 @@ public abstract class Automaton {
      */
     public abstract void update();
 
-    /**
-     * Creates a JFrame and runs the automaton.
-     * 
-     * @param title the frame title
-     * @param rate frames per second
-     */
-    public void run(String title, int rate) {
-        // set up the window frame
-        JFrame frame = new JFrame(title);
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        frame.setResizable(false);
-        frame.add(this.grid);
-        frame.pack();
-        frame.setVisible(true);
-        this.mainloop(rate);
-    }
-
     /**
      * The simulation loop.
      * 
@@ -51,4 +34,21 @@ private void mainloop(int rate) {
         }
     }
 
+    /**
+     * Creates a JFrame and runs the automaton.
+     * 
+     * @param title the frame title
+     * @param rate frames per second
+     */
+    public void run(String title, int rate) {
+        // set up the window frame
+        JFrame frame = new JFrame(title);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setResizable(false);
+        frame.add(this.grid);
+        frame.pack();
+        frame.setVisible(true);
+        this.mainloop(rate);
+    }
+
 }
diff --git a/ch16/Langton.java b/ch16/Langton.java
@@ -1,8 +1,11 @@
+import javax.swing.JFrame;
+
 /**
  * Langton's Ant.
  */
-public class Langton extends Automaton {
+public class Langton {
 
+    private GridCanvas grid;
     private int xpos;
     private int ypos;
     private int head; // 0=North, 1=East, 2=South, 3=West
@@ -59,6 +62,27 @@ public void update() {
         moveAnt();
     }
 
+    /**
+     * The simulation loop.
+     * 
+     * @param rate frames per second
+     */
+    private void mainloop() {
+        while (true) {
+
+            // update the drawing
+            this.update();
+            grid.repaint();
+
+            // delay the simulation
+            try {
+                Thread.sleep(2);
+            } catch (InterruptedException e) {
+                // do nothing
+            }
+        }
+    }
+
     /**
      * Creates and runs the simulation.
      * 
@@ -67,7 +91,13 @@ public void update() {
     public static void main(String[] args) {
         String title = "Langton's Ant";
         Langton game = new Langton(61, 61);
-        game.run(title, 750);
+        JFrame frame = new JFrame(title);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setResizable(false);
+        frame.add(game.grid);
+        frame.pack();
+        frame.setVisible(true);
+        game.mainloop();
     }
 
 }
