-/*
- * Application.cpp
- *
- * Created on: Apr 8, 2012
- * Author: holy
- */
-
#include "Application.h"
#include "State.h"
namespace app {
-Application::Application(sdl::InitScreen *screen, State *initialState)
+Application::Application(sdl::InitScreen &screen, State *initialState)
: screen(screen)
, states()
-, last(SDL_GetTicks()) {
- assert(screen && "cannot create application without screen");
+, last(SDL_GetTicks())
+, inStateChage(false) {
assert(initialState && "cannot create application without initial state");
RealPushState(initialState);
}
-Application::~Application(void) {
+Application::~Application() {
PopAllStates();
}
-State *Application::CurrentState(void) {
- return states.top();
+State *Application::CurrentState() {
+ return states.empty() ? 0 : states.top();
+}
+
+void Application::UpdateState() {
+ 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) {
- RealPopState();
- RealPushState(s);
+ if (inStateChage) {
+ RealChangeState(s);
+ } else {
+ StateCommand cmd;
+ cmd.type = StateCommand::CHANGE;
+ cmd.state = s;
+ stateChanges.push(cmd);
+ }
}
void Application::PushState(State *s) {
- RealPushState(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()->PauseState(screen.Screen());
+ states.top()->ExitState(*this, screen.Screen());
+ states.pop();
+ }
states.push(s);
- s->EnterState(*this, screen->Screen());
+ s->EnterState(*this, screen.Screen());
+ s->ResumeState(screen.Screen());
}
-void Application::PopState(void) {
- RealPopState();
+void Application::RealPushState(State *s) {
+ if (!states.empty()) {
+ states.top()->PauseState(screen.Screen());
+ }
+ states.push(s);
+ s->EnterState(*this, screen.Screen());
+ s->ResumeState(screen.Screen());
}
-void Application::RealPopState(void) {
+void Application::RealPopState() {
if (states.empty()) return;
- states.top()->ExitState();
+ states.top()->PauseState(screen.Screen());
+ states.top()->ExitState(*this, screen.Screen());
delete states.top();
states.pop();
+ if (!states.empty()) {
+ states.top()->ResumeState(screen.Screen());
+ }
}
-void Application::Quit(void) {
+void Application::Quit() {
PopAllStates();
}
-void Application::PopAllStates(void) {
+void Application::PopAllStates() {
while (!states.empty()) {
- RealPopState();
+ states.top()->PauseState(screen.Screen());
+ states.top()->ExitState(*this, screen.Screen());
+ delete states.top();
+ states.pop();
}
}
-void Application::Run(void) {
+void Application::Run() {
while (CurrentState()) {
Loop();
}
}
-void Application::Loop(void) {
+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();
}
-void Application::HandleEvents(void) {
+void Application::HandleEvents() {
if (!CurrentState()) return;
+ input.ResetInteractiveState();
SDL_Event event;
while (SDL_PollEvent(&event)) {
switch (event.type) {
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:
+ case SDL_KEYUP:
+ input.HandleKeyboardEvent(event.key);
+ break;
default:
- CurrentState()->HandleEvent(event);
+ // skip event
break;
}
}
+ 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();
}
}