X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEngine.cc;h=e97c8b5d1b7edbae52a5b48ebc1072574e697ebe;hp=78233688d60f69dba90c880a0c9e94b9518f0814;hb=33842c860fe18ca8cf087905992885687434320c;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index 7823368..e97c8b5 100644
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -27,16 +27,15 @@
 *******************************************************************************/
 
 #include <cstdlib>			// exit
-#include <iostream>
 #include <string>
 
 #include <SDL/SDL.h>
 #include "fastevents.h"
-#include <SDL/SDL_sound.h>
 #include <AL/alut.h>
 
 #include "Dispatcher.hh"
 #include "Engine.hh"
+#include "Log.hh"
 #include "Random.hh"
 #include "Settings.hh"
 #include "Timer.hh"
@@ -52,24 +51,26 @@ public:
 	Impl(int argc, char* argv[], const std::string& configFile,
 			const std::string& name, const std::string& iconFile,
 			Engine* outer) :
-		interface(outer),
-		settings(argc, argv)
+		interface(outer)
 	{
-		if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
+#if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
+		if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
+#else
+		if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD) != 0)
+#endif
 		{
-			throw Exception(SDL_GetError());
+			logError("sdl is complaining: %s", SDL_GetError());
+			throw Exception(Exception::SDL_ERROR);
 		}
 		if (FE_Init() != 0)
 		{
-			throw Exception(FE_GetError());
-		}
-		if (Sound_Init() != 0)
-		{
-			//throw Exception(Sound_GetError());
-			std::cerr << Sound_GetError() << std::endl;
+			logError("fast events error: %s", FE_GetError());
+			throw Exception(Exception::SDL_ERROR);
 		}
 		alutInit(&argc, argv);
 
+		Settings& settings = Settings::getInstance();
+		settings.parseArgs(argc, argv);
 		settings.loadFromFile(configFile);
 
 		long randomSeed;
@@ -87,7 +88,7 @@ public:
 		printFps = false;
 		settings.get("video.printfps", printFps);
 
-		video = VideoPtr(new Video(name, iconFile));
+		video = Video::alloc(name, iconFile);
 		video->makeActive();
 	}
 
@@ -97,7 +98,6 @@ public:
 		video.reset();
 
 		alutExit();
-		Sound_Quit();
 		FE_Quit();
 		SDL_Quit();
 	}
@@ -112,7 +112,7 @@ public:
 
 	int run()
 	{
-		Scalar ticksNow = getTicks();
+		Scalar ticksNow = Timer::getTicks();
 
 		Scalar nextStep = ticksNow;
 		Scalar nextDraw = ticksNow;
@@ -128,13 +128,15 @@ public:
 		running = true;
 		do
 		{
-			Scalar newTicks = getTicks();
+			Scalar newTicks = Timer::getTicks();
 			deltaTime = newTicks - ticksNow;
 			ticksNow = newTicks;
 
 			if (deltaTime >= 0.25) deltaTime = 0.25;
 			accumulator += deltaTime;
 
+			Timer::fireIfExpired(ticksNow);
+
 			while (accumulator >= timestep)
 			{
 				dispatchEvents();
@@ -167,7 +169,7 @@ public:
 
 					if (printFps)
 					{
-						std::cout << "FPS: " << fps << std::endl;
+						logInfo("framerate: %d fps", fps);
 					}
 				}
 
@@ -183,7 +185,8 @@ public:
 			}
 
 			// be a good citizen and give back what you don't need
-			sleep(std::min(nextStep, nextDraw), true);
+			Timer::sleep(std::min(std::min(nextStep, nextDraw),
+						Timer::getNextFire()), true);
 		}
 		while (running);
 
@@ -219,9 +222,7 @@ public:
 
 	Engine*		interface;
 
-	Settings	settings;
-	Dispatcher	dispatcher;
-	VideoPtr	video;
+	VideoP		video;
 
 	bool		running;
 	int			exitCode;