unified location handling

[blank.git] / src / app / app.cpp

diff --git a/src/app/app.cpp b/src/app/app.cpp
index ab5170f8ebc70233546b22b3d658ed92a629126d..35a3e3e8d37ada79dc8327160adfe1b4072838fa 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -161,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;
@@ -318,6 +319,7 @@ CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
 void AssetLoader::LoadBlockTypes(
        const string &set_name,
        BlockTypeRegistry &reg,
+       ResourceIndex &snd_index,
        ResourceIndex &tex_index,
        const ShapeRegistry &shapes
 ) const {
@@ -364,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") {
@@ -520,6 +528,10 @@ void AssetLoader::LoadModels(
                        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();