X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEngine.cc;h=ccfaf81e6d77b0b0b195f4c279a0d183563ac323;hp=f4bc712b27887d0b5397c579fc861d196ffc3bc6;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index f4bc712..ccfaf81 100644
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -27,20 +27,21 @@
 *******************************************************************************/
 
 #include <algorithm>
-#include <cstdlib>			// exit
+#include <cstdlib>			// exit, srand
+#include <ctime>			// time
 #include <list>
 #include <string>
 
+#include <AL/alc.h>
 #include <SDL/SDL.h>
 #include "fastevents.h"
-#include <AL/alut.h>
+
 
 #include "Engine.hh"
 #include "Event.hh"
 #include "Exception.hh"
 #include "Log.hh"
 #include "Math.hh"
-#include "Random.hh"
 #include "Settings.hh"
 #include "Timer.hh"
 
@@ -68,22 +69,43 @@ public:
 			const char* error = SDL_GetError();
 			throw Exception(ErrorCode::SDL_INIT, error);
 		}
+		else
+		{
+			char vdName[128];
+			SDL_VideoDriverName(vdName, sizeof(vdName));
+			logDebug << "initialized SDL; using video driver `"
+					 << vdName << "'" << std::endl;
+		}
+
 		if (FE_Init() != 0)
 		{
 			const char* error = FE_GetError();
 			throw Exception(ErrorCode::FASTEVENTS_INIT, error);
 		}
-		int argc = 1;
-		char name[] = "hello";
-		alutInit(&argc, (char**)&name);
-		
+
+		mAlDevice = alcOpenDevice(0);
+		mAlContext = alcCreateContext(mAlDevice, 0);
+		if (!mAlDevice || !mAlContext)
+		{
+			const char* error = alcGetString(mAlDevice,alcGetError(mAlDevice));
+			logError << "error while creating audio context: "
+					 << error << std::endl;
+		}
+		else
+		{
+			alcMakeContextCurrent(mAlContext);
+			logDebug << "opened sound device `"
+					 << alcGetString(mAlDevice, ALC_DEFAULT_DEVICE_SPECIFIER)
+					 << "'" << std::endl;
+		}
+
 		// now load the settings the engine needs
 
 		Settings& settings = Settings::getInstance();
 
 		unsigned randomSeed;
-		if (settings.get("rngseed", randomSeed)) setSeed(randomSeed);
-		else setSeed();
+		if (settings.get("rngseed", randomSeed)) srand(randomSeed);
+		else srand(time(0));
 
 		Scalar timestep = 80.0;
 		settings.get("timestep", timestep);
@@ -102,7 +124,10 @@ public:
 		// the video object must be destroyed before we can shutdown SDL
 		mVideo.reset();
 
-		alutExit();
+		alcMakeContextCurrent(0);
+		alcDestroyContext(mAlContext);
+		alcCloseDevice(mAlDevice);
+
 		FE_Quit();
 		SDL_Quit();
 	}
@@ -174,7 +199,7 @@ public:
 
 					if (mPrintFps)
 					{
-						logInfo("%d fps", mFps);
+						logInfo << mFps << " fps" << std::endl;
 					}
 				}
 
@@ -194,6 +219,8 @@ public:
 						Timer::getNextFire()), Timer::ACTUAL);
 		}
 		while (!mStack.empty());
+
+		mDispatch.dispatch("engine.stopping");
 	}
 
 	void dispatchEvents()
@@ -255,7 +282,8 @@ public:
 	{
 		ASSERT(layer && "cannot push null layer");
 		mStack.push_front(layer);
-		logDebug("stack: %d [pushed %X]", mStack.size(), layer.get());
+		logDebug << "stack: " << mStack.size()
+				 << " [pushed " << layer.get() << "]" << std::endl;
 		layer->pushed(mInterface);
 	}
 
@@ -266,7 +294,8 @@ public:
 
 		LayerP layer = mStack.front();
 		mStack.pop_front();
-		logDebug("stack: %d [popped %X]", mStack.size(), layer.get());
+		logDebug << "stack: " << mStack.size()
+				 << " [popped " << layer.get() << "]" << std::endl;
 		layer->popped(mInterface);
 
 		if (fixIt) mStackIt = --mStack.begin();
@@ -295,7 +324,8 @@ public:
 				for (it = layers.begin(); it != layers.end(); ++it)
 				{
 					(*it)->popped(mInterface);
-					logDebug("stack: %d [popped %X]", mStack.size(), (*it).get());
+					logDebug << "stack: " << mStack.size()
+							 << " [popped " << (*it).get() << "]" << std::endl;
 				}
 
 				if (fixIt) mStackIt = --mStack.begin();
@@ -319,7 +349,8 @@ public:
 	{
 		if (mMaxFps < mTimestep)
 		{
-			logWarning("capping maximum fps to timestep (%f)", mTimestep);
+			logWarning << "capping maximum fps to timestep ("
+					   << mTimestep << ")" << std::endl;
 			mMaxFps = mTimestep;
 		}
 	}
@@ -329,6 +360,9 @@ public:
 	VideoP						mVideo;
 	Dispatch					mDispatch;
 
+	ALCdevice*					mAlDevice;
+	ALCcontext*					mAlContext;
+
 	std::list<LayerP>			mStack;
 	std::list<LayerP>::iterator	mStackIt;