X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEngine.cc;h=51a3af0f5bfb6d75d71cdaed34cb7bdd9518c3ac;hp=53fca73e9e883cfab1d18aced70cd125391f26d1;hb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index 53fca73..51a3af0 100644
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -27,14 +27,16 @@
 *******************************************************************************/
 
 #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"
@@ -44,35 +46,42 @@
 namespace Mf {
 
 
-class Engine::EngineImpl
+class Engine::Impl
 {
 public:
-	EngineImpl(int argc, char* argv[], const std::string& configFile,
+	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 defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
+		if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
+#else
 		if (SDL_Init(SDL_INIT_EVERYTHING | 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());
+			logError("fast events error: %s", FE_GetError());
+			throw Exception(Exception::SDL_ERROR);
 		}
+		if (Sound_Init() == 0)
+		{
+			logError("sound initialization failed: %s", Sound_GetError());
+			throw Exception(Exception::SDL_ERROR);
+		}
+		alutInit(&argc, argv);
 
+		Settings& settings = Settings::getInstance();
+		settings.parseArgs(argc, argv);
 		settings.loadFromFile(configFile);
 
 		long randomSeed;
-		if (settings.get("engine.rngseed", randomSeed))
-		{
-			setSeed(randomSeed);
-		}
-		else
-		{
-			setSeed();
-		}
+		if (settings.get("engine.rngseed", randomSeed)) setSeed(randomSeed);
+		else setSeed();
 
 		double ts = 0.01;
 		settings.get("engine.timestep", ts);
@@ -85,15 +94,17 @@ public:
 		printFps = false;
 		settings.get("video.printfps", printFps);
 
-		video = VideoPtr(new Video(name, iconFile));
+		video = Video::alloc(name, iconFile);
 		video->makeActive();
 	}
 
-	~EngineImpl()
+	~Impl()
 	{
 		// the video object must be destroyed before we can shutdown SDL
 		video.reset();
 
+		alutExit();
+		Sound_Quit();
 		FE_Quit();
 		SDL_Quit();
 	}
@@ -163,7 +174,7 @@ public:
 
 					if (printFps)
 					{
-						std::cout << "FPS: " << fps << std::endl;
+						logInfo("framerate: %d fps", fps);
 					}
 				}
 
@@ -215,9 +226,7 @@ public:
 
 	Engine*		interface;
 
-	Settings	settings;
-	Dispatcher	dispatcher;
-	VideoPtr	video;
+	VideoP		video;
 
 	bool		running;
 	int			exitCode;
@@ -232,8 +241,7 @@ public:
 
 Engine::Engine(int argc, char* argv[], const std::string& configFile,
 		const std::string& name, const std::string& iconFile) :
-	impl_(new Engine::EngineImpl(argc, argv, configFile, name, iconFile, this))
-{}
+	impl_(new Engine::Impl(argc, argv, configFile, name, iconFile, this)) {}
 
 Engine::~Engine() {}