X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTransition.hh;h=194caf53f09c2a137c8e2504b3d9756abba7e031;hp=d65d82d20bd17321ac4288f2c651978f955aa017;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Moof/Transition.hh b/src/Moof/Transition.hh
index d65d82d..194caf5 100644
--- 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_
 
@@ -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;
 	}