unified location handling

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

diff --git a/src/app/app.cpp b/src/app/app.cpp
index b3b330036b5e2f0c855266c0219dee023a2eebee..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;
@@ -527,6 +528,8 @@ 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 {