X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=06ea7270f545ec25aebb6e4234c2587b011adac6;hb=65158353d1ecbed0032752863c6c4eb96b1a084a;hp=19aa06a18543de3e1c7662a490098d794e8e0aca;hpb=c8bfdbd3b824fdd71bca1335a145aa19c42df1db;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 19aa06a..06ea727 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -13,12 +13,11 @@
 
 namespace app {
 
-Application::Application(sdl::InitScreen *screen, State *initialState)
+Application::Application(sdl::InitScreen &screen, State *initialState)
 : screen(screen)
 , states()
 , last(SDL_GetTicks())
-, toPop(0) {
-	assert(screen && "cannot create application without screen");
+, inStateChage(false) {
 	assert(initialState && "cannot create application without initial state");
 	RealPushState(initialState);
 }
@@ -29,44 +28,90 @@ Application::~Application() {
 
 
 State *Application::CurrentState() {
-	return states.top();
+	return states.empty() ? 0 : states.top();
 }
 
 void Application::UpdateState() {
-	while (toPop > 0) {
-		RealPopState();
-		--toPop;
-	}
-	while (!toPush.empty()) {
-		State *s(toPush.front());
-		toPush.pop();
-		RealPushState(s);
+	inStateChage = true;
+	while (!stateChanges.empty()) {
+		switch (stateChanges.front().type) {
+			case StateCommand::PUSH:
+				RealPushState(stateChanges.front().state);
+				break;
+			case StateCommand::POP:
+				RealPopState();
+				break;
+			case StateCommand::CHANGE:
+				RealChangeState(stateChanges.front().state);
+				break;
+		}
+		stateChanges.pop();
 	}
+	inStateChage = false;
 }
 
 void Application::ChangeState(State *s) {
-	PopState();
-	PushState(s);
+	if (inStateChage) {
+		RealChangeState(s);
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::CHANGE;
+		cmd.state = s;
+		stateChanges.push(cmd);
+	}
 }
 
 void Application::PushState(State *s) {
-	toPush.push(s);
+	if (inStateChage) {
+		RealPushState(s);
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::PUSH;
+		cmd.state = s;
+		stateChanges.push(cmd);
+	}
 }
 
-void Application::RealPushState(State *s) {
+void Application::PopState() {
+	if (inStateChage) {
+		RealPopState();
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::POP;
+		cmd.state = 0;
+		stateChanges.push(cmd);
+	}
+}
+
+void Application::RealChangeState(State *s) {
+	if (!states.empty()) {
+		states.top()->OnPauseState(*this, screen.Screen());
+		states.top()->OnExitState(*this, screen.Screen());
+		states.pop();
+	}
 	states.push(s);
-	s->EnterState(*this, screen->Screen());
+	s->OnEnterState(*this, screen.Screen());
+	s->OnResumeState(*this, screen.Screen());
 }
 
-void Application::PopState() {
-	++toPop;
+void Application::RealPushState(State *s) {
+	if (!states.empty()) {
+		states.top()->OnPauseState(*this, screen.Screen());
+	}
+	states.push(s);
+	s->OnEnterState(*this, screen.Screen());
+	s->OnResumeState(*this, screen.Screen());
 }
 
 void Application::RealPopState() {
 	if (states.empty()) return;
-	states.top()->ExitState();
+	states.top()->OnPauseState(*this, screen.Screen());
+	states.top()->OnExitState(*this, screen.Screen());
 	delete states.top();
 	states.pop();
+	if (!states.empty()) {
+		states.top()->OnResumeState(*this, screen.Screen());
+	}
 }
 
 void Application::Quit() {
@@ -75,7 +120,10 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		RealPopState();
+		states.top()->OnPauseState(*this, screen.Screen());
+		states.top()->OnExitState(*this, screen.Screen());
+		delete states.top();
+		states.pop();
 	}
 }
 
@@ -89,11 +137,17 @@ void Application::Run() {
 void Application::Loop() {
 	Uint32 now(SDL_GetTicks());
 	Uint32 deltaT(now - last);
-	if (deltaT > 34) deltaT = 34;
+	GlobalTimers().Update(deltaT);
+	if (deltaT > 30) deltaT = 30;
 
+	if (CurrentState()) {
+		CurrentState()->GraphicsTimers().Update(deltaT);
+	}
 	HandleEvents();
-	UpdateWorld(deltaT);
-	Render();
+	if (!StateChangePending()) {
+		UpdateWorld(deltaT);
+		Render();
+	}
 
 	last = now;
 	UpdateState();
@@ -110,7 +164,7 @@ void Application::HandleEvents() {
 				PopAllStates();
 				break;
 			case SDL_VIDEORESIZE:
-				screen->Resize(event.resize.w, event.resize.h);
+				screen.Resize(event.resize.w, event.resize.h);
 				CurrentState()->Resize(event.resize.w, event.resize.h);
 				break;
 			case SDL_KEYDOWN:
@@ -122,20 +176,21 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleInput(input);
+	if (CurrentState()) CurrentState()->HandleEvents(input);
 }
 
 void Application::UpdateWorld(Uint32 deltaT) {
 	if (!CurrentState()) return;
-	for (Uint32 i(0); i < deltaT; ++i) {
+	for (Uint32 i(0); i < deltaT && !StateChangePending(); ++i) {
+		CurrentState()->PhysicsTimers().Update(0.001f);
 		CurrentState()->UpdateWorld(0.001f);
 	}
 }
 
 void Application::Render(void) {
 	if (!CurrentState()) return;
-	CurrentState()->Render(screen->Screen());
-	screen->Flip();
+	CurrentState()->Render(screen.Screen());
+	screen.Flip();
 }
 
 }