Reworked AnimationManager's tick to make sure all action takes place

on the AWT thread.  Explicitly set the panel to be opaque and
non-double-buffered for better performance.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@154 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/media/sprite/AnimationManager.java

@@ -1,10 +1,11 @@
 //
-// $Id: AnimationManager.java,v 1.4 2001/08/02 18:59:00 shaper Exp $
+// $Id: AnimationManager.java,v 1.5 2001/08/02 23:12:19 shaper Exp $
 
 package com.threerings.miso.sprite;
 
-import java.awt.Component;
 import java.util.ArrayList;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
 
 import com.samskivert.util.Interval;
 import com.samskivert.util.IntervalManager;
@@ -24,7 +25,7 @@ public class AnimationManager implements Interval, PerformanceObserver
      * Construct and initialize the animation manager with a sprite
      * manager and the panel that animations will take place within.
      */
-    public AnimationManager (SpriteManager spritemgr, Component target,
+    public AnimationManager (SpriteManager spritemgr, JComponent target,
                              SceneView view)
     {
         // save off references to the objects we care about
@@ -32,6 +33,14 @@ public class AnimationManager implements Interval, PerformanceObserver
         _target = target;
         _view = view;
 
+        // create a ticker for queueing up tick requests on the AWT thread
+        _ticker = new Runnable() {
+            public void run ()
+            {
+                tick();
+            }
+        };
+
         // register to monitor the refresh action 
         PerformanceMonitor.register(this, "refresh", 1000);
 
@@ -39,11 +48,32 @@ public class AnimationManager implements Interval, PerformanceObserver
         IntervalManager.register(this, REFRESH_INTERVAL, null, true);
     }
 
+    protected synchronized boolean requestTick ()
+    {
+        if (_ticking++ > 0) return false;
+        return true;
+    }
+
+    protected synchronized boolean finishedTick ()
+    {
+        if (--_ticking > 0) {
+            _ticking = 1;
+            return true;
+        }
+
+        return false;
+    }
+
     public void intervalExpired (int id, Object arg)
     {
-        // refresh the display
-        _target.repaint();
+        if (requestTick()) {
+            // throw the tick task on the AWT thread task queue
+            SwingUtilities.invokeLater(_ticker);
+        }
+    }
 
+    protected void tick ()
+    {
         // call tick on all sprites
         _spritemgr.tick();
 
@@ -52,7 +82,18 @@ public class AnimationManager implements Interval, PerformanceObserver
         _view.invalidateRects(rects);
 
         // update frame-rate information
-        //PerformanceMonitor.tick(this, "refresh");
+        PerformanceMonitor.tick(AnimationManager.this, "refresh");
+
+        // refresh the display
+        _target.paintImmediately(_target.getBounds());
+
+        if (finishedTick()) {
+            // finishedTick returning true means there's been a
+            // request for at least one more tick since we started
+            // this tick, so we want to queue up another tick
+            // immediately
+            SwingUtilities.invokeLater(_ticker);
+        }
     }
 
     public void checkpoint (String name, int ticks)
@@ -60,17 +101,23 @@ public class AnimationManager implements Interval, PerformanceObserver
         Log.info(name + " [ticks=" + ticks + "].");
     }
 
+    /** The ticker runnable that we put on the AWT thread periodically. */
+    protected Runnable _ticker;
+
     /** The desired number of refresh operations per second. */
     protected static final int FRAME_RATE = 20;
 
     /** The milliseconds to sleep to obtain desired frame rate. */
     protected static final long REFRESH_INTERVAL = 1000 / FRAME_RATE;
 
+    /** The number of outstanding tick requests. */
+    protected int _ticking = 0;
+
     /** The sprite manager. */
     protected SpriteManager _spritemgr;
 
     /** The component to refresh. */
-    protected Component _target;
+    protected JComponent _target;
 
     /** The scene view. */
     protected SceneView _view;

tests/src/java/com/threerings/miso/viewer/SceneViewPanel.java

@@ -1,5 +1,5 @@
 //
-// $Id: SceneViewPanel.java,v 1.7 2001/08/02 20:43:03 shaper Exp $
+// $Id: SceneViewPanel.java,v 1.8 2001/08/02 23:12:19 shaper Exp $
 
 package com.threerings.miso.viewer;
 
@@ -54,7 +54,8 @@ public class SceneViewPanel extends JPanel
         // load up the initial scene
         prepareStartingScene();
 
-        //setDoubleBuffered(false);
+        setDoubleBuffered(false);
+        setOpaque(true);
 
         PerformanceMonitor.register(this, "paint", 1000);
     }