#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>
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;
}
- void pushed(Engine& engine)
- {
- mEngine = &engine;
- }
-
- void popped(Engine& engine)
+ void removedFromCore()
{
- if (mTo) engine.push(mTo);
+ if (mTo) core.push(mTo);
}
void update(Scalar t, Scalar dt)
if (mInterp.isDone())
{
// to should /replace/ this
- mEngine->pop(this);
+ core.pop(this);
}
}
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);
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);