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

diff --git a/src/Moof/Transition.hh b/src/Moof/Transition.hh
index f1e1bcb..d65d82d 100644
--- a/src/Moof/Transition.hh
+++ b/src/Moof/Transition.hh
@@ -1,37 +1,20 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_TRANSITION_HH_
 #define _MOOF_TRANSITION_HH_
 
 #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>
@@ -51,15 +34,12 @@ class Transition : public Layer
 
 	T		mInterp;
 
-	Engine*	mEngine;
-
 public:
 
 	Transition(LayerP t, LayerP f, const T& interp) :
 		mTo(t),
 		mFrom(f),
-		mInterp(interp),
-		mEngine(0) {}
+		mInterp(interp) {}
 
 	typedef boost::shared_ptr<Transition> Ptr;
 
@@ -69,14 +49,9 @@ public:
 	}
 
 
-	void pushed(Engine& engine)
+	void removedFromCore()
 	{
-		mEngine = &engine;
-	}
-
-	void popped(Engine& engine)
-	{
-		if (mTo) engine.push(mTo);
+		if (mTo) core.push(mTo);
 	}
 
 	void update(Scalar t, Scalar dt)
@@ -89,7 +64,7 @@ public:
 		if (mInterp.isDone())
 		{
 			// to should /replace/ this
-			mEngine->pop(this);
+			core.pop(this);
 		}
 	}
 
@@ -105,15 +80,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);
@@ -129,7 +104,7 @@ public:
 	void draw(Scalar alpha) const
 	{
 		Scalar a = mInterp.getState(alpha);
-		logInfo("draw state: %f", a);
+		logInfo << "transition state: " << a << std::endl;
 
 		//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -173,5 +148,3 @@ public:
 
 #endif // _MOOF_TRANSITION_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-