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

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index a9b8f13..a8a06cc 100644
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -99,28 +99,6 @@ static std::string iconFile()
 }
 
 
-void YoinkApp::myFunc(Mf::Timer& timer, Mf::Scalar t)
-{
-	std::cout << "timer: " << t << std::endl;
-	
-	//timer.invalidate();
-}
-
-int YoinkApp::myThread()
-{
-	Mf::Scalar timer = Mf::Timer::getTicks();
-
-	for (;;)
-	{
-		std::cout << "thread awake: " << Mf::Timer::getTicks() << std::endl;
-
-		timer += 3.0;
-		Mf::Timer::sleep(timer, true);
-	}
-	return 0;
-}
-
-
 YoinkApp::YoinkApp(int argc, char* argv[]) :
 	Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile()),
 	music("NightFusionIntro"),
@@ -137,19 +115,14 @@ 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);
-
-	//myTimer.init(boost::bind(&YoinkApp::myFunc, this, _1, _2),
-			//0.0, Mf::Timer::REPEAT);
-	//Mf::Thread thread = Mf::detachFunction(boost::bind(&YoinkApp::myThread, this));
-	//std::cout << "thread " << thread << " detached." << std::endl;
 }
 
 YoinkApp::~YoinkApp()