X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.cc;h=a8a06cc82f6d1e6f9f694fda7114c3c7f322ef08;hp=77f5c7318d0a9b8f7676e305f020c4d492ae2b7a;hb=542e50a284c7f5b144a5c97c17f6d89b2af0175c;hpb=5250c138b1a692e4e893a8f424d2856e519fd652

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 77f5c73..a8a06cc 100644
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -30,13 +30,12 @@
 #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>
 
@@ -116,13 +115,13 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
 	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);
 
-	octree = Mf::loadScene("Test");
+	octree = Mf::loadScene("Classic");
 	heroine->treeNode = octree->insert(heroine);
 }
 
@@ -176,7 +175,6 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	//dt *= 0.7;
 
-	music.update(t, dt);
 	fadeIn.update(dt);
 	camera.update(t, dt);
 	heroine->update(t, dt);
@@ -186,7 +184,8 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 	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));
@@ -294,7 +293,8 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 		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;
 	}