music("NightFusion"),
punchSound("RobotPunch")
{
- Mf::Dispatcher::getInstance().addHandler("video.context_recreated",
+ Mf::dispatcher::addHandler("video.context_recreated",
boost::bind(&YoinkApp::contextRecreated, this, _1), this);
setupGL();
state = 0.0;
- heroine = CharacterPtr(new Character("RobotTrooper"));
+ heroine = Character::alloc("RobotTrooper");
heroine->getAnimation().startSequence("Run");
font = new TilemapFont;
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);
}
{
//delete heroine;
delete font;
- delete testScene;
- Mf::Dispatcher::getInstance().removeHandler(this);
+ Mf::dispatcher::removeHandler(this);
}
heroine->update(t, dt);
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));
//heroine->draw(alpha);
+ heroine->getAabb().draw();
hud.draw();
}
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)
PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
#if ! NDEBUG
- Mf::setLogLevel(Mf::DEBUGGING);
+ Mf::setLogLevel(Mf::LOG_DEBUG);
#endif
int status = 0;
-//start:
try
{
YoinkApp app(argc, argv);
status = app.run();
}
- //catch (Mf::Texture::Exception e)
- //{
- //std::cout << "Unhandled exception: " << e.what() << std::endl;
- //status = 1;
- //}
catch (Mf::Exception e)
{
- //std::cout << "Unhandled exception: " << e.what() << std::endl;
Mf::logError("unhandled exception: <<%s>>", e.what());
- Mf::logInfo("it's time to crash now ;-(");
+ Mf::logInfo("it's time to crash now :-(");
status = 1;
-
- //std::cout << "Yoink stopped. Do you want to run it again? [yes/No]"
- //<< std::endl;
-
- //char answer;
- //std::cin >> answer;
-
- //if (answer == 'y' || answer == 'Y') goto start;
}
std::cout << std::endl << "Goodbye..." << std::endl << std::endl;