namespace blank {
-Application::Application(Environment &e)
+HeadlessApplication::HeadlessApplication(HeadlessEnvironment &e)
: env(e)
, states() {
}
+HeadlessApplication::~HeadlessApplication() {
+
+}
+
+
+Application::Application(Environment &e)
+: HeadlessApplication(e)
+, env(e) {
+
+}
+
Application::~Application() {
env.audio.StopAll();
}
-void Application::RunN(size_t n) {
+void HeadlessApplication::RunN(size_t n) {
Uint32 last = SDL_GetTicks();
for (size_t i = 0; HasState() && i < n; ++i) {
Uint32 now = SDL_GetTicks();
}
}
-void Application::RunT(size_t t) {
+void HeadlessApplication::RunT(size_t t) {
Uint32 last = SDL_GetTicks();
Uint32 finish = last + t;
while (HasState() && last < finish) {
}
}
-void Application::RunS(size_t n, size_t t) {
+void HeadlessApplication::RunS(size_t n, size_t t) {
for (size_t i = 0; HasState() && i < n; ++i) {
Loop(t);
std::cout << '.';
}
-void Application::Run() {
+void HeadlessApplication::Run() {
Uint32 last = SDL_GetTicks();
- env.window.GrabMouse();
while (HasState()) {
Uint32 now = SDL_GetTicks();
int delta = now - last;
}
}
+void HeadlessApplication::Loop(int dt) {
+ env.counter.EnterFrame();
+ Update(dt);
+ CommitStates();
+ if (!HasState()) return;
+ env.counter.ExitFrame();
+}
+
void Application::Loop(int dt) {
env.counter.EnterFrame();
HandleEvents();
if (!HasState()) return;
Update(dt);
- env.state.Commit(*this);
+ CommitStates();
if (!HasState()) return;
Render();
env.counter.ExitFrame();
}
+void HeadlessApplication::HandleEvents() {
+ env.counter.EnterHandle();
+ SDL_Event event;
+ while (HasState() && SDL_PollEvent(&event)) {
+ Handle(event);
+ CommitStates();
+ }
+ env.counter.ExitHandle();
+}
+
+void HeadlessApplication::Handle(const SDL_Event &event) {
+ GetState().Handle(event);
+}
+
+
void Application::HandleEvents() {
env.counter.EnterHandle();
SDL_Event event;
while (HasState() && SDL_PollEvent(&event)) {
Handle(event);
- env.state.Commit(*this);
+ CommitStates();
}
env.counter.ExitHandle();
}
}
}
+void HeadlessApplication::Update(int dt) {
+ env.counter.EnterUpdate();
+ if (HasState()) {
+ GetState().Update(dt);
+ }
+ env.counter.ExitUpdate();
+}
+
void Application::Update(int dt) {
env.counter.EnterUpdate();
env.audio.Update(dt);
}
-void Application::PushState(State *s) {
+void HeadlessApplication::PushState(State *s) {
if (!states.empty()) {
states.top()->OnPause();
}
s->OnResume();
}
-State *Application::PopState() {
+State *HeadlessApplication::PopState() {
State *s = states.top();
states.pop();
s->OnPause();
return s;
}
-State *Application::SwitchState(State *s_new) {
+State *HeadlessApplication::SwitchState(State *s_new) {
State *s_old = states.top();
states.top() = s_new;
--s_old->ref_count;
return s_old;
}
-State &Application::GetState() {
+State &HeadlessApplication::GetState() {
return *states.top();
}
-bool Application::HasState() const noexcept {
+void HeadlessApplication::CommitStates() {
+ env.state.Commit(*this);
+}
+
+bool HeadlessApplication::HasState() const noexcept {
return !states.empty();
}
-void StateControl::Commit(Application &app) {
+void StateControl::Commit(HeadlessApplication &app) {
while (!cue.empty()) {
Memo m(cue.front());
cue.pop();
app.PopState();
}
break;
+ case POP_AFTER:
+ while (app.HasState() && &app.GetState() != m.state) {
+ app.PopState();
+ }
+ break;
+ case POP_UNTIL:
+ while (app.HasState()) {
+ if (app.PopState() == m.state) {
+ break;
+ }
+ }
}
}
}
-Assets::Assets(const string &base)
+AssetLoader::AssetLoader(const string &base)
: fonts(base + "fonts/")
, sounds(base + "sounds/")
, textures(base + "textures/")
-, data(base + "data/")
-, large_ui_font(LoadFont("DejaVuSans", 24))
-, small_ui_font(LoadFont("DejaVuSans", 16)) {
+, data(base + "data/") {
+
+}
+
+Assets::Assets(const AssetLoader &loader)
+: large_ui_font(loader.LoadFont("DejaVuSans", 24))
+, small_ui_font(loader.LoadFont("DejaVuSans", 16)) {
}
}
-void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const {
+void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const {
string full = data + set_name + ".types";
std::ifstream file(full);
if (!file) {
}
}
-Font Assets::LoadFont(const string &name, int size) const {
+Font AssetLoader::LoadFont(const string &name, int size) const {
string full = fonts + name + ".ttf";
return Font(full.c_str(), size);
}
-Sound Assets::LoadSound(const string &name) const {
+Sound AssetLoader::LoadSound(const string &name) const {
string full = sounds + name + ".wav";
return Sound(full.c_str());
}
-Texture Assets::LoadTexture(const string &name) const {
+Texture AssetLoader::LoadTexture(const string &name) const {
string full = textures + name + ".png";
Texture tex;
SDL_Surface *srf = IMG_Load(full.c_str());
return tex;
}
-void Assets::LoadTexture(const string &name, ArrayTexture &tex, int layer) const {
+void AssetLoader::LoadTexture(const string &name, ArrayTexture &tex, int layer) const {
string full = textures + name + ".png";
SDL_Surface *srf = IMG_Load(full.c_str());
if (!srf) {
SDL_FreeSurface(srf);
}
-void Assets::LoadTextures(const TextureIndex &index, ArrayTexture &tex) const {
+void AssetLoader::LoadTextures(const TextureIndex &index, ArrayTexture &tex) const {
// TODO: where the hell should that size come from?
tex.Reserve(16, 16, index.Size(), Format());
for (const auto &entry : index.Entries()) {