X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=ab5170f8ebc70233546b22b3d658ed92a629126d;hb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;hp=4368022eb59dbddc5c981f9e5e172af4af8f56cf;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 4368022..ab5170f 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"
@@ -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;
@@ -302,13 +309,18 @@ Assets::Assets(const AssetLoader &loader)
 
 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 }});
+CuboidBounds block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }});
+StairBounds stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f });
+CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
 
 }
 
-void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry &reg, TextureIndex &tex_index) const {
+void AssetLoader::LoadBlockTypes(
+	const string &set_name,
+	BlockTypeRegistry &reg,
+	ResourceIndex &tex_index,
+	const ShapeRegistry &shapes
+) const {
 	string full = data + set_name + ".types";
 	std::ifstream file(full);
 	if (!file) {
@@ -333,9 +345,21 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
 				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);
+				type.textures.push_back(tex_index.GetID(tex_name));
+			} else if (name == "textures") {
+				in.Skip(Token::BRACKET_OPEN);
+				while (in.Peek().type != Token::BRACKET_CLOSE) {
+					in.ReadString(tex_name);
+					type.textures.push_back(tex_index.GetID(tex_name));
+					if (in.Peek().type == Token::COMMA) {
+						in.Skip(Token::COMMA);
+					}
+				}
+				in.Skip(Token::BRACKET_CLOSE);
+			} else if (name == "rgb_mod") {
+				in.ReadVec(type.rgb_mod);
+			} else if (name == "hsl_mod") {
+				in.ReadVec(type.hsl_mod);
 			} else if (name == "outline") {
 				in.ReadVec(type.outline_color);
 			} else if (name == "label") {
@@ -348,22 +372,42 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
 				type.collision = in.GetBool();
 			} else if (name == "collide_block") {
 				type.collide_block = in.GetBool();
+			} else if (name == "generate") {
+				type.generate = in.GetBool();
+			} else if (name == "min_solidity") {
+				type.min_solidity = in.GetFloat();
+			} else if (name == "mid_solidity") {
+				type.mid_solidity = in.GetFloat();
+			} else if (name == "max_solidity") {
+				type.max_solidity = in.GetFloat();
+			} else if (name == "min_humidity") {
+				type.min_humidity = in.GetFloat();
+			} else if (name == "mid_humidity") {
+				type.mid_humidity = in.GetFloat();
+			} else if (name == "max_humidity") {
+				type.max_humidity = in.GetFloat();
+			} else if (name == "min_temperature") {
+				type.min_temperature = in.GetFloat();
+			} else if (name == "mid_temperature") {
+				type.mid_temperature = in.GetFloat();
+			} else if (name == "max_temperature") {
+				type.max_temperature = in.GetFloat();
+			} else if (name == "min_richness") {
+				type.min_richness = in.GetFloat();
+			} else if (name == "mid_richness") {
+				type.mid_richness = in.GetFloat();
+			} else if (name == "max_richness") {
+				type.max_richness = in.GetFloat();
+			} else if (name == "commonness") {
+				type.commonness = in.GetFloat();
 			} 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);
-				}
+				type.shape = &shapes.Get(shape_name);
 			} else {
-				throw runtime_error("unknown block property: " + name);
+				std::cerr << "warning: unknown block type property " << name << std::endl;
+				while (in.Peek().type != Token::SEMICOLON) {
+					in.Next();
+				}
 			}
 			in.Skip(Token::SEMICOLON);
 		}
@@ -374,11 +418,138 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
 	}
 }
 
+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;
+}
+
 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);
+		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 (prop_name == "root") {
+				model.RootPart().Read(in, tex_index, shapes);
+			} else {
+				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);
+	}
+}
+
+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 {
 	string full = sounds + name + ".wav";
 	return Sound(full.c_str());
@@ -413,7 +584,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()) {
@@ -422,22 +593,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;