X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEngine.cc;h=16da8d40620edd59199a02e46ef43302113f8984;hp=5bfaaf3cd8d715d0927c9a284a5199a6686e98a6;hb=a4debfe4a5f5d339410788971b698ba00cb7f09c;hpb=892da43bf5796e7c5f593a6d0f53bd797a36bd3e

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index 5bfaaf3..16da8d4 100644
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -82,11 +82,13 @@ public:
 		if (settings.get("rngseed", randomSeed)) setSeed(randomSeed);
 		else setSeed();
 
-		settings.get("timestep", timestep);
+		Scalar timeStep = 80.0;
+		settings.get("timestep", timeStep);
+		timestep = 1.0 / timeStep;
 
-		long maxFps = 40;
+		Scalar maxFps = 40.0;
 		settings.get("maxfps", maxFps);
-		drawRate = 1.0 / Scalar(maxFps);
+		drawRate = 1.0 / maxFps;
 
 		settings.get("printfps", printFps);
 
@@ -246,55 +248,66 @@ public:
 	}
 
 
-	void pushLayer(LayerP layer)
+	void push(LayerP layer)
 	{
 		ASSERT(layer && "cannot push null layer");
 		stack.push_front(layer);
+		logInfo(" push: %d", stack.size());
 		layer->pushed(interface);
 	}
 
-	void popLayer()
+	LayerP pop()
 	{
 		bool fixIt = false;
 		if (stack.begin() == stackIt) fixIt = true;
 
 		LayerP popped = stack.front();
 		stack.pop_front();
+		logInfo("  pop: %d", stack.size());
 		popped->popped(interface);
 
 		if (fixIt) stackIt = --stack.begin();
+
+		return popped;
 	}
 
-	void popLayer(Layer* layer)
+	LayerP pop(Layer* layer)
 	{
 		bool fixIt = false;
 
+		std::list<LayerP> popped;
+
 		std::list<LayerP>::iterator it;
 		for (it = stack.begin(); it != stack.end(); ++it)
 		{
+			popped.push_back(*it);
+
 			if (it == stackIt) fixIt = true;
 
 			if ((*it).get() == layer)
 			{
 				++it;
-				do
+				stack.erase(stack.begin(), it);
+
+				for (it = popped.begin(); it != popped.end(); ++it)
 				{
-					LayerP popped = stack.front();
-					stack.pop_front();
-					popped->popped(interface);
+					(*it)->popped(interface);
 				}
-				while (stack.begin() != it);
 
 				if (fixIt) stackIt = --stack.begin();
-				return;
+
+				return popped.back();
 			}
 		}
+
+		return LayerP();
 	}
 
-	void clearLayers()
+	void clear()
 	{
 		stack.clear();
 		stackIt = stack.begin();
+		logInfo("clear: %d", stack.size());
 	}
 
 
@@ -327,6 +340,8 @@ Engine& Engine::getInstance()
 {
 	ASSERT(instance && "dereferencing null pointer");
 	return *instance;
+	//static Engine engine;
+	//return engine;
 }
 
 
@@ -367,28 +382,28 @@ long Engine::getFrameRate() const
 }
 
 
-void Engine::pushLayer(LayerP layer)
+void Engine::push(LayerP layer)
 {
 	// pass through
-	impl_->pushLayer(layer);
+	impl_->push(layer);
 }
 
-void Engine::popLayer()
+LayerP Engine::pop()
 {
 	// pass through
-	impl_->popLayer();
+	return impl_->pop();
 }
 
-void Engine::popLayer(Layer* layer)
+LayerP Engine::pop(Layer* layer)
 {
 	// pass through
-	impl_->popLayer(layer);
+	return impl_->pop(layer);
 }
 
-void Engine::clearLayers()
+void Engine::clear()
 {
 	// pass through
-	impl_->clearLayers();
+	impl_->clear();
 }