more cleanup

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 7ec807bdb22de89f4c3a7d461e12b38063afec8d..d391927d02b364bc1a07c8ba170de838a03a4ad0 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -109,7 +109,7 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
        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();
 
@@ -134,7 +134,7 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
        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);
 }
 
@@ -142,9 +142,8 @@ YoinkApp::~YoinkApp()
 {
        //delete heroine;
        delete font;
-       delete testScene;
 
-       Mf::Dispatcher::getInstance().removeHandler(this);
+       Mf::dispatcher::removeHandler(this);
 }
 
 
@@ -202,6 +201,7 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 
        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));
@@ -419,7 +419,7 @@ 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)