dispatch class not a singleton, engine is static

[chaz/yoink] / src / Moof / Transition.hh

diff --git a/src/Moof/Transition.hh b/src/Moof/Transition.hh
index 5f8a248f91a9cefb7818fd7347bc438eedba241d..f200729ec6bba01bde3ab802f7313fcaf16eefc6 100644 (file)
--- a/src/Moof/Transition.hh
+++ b/src/Moof/Transition.hh
@@ -66,17 +66,17 @@ public:
        }
 
 
-       void popped(Engine& engine)
+       void poppedFromEngine()
        {
                if (mTo) engine.push(mTo);
        }
 
-       void update(Engine& engine, Scalar t, Scalar dt)
+       void update(Scalar t, Scalar dt)
        {
                mInterp.update(t, dt);
 
-               if (mFrom) mFrom->update(engine, t, dt);
-               if (mTo) mTo->update(engine, t, dt);
+               if (mFrom) mFrom->update(t, dt);
+               if (mTo) mTo->update(t, dt);
 
                if (mInterp.isDone())
                {
@@ -118,7 +118,7 @@ public:
                glPopMatrix();
        }
 
-       void draw(Engine& engine, Scalar alpha) const
+       void draw(Scalar alpha) const
        {
                Scalar a = mInterp.getState(alpha);
                logInfo << "transition state: " << a << std::endl;
@@ -130,7 +130,7 @@ public:
                        glPushMatrix();
                        glLoadIdentity();
                        glRotate(180.0 * a, 0.0, 1.0, 0.0);
-                       mFrom->draw(engine, alpha);
+                       mFrom->draw(alpha);
                        glPopMatrix();
                }
                        //drawFade(a);
@@ -140,21 +140,21 @@ public:
                        glPushMatrix();
                        glLoadIdentity();
                        glRotate(180.0 * (1.0 - a), 0.0, 1.0, 0.0);
-                       mTo->draw(engine, alpha);
+                       mTo->draw(alpha);
                        glPopMatrix();
                }
                        //drawFade(1.0 - a);
        }
 
-       bool handleEvent(Engine& engine, const Event& event)
+       bool handleEvent(const Event& event)
        {
                if (mTo)
                {
-                       return mTo->handleEvent(engine, event);
+                       return mTo->handleEvent(event);
                }
                else if (mFrom)
                {
-                       return mFrom->handleEvent(engine, event);
+                       return mFrom->handleEvent(event);
                }
                return false;
        }