X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.cc;h=77f5c7318d0a9b8f7676e305f020c4d492ae2b7a;hp=6cddf1a4d528578f4da50ec622bc217854cd9e81;hb=7e898e8ec0ff716e2fc722b883a626a6c346f107;hpb=96dd0815b98cf9459c8dd7a8009aabb6f8051e9e

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 6cddf1a..77f5c73 100644
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -102,7 +102,7 @@ static std::string iconFile()
 
 YoinkApp::YoinkApp(int argc, char* argv[]) :
 	Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile()),
-	music("BeatTheCube"),
+	music("NightFusionIntro"),
 	punchSound("RobotPunch")
 {
 	Mf::dispatcher::addHandler("video.context_recreated",
@@ -122,8 +122,8 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
 	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("Test");
+	heroine->treeNode = octree->insert(heroine);
 }
 
 YoinkApp::~YoinkApp()
@@ -174,7 +174,7 @@ void YoinkApp::contextRecreated(const Mf::Notification* note)
 
 void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
-	//dt *= 0.1;
+	//dt *= 0.7;
 
 	music.update(t, dt);
 	fadeIn.update(dt);
@@ -182,8 +182,8 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar 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));
@@ -203,7 +203,11 @@ void YoinkApp::draw(Mf::Scalar alpha)
 
 	// 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();
@@ -258,11 +262,6 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 				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");