refactoring needed for win32 crash

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

diff --git a/src/Moof/Transition.hh b/src/Moof/Transition.hh
index ab09c02a582ddd7f5320a18dbaa284c3d8b559bb..dfc2602ec988bbe3bb6fd692a2cd56bd86ed036e 100644 (file)
--- a/src/Moof/Transition.hh
+++ b/src/Moof/Transition.hh
@@ -31,7 +31,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
 #include <Moof/Interpolator.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Log.hh>
@@ -66,22 +66,22 @@ public:
        }
 
 
-       void popped(Engine& engine)
+       void removedFromCore()
        {
-               if (mTo) engine.push(mTo);
+               if (mTo) core.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())
                {
                        // to should /replace/ this
-                       engine.pop(this);
+                       core.pop(this);
                }
        }
 
@@ -97,15 +97,15 @@ public:
                glMatrixMode(GL_MODELVIEW);
                glPushMatrix();
                glLoadIdentity();
-               glColor4(1.0, 1.0, 1.0, alpha);
+               glColor(1.0, 1.0, 1.0, alpha);
                Mf::Texture::resetBind();
 
                //glRectf(-1.0f, -1.0f, 1.0f, 1.0f);
                glBegin(GL_QUADS);
-                       glVertex3f(-1.0, -1.0, -0.1);
-                       glVertex3f(1.0, -1.0, -0.1);
-                       glVertex3f(1.0, 1.0, -0.1);
-                       glVertex3f(-1.0, 1.0, -0.1);
+                       glVertex(-1.0, -1.0, -0.1);
+                       glVertex(1.0, -1.0, -0.1);
+                       glVertex(1.0, 1.0, -0.1);
+                       glVertex(-1.0, 1.0, -0.1);
                glEnd();
 
                glDisable(GL_BLEND);
@@ -118,10 +118,10 @@ public:
                glPopMatrix();
        }
 
-       void draw(Engine& engine, Scalar alpha) const
+       void draw(Scalar alpha) const
        {
                Scalar a = mInterp.getState(alpha);
-               logDebug("transition state: %f", a);
+               logInfo << "transition state: " << a << std::endl;
 
                //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -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;
        }