X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp%2Fapp.cpp;h=35a3e3e8d37ada79dc8327160adfe1b4072838fa;hb=4727825186798902f68df5b99a6a32f0ef618454;hp=367f3c21bc2e0bc175d2554d1d428616b7ac6fc1;hpb=ba55bf4293f3abc742eef710545a4b207ba2c820;p=blank.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 367f3c2..35a3e3e 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -4,7 +4,6 @@
 #include "FrameCounter.hpp"
 #include "State.hpp"
 #include "StateControl.hpp"
-#include "TextureIndex.hpp"
 
 #include "init.hpp"
 #include "../audio/Sound.hpp"
@@ -14,8 +13,11 @@
 #include "../graphics/Texture.hpp"
 #include "../io/TokenStreamReader.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"
@@ -159,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;
@@ -316,7 +319,8 @@ CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
 void AssetLoader::LoadBlockTypes(
 	const string &set_name,
 	BlockTypeRegistry &reg,
-	TextureIndex &tex_index,
+	ResourceIndex &snd_index,
+	ResourceIndex &tex_index,
 	const ShapeRegistry &shapes
 ) const {
 	string full = data + set_name + ".types";
@@ -362,6 +366,12 @@ void AssetLoader::LoadBlockTypes(
 				in.ReadVec(type.outline_color);
 			} else if (name == "label") {
 				in.ReadString(type.label);
+			} else if (name == "place_sound") {
+				in.ReadString(tex_name);
+				type.place_sound = snd_index.GetID(tex_name);
+			} else if (name == "remove_sound") {
+				in.ReadString(tex_name);
+				type.remove_sound = snd_index.GetID(tex_name);
 			} else if (name == "luminosity") {
 				type.luminosity = in.GetInt();
 			} else if (name == "block_light") {
@@ -494,6 +504,47 @@ Font AssetLoader::LoadFont(const string &name, int size) const {
 	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 if (prop_name == "body") {
+				model.SetBody(in.GetULong());
+			} else if (prop_name == "eyes") {
+				model.SetEyes(in.GetULong());
+			} 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);
@@ -545,7 +596,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()) {
@@ -554,22 +605,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;