#include "FrameCounter.hpp"
#include "State.hpp"
#include "StateControl.hpp"
-#include "TextureIndex.hpp"
#include "init.hpp"
#include "../audio/Sound.hpp"
#include "../graphics/ArrayTexture.hpp"
+#include "../graphics/CubeMap.hpp"
#include "../graphics/Font.hpp"
#include "../graphics/Texture.hpp"
#include "../io/TokenStreamReader.hpp"
-#include "../model/shapes.hpp"
+#include "../model/bounds.hpp"
+#include "../model/Model.hpp"
+#include "../model/ModelRegistry.hpp"
+#include "../model/Shape.hpp"
+#include "../model/ShapeRegistry.hpp"
+#include "../shared/ResourceIndex.hpp"
#include "../world/BlockType.hpp"
#include "../world/BlockTypeRegistry.hpp"
#include "../world/Entity.hpp"
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 << '.';
- if (i % 16 == 15) {
+ if (i % 32 == 31) {
std::cout << std::setfill(' ') << std::setw(5) << std::right << (i + 1) << std::endl;
} else {
std::cout << std::flush;
}
-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();
+ HandleEvents();
+ if (!HasState()) return;
+ 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 Application::Handle(const SDL_WindowEvent &event) {
switch (event.event) {
case SDL_WINDOWEVENT_FOCUS_GAINED:
- env.window.GrabMouse();
+ GetState().OnFocus();
break;
case SDL_WINDOWEVENT_FOCUS_LOST:
- env.window.ReleaseMouse();
+ GetState().OnBlur();
break;
case SDL_WINDOWEVENT_RESIZED:
env.viewport.Resize(event.data1, event.data2);
+ GetState().OnResize(env.viewport);
break;
default:
break;
}
}
+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/") {
}
-namespace {
-
-CuboidShape block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }});
-StairShape stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f });
-CuboidShape slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
+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 string &set_name,
+ BlockTypeRegistry ®,
+ ResourceIndex &snd_index,
+ ResourceIndex &tex_index,
+ const ShapeRegistry &shapes
+) const {
string full = data + set_name + ".types";
std::ifstream file(full);
if (!file) {
throw std::runtime_error("failed to open block type file " + full);
}
TokenStreamReader in(file);
- string type_name;
string name;
- string tex_name;
- string shape_name;
while (in.HasMore()) {
- in.ReadIdentifier(type_name);
+ in.ReadIdentifier(name);
in.Skip(Token::EQUALS);
BlockType type;
+ type.Read(in, snd_index, tex_index, shapes);
+ in.Skip(Token::SEMICOLON);
+ reg.Add(std::move(type));
+ }
+}
+
+CubeMap AssetLoader::LoadCubeMap(const string &name) const {
+ string full = textures + name;
+ string right = full + "-right.png";
+ string left = full + "-left.png";
+ string top = full + "-top.png";
+ string bottom = full + "-bottom.png";
+ string back = full + "-back.png";
+ string front = full + "-front.png";
+
+ CubeMap cm;
+ cm.Bind();
+ SDL_Surface *srf;
+
+ if (!(srf = IMG_Load(right.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::RIGHT, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ if (!(srf = IMG_Load(left.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::LEFT, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ if (!(srf = IMG_Load(top.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::TOP, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ if (!(srf = IMG_Load(bottom.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::BOTTOM, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ if (!(srf = IMG_Load(back.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::BACK, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ if (!(srf = IMG_Load(front.c_str()))) throw SDLError("IMG_Load");
+ try {
+ cm.Data(CubeMap::FRONT, *srf);
+ } catch (...) {
+ SDL_FreeSurface(srf);
+ throw;
+ }
+ SDL_FreeSurface(srf);
+
+ cm.FilterNearest();
+ cm.WrapEdge();
+
+ return cm;
+}
- // read block type
+Font AssetLoader::LoadFont(const string &name, int size) const {
+ string full = fonts + name + ".ttf";
+ return Font(full.c_str(), size);
+}
+
+void AssetLoader::LoadModels(
+ const string &set_name,
+ ModelRegistry &models,
+ ResourceIndex &tex_index,
+ const ShapeRegistry &shapes
+) const {
+ string full = data + set_name + ".models";
+ std::ifstream file(full);
+ if (!file) {
+ throw std::runtime_error("failed to open model file " + full);
+ }
+ TokenStreamReader in(file);
+ string model_name;
+ string prop_name;
+ while (in.HasMore()) {
+ in.ReadIdentifier(model_name);
+ in.Skip(Token::EQUALS);
in.Skip(Token::ANGLE_BRACKET_OPEN);
- while (in.Peek().type != Token::ANGLE_BRACKET_CLOSE) {
- in.ReadIdentifier(name);
+ Model &model = models.Add(model_name);
+ while (in.HasMore() && in.Peek().type != Token::ANGLE_BRACKET_CLOSE) {
+ in.ReadIdentifier(prop_name);
in.Skip(Token::EQUALS);
- if (name == "visible") {
- type.visible = in.GetBool();
- } else if (name == "texture") {
- in.ReadString(tex_name);
- type.texture = tex_index.GetID(tex_name);
- } else if (name == "color") {
- in.ReadVec(type.color);
- } else if (name == "outline") {
- in.ReadVec(type.outline_color);
- } else if (name == "label") {
- in.ReadString(type.label);
- } else if (name == "luminosity") {
- type.luminosity = in.GetInt();
- } else if (name == "block_light") {
- type.block_light = in.GetBool();
- } else if (name == "collision") {
- type.collision = in.GetBool();
- } else if (name == "collide_block") {
- type.collide_block = in.GetBool();
- } else if (name == "shape") {
- in.ReadIdentifier(shape_name);
- if (shape_name == "block") {
- type.shape = &block_shape;
- type.fill = { true, true, true, true, true, true };
- } else if (shape_name == "slab") {
- type.shape = &slab_shape;
- type.fill = { false, true, false, false, false, false };
- } else if (shape_name == "stair") {
- type.shape = &stair_shape;
- type.fill = { false, true, false, false, false, true };
- } else {
- throw runtime_error("unknown block shape: " + shape_name);
- }
+ if (prop_name == "root") {
+ model.RootPart().Read(in, tex_index, shapes);
+ } else if (prop_name == "body") {
+ model.SetBody(in.GetULong());
+ } else if (prop_name == "eyes") {
+ model.SetEyes(in.GetULong());
} else {
- throw runtime_error("unknown block property: " + name);
+ while (in.HasMore() && in.Peek().type != Token::SEMICOLON) {
+ in.Next();
+ }
}
in.Skip(Token::SEMICOLON);
}
+ model.Enumerate();
in.Skip(Token::ANGLE_BRACKET_CLOSE);
in.Skip(Token::SEMICOLON);
-
- reg.Add(type);
}
}
-Font Assets::LoadFont(const string &name, int size) const {
- string full = fonts + name + ".ttf";
- return Font(full.c_str(), size);
+void AssetLoader::LoadShapes(const string &set_name, ShapeRegistry &shapes) const {
+ string full = data + set_name + ".shapes";
+ std::ifstream file(full);
+ if (!file) {
+ throw std::runtime_error("failed to open shape file " + full);
+ }
+ TokenStreamReader in(file);
+ string shape_name;
+ while (in.HasMore()) {
+ in.ReadIdentifier(shape_name);
+ in.Skip(Token::EQUALS);
+ Shape &shape = shapes.Add(shape_name);
+ shape.Read(in);
+ in.Skip(Token::SEMICOLON);
+ }
}
-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 ResourceIndex &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()) {
}
-TextureIndex::TextureIndex()
-: id_map() {
-
-}
-
-int TextureIndex::GetID(const string &name) {
- auto entry = id_map.find(name);
- if (entry == id_map.end()) {
- auto result = id_map.emplace(name, Size());
- return result.first->second;
- } else {
- return entry->second;
- }
-}
-
-
void FrameCounter::EnterFrame() noexcept {
last_enter = SDL_GetTicks();
last_tick = last_enter;