initial network stuff

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

diff --git a/src/Moof/Transition.hh b/src/Moof/Transition.hh
index d65d82d20bd17321ac4288f2c651978f955aa017..2f468fc4227d8a154f94700f7ce7a7d8c3d5d335 100644 (file)
--- a/src/Moof/Transition.hh
+++ b/src/Moof/Transition.hh
@@ -9,6 +9,7 @@
 *
 **************************************************************************/
 
+#define _MOOF_TRANSITION_HH_
 #ifndef _MOOF_TRANSITION_HH_
 #define _MOOF_TRANSITION_HH_
 
@@ -26,7 +27,7 @@
 namespace Mf {
 
 
-template <typename T>
+template <class T>
 class Transition : public Layer
 {
        LayerP  mTo;
@@ -49,17 +50,17 @@ public:
        }
 
 
-       void removedFromCore()
+       void removedFromCore(Core& core)
        {
                if (mTo) core.push(mTo);
        }
 
-       void update(Scalar t, Scalar dt)
+       void update(Core& core, Scalar t, Scalar dt)
        {
                mInterp.update(t, dt);
 
-               if (mFrom) mFrom->update(t, dt);
-               if (mTo) mTo->update(t, dt);
+               if (mFrom) mFrom->update(core, t, dt);
+               if (mTo) mTo->update(core, t, dt);
 
                if (mInterp.isDone())
                {
@@ -101,7 +102,7 @@ public:
                glPopMatrix();
        }
 
-       void draw(Scalar alpha) const
+       void draw(Core& core, Scalar alpha) const
        {
                Scalar a = mInterp.getState(alpha);
                logInfo << "transition state: " << a << std::endl;
@@ -113,7 +114,7 @@ public:
                        glPushMatrix();
                        glLoadIdentity();
                        glRotate(180.0 * a, 0.0, 1.0, 0.0);
-                       mFrom->draw(alpha);
+                       mFrom->draw(core, alpha);
                        glPopMatrix();
                }
                        //drawFade(a);
@@ -123,21 +124,21 @@ public:
                        glPushMatrix();
                        glLoadIdentity();
                        glRotate(180.0 * (1.0 - a), 0.0, 1.0, 0.0);
-                       mTo->draw(alpha);
+                       mTo->draw(core, alpha);
                        glPopMatrix();
                }
                        //drawFade(1.0 - a);
        }
 
-       bool handleEvent(const Event& event)
+       bool handleEvent(Core& core, const Event& event)
        {
                if (mTo)
                {
-                       return mTo->handleEvent(event);
+                       return mTo->handleEvent(core, event);
                }
                else if (mFrom)
                {
-                       return mFrom->handleEvent(event);
+                       return mFrom->handleEvent(core, event);
                }
                return false;
        }