#include "YoinkApp.hh"
-#include <SDL/SDL_sound.h>
-#include <AL/al.h>
-#include <AL/alut.h>
-
#if HAVE_CONFIG_H
#include "config.h"
#endif
YoinkApp::YoinkApp(int argc, char* argv[]) :
Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile()),
- music("NightFusion"),
+ music("BeatTheCube"),
punchSound("RobotPunch")
{
- Mf::Dispatcher::getInstance().addHandler("video.context_recreated",
+ Mf::dispatcher::addHandler("video.context_recreated",
boost::bind(&YoinkApp::contextRecreated, this, _1), this);
setupGL();
- Mf::Scalar fade[2] = {0.0, 1.0};
- musicFade.init(fade, 0.0);
- music.play();
-
- state = 0.0;
+ music.setLooping(true);
+ music.enqueue("NightFusionLoop");
+ music.stream();
heroine = Character::alloc("RobotTrooper");
heroine->getAnimation().startSequence("Run");
- font = new TilemapFont;
+ Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -1.5, 1.0};
+ interp.init(a, 2.0, Mf::Interpolator::OSCILLATE);
- Mf::Scalar coeffs[4];
- coeffs[0] = 0.0;
- coeffs[1] = 1.5;
- coeffs[2] = -0.5;
- coeffs[3] = 1.0;
- interp.init(coeffs, 1.0, Mf::Interpolator::OSCILLATE);
+ Mf::Scalar b[2] = {1.0, 0.0};
+ fadeIn.init(b, 1.0);
- Mf::Scalar coeff[2] = {1.0, 0.0};
- fadeIn.init(coeff, 0.1);
-
- testScene = new Mf::Scene("Test");
+ testScene = Mf::Scene::alloc("Test");
heroine->treeNode = testScene->getOctree()->insert(heroine);
}
YoinkApp::~YoinkApp()
{
- //delete heroine;
- delete font;
- delete testScene;
-
- Mf::Dispatcher::getInstance().removeHandler(this);
+ Mf::dispatcher::removeHandler(this);
}
void YoinkApp::contextRecreated(const Mf::Notification* note)
{
- // Whenever the context and a new one created, it probably won't contain our
- // state so we need to set that up again.
+ // Whenever the context is destroyed and a new one created, it probably
+ // won't contain our state so we need to set that up again.
setupGL();
}
void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
{
- //dt *= 0.2;
+ //dt *= 0.1;
- musicFade.update(dt);
music.update(t, dt);
- music.setGain(musicFade.getValue());
-
fadeIn.update(dt);
-
camera.update(t, dt);
-
heroine->update(t, dt);
+
+ // reinsert heroine
heroine->treeNode = testScene->getOctree()->reinsert(heroine, heroine->treeNode);
+ testScene->getOctree()->print(heroine->treeNode);
//camera.lookAt(heroine->getSphere().point);
camera.setPosition(Mf::Vector3(-heroine->current.position[0], -heroine->current.position[1], -256));
interp.update(dt);
- hud.setBar1Progress(interp.getValue());
- hud.setBar2Progress(1.0 - interp.getValue());
-
- prevstate = state;
- state += dt;
+ hud.setBar1Progress(interp.getState(dt));
+ hud.setBar2Progress(1.0 - interp.getState(dt));
}
void YoinkApp::draw(Mf::Scalar alpha)
{
- //Mf::Vector4 meh;
- //meh.random(0.0, 1.0);
- //static Mf::Vector4 c1(meh);
-
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- //Mf::Scalar drawstate = cml::lerp(prevstate, state, alpha);
- //Mf::Scalar sinstate = std::sin(drawstate);
- //Mf::Scalar cosstate = std::cos(drawstate);
-
-
glMatrixMode(GL_MODELVIEW);
- //glLoadIdentity();
-
- //glRotatef(drawstate*15.0f, 0.0, 1.0, 0.0);
- //glTranslatef(x, y, z);
glLoadMatrix(camera.getModelviewMatrix().data());
// DRAW THE SCENE
Mf::Texture::resetBind();
testScene->draw(alpha, camera);
-
-
//heroine->draw(alpha);
heroine->getAabb().draw();
-
hud.draw();
-
+ // DRAW FADE
glEnable(GL_BLEND);
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
-
- /*
- glLoadIdentity();
-
- someChar->getTilemap().bind();
- glColor3f(1.0, 1.0, 1.0);
-
- Mf::Tilemap::Index heroFrame = someChar->getAnimation().getFrame();
-
- Mf::Scalar coords[8];
- someChar->getTilemap().getTileCoords(heroFrame, coords);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3f(-1.0, 0.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(0.0, 0.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(0.0, 1.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(-1.0, 1.0, 0.0);
- glEnd();
-
-
- someChar->getTilemap().getTileCoords(heroFrame, coords,
- Mf::Tilemap::REVERSE);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3f(0.0, 0.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(1.0, 0.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(1.0, 1.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(0.0, 1.0, 0.0);
- glEnd();
-
- glColor4f(1.0,0.0,0.0,0.5);
-
- glBindTexture(GL_TEXTURE_2D, 0);
- glColor4v(c1.data());
-
- glRectd(-cosstate, -sinstate, sinstate, cosstate);
- glRectf(0.0f, 0.0f, sinstate, cosstate);
-
- font->bind();
-
- font->getTileCoords('c', coords);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3f(-1.0, 0.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(0.0, 0.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(0.0, 1.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(-1.0, 1.0, 0.0);
- glEnd();
-
- font->getTileCoords('h', coords);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3f(0.0, 0.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(1.0, 0.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(1.0, 1.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(0.0, 1.0, 0.0);
- glEnd();
-
- font->getTileCoords('a', coords);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3f(-1.0, -1.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(0.0, -1.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(0.0, 0.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(-1.0, 0.0, 0.0);
- glEnd();
-
- font->getTileCoords('z', coords);
-
- glBegin(GL_QUADS);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3(0.0, -1.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3(1.0, -1.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3(1.0, 0.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3(0.0, 0.0, 0.0);
- glEnd();
-
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glDisable(GL_DEPTH_TEST);
-
- glBindTexture(GL_TEXTURE_2D, 0);
- glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
-
- glBegin(GL_LINES);
- glVertex2f(0.0f, 0.0f);
- glVertex2v(interp.getState(alpha).data());
- glEnd();
-
- glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
- glRectf(-1.0f, -1.0f, 1.0f, 1.0f);
-
- glDisable(GL_BLEND);
- glEnable(GL_DEPTH_TEST);*/
}
void YoinkApp::handleEvent(const Mf::Event& event)
}
else if (event.key.keysym.sym == SDLK_t)
{
- Mf::Dispatcher::getInstance().dispatch("video.context_recreated");
+ Mf::dispatcher::dispatch("video.context_recreated");
break;
}
else if (event.key.keysym.sym == SDLK_p)
{
- music.togglePlayPause();
+ music.toggle();
break;
}
else if (event.key.keysym.sym == SDLK_l)
<< "Send patches and bug reports to <"
PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
-#if ! NDEBUG
- Mf::setLogLevel(Mf::DEBUGGING);
+#if YOINK_LOGLEVEL >= 4
+ Mf::setLogLevel(Mf::LOG_DEBUG);
+#elif YOINK_LOGLEVEL >= 3
+ Mf::setLogLevel(Mf::LOG_INFO);
+#elif YOINK_LOGLEVEL >= 2
+ Mf::setLogLevel(Mf::LOG_WARNING);
+#elif YOINK_LOGLEVEL >= 1
+ Mf::setLogLevel(Mf::LOG_ERROR);
+#elif YOINK_LOGLEVEL
+ Mf::setLogLevel(Mf::LOG_NONE);
#endif
int status = 0;
{
Mf::logError("unhandled exception: <<%s>>", e.what());
Mf::logInfo("it's time to crash now :-(");
- status = 1;
+ //status = 1;
+ throw e;
}
std::cout << std::endl << "Goodbye..." << std::endl << std::endl;
projects / chaz / yoink / blobdiff