X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=6c89bdbeebeef3710b43b37881a0af1042e8ccf6;hb=04bca2c5e74df466312c69abadf38e1f84aa70a9;hp=48a59502ad974dac9d98eed82d49eaaeaa13487b;hpb=9ebe2c320fd9f94266ab93fa2f9d9908a0a284d3;p=blank.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 48a5950..6c89bdb 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -4,15 +4,20 @@
 #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"
@@ -76,7 +81,7 @@ 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;
@@ -97,6 +102,8 @@ void HeadlessApplication::Run() {
 
 void HeadlessApplication::Loop(int dt) {
 	env.counter.EnterFrame();
+	HandleEvents();
+	if (!HasState()) return;
 	Update(dt);
 	CommitStates();
 	if (!HasState()) return;
@@ -154,13 +161,14 @@ void Application::Handle(const SDL_Event &event) {
 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;
@@ -270,6 +278,17 @@ void StateControl::Commit(HeadlessApplication &app) {
 					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;
+					}
+				}
 		}
 	}
 }
@@ -289,83 +308,169 @@ Assets::Assets(const AssetLoader &loader)
 
 }
 
-namespace {
+void AssetLoader::LoadBlockTypes(
+	const string &set_name,
+	BlockTypeRegistry &reg,
+	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 proto;
+	while (in.HasMore()) {
+		BlockType type;
+		in.ReadIdentifier(type.name);
+		in.Skip(Token::EQUALS);
+		if (in.Peek().type == Token::IDENTIFIER) {
+			// prototype
+			in.ReadIdentifier(proto);
+			type.Copy(reg.Get(proto));
+		}
+		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;
 
-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 }});
+	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;
 }
 
-void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry &reg, TextureIndex &tex_index) const {
-	string full = data + set_name + ".types";
+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 block type file " + full);
+		throw std::runtime_error("failed to open model file " + full);
 	}
 	TokenStreamReader in(file);
-	string type_name;
-	string name;
-	string tex_name;
-	string shape_name;
+	string model_name;
+	string prop_name;
 	while (in.HasMore()) {
-		in.ReadIdentifier(type_name);
+		in.ReadIdentifier(model_name);
 		in.Skip(Token::EQUALS);
-		BlockType type;
-
-		// read block type
 		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 AssetLoader::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 AssetLoader::LoadSound(const string &name) const {
@@ -402,7 +507,7 @@ void AssetLoader::LoadTexture(const string &name, ArrayTexture &tex, int layer)
 	SDL_FreeSurface(srf);
 }
 
-void AssetLoader::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()) {
@@ -411,22 +516,6 @@ void AssetLoader::LoadTextures(const TextureIndex &index, ArrayTexture &tex) con
 }
 
 
-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;