#include <iostream>
#include <string>
-#include <boost/bind.hpp>
-
#include <Moof/Exception.hh>
#include <Moof/Log.hh>
#include <Moof/Math.hh>
#include <Moof/OpenGL.hh>
#include <Moof/Settings.hh>
+#include <Moof/Thread.hh>
#include <Moof/Timer.hh>
#include <Moof/Video.hh>
heroine = Character::alloc("RobotTrooper");
heroine->getAnimation().startSequence("Run");
- Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -1.5, 1.0};
+ Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
interp.init(a, 2.0, Mf::Interpolator::OSCILLATE);
Mf::Scalar b[2] = {1.0, 0.0};
fadeIn.init(b, 1.0);
- testScene = Mf::Scene::alloc("Test");
- heroine->treeNode = testScene->getOctree()->insert(heroine);
+ octree = Mf::loadScene("Classic");
+ heroine->treeNode = octree->insert(heroine);
}
YoinkApp::~YoinkApp()
void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
{
- //dt *= 0.1;
+ //dt *= 0.7;
- music.update(t, dt);
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);
+ heroine->treeNode = octree->reinsert(heroine, heroine->treeNode);
+ octree->print(heroine->treeNode);
//camera.lookAt(heroine->getSphere().point);
- camera.setPosition(Mf::Vector3(-heroine->current.position[0], -heroine->current.position[1], -256));
+ camera.setPosition(Mf::Vector3(-heroine->current.position[0],
+ -heroine->current.position[1], -256));
interp.update(dt);
hud.setBar1Progress(interp.getState(dt));
// DRAW THE SCENE
Mf::Texture::resetBind();
- testScene->draw(alpha, camera);
+
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+ octree->drawIfVisible(alpha, camera.getFrustum());
//heroine->draw(alpha);
heroine->getAabb().draw();
punchSound.play();
break;
}
- else if (event.key.keysym.sym == SDLK_r)
- {
- testScene->refresh();
- break;
- }
else if (event.key.keysym.sym == SDLK_t)
{
Mf::dispatcher::dispatch("video.context_recreated");
case SDL_VIDEORESIZE:
glViewport(0, 0, event.resize.w, event.resize.h);
hud.resize(event.resize.w, event.resize.h);
- camera.setProjection(cml::rad(60.0), double(event.resize.w / event.resize.h), 32.0, 2500.0);
+ camera.setProjection(cml::rad(60.0),
+ double(event.resize.w) / double(event.resize.h), 32.0, 2500.0);
camera.uploadProjectionToGL();
break;
}