X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=35a3e3e8d37ada79dc8327160adfe1b4072838fa;hb=4727825186798902f68df5b99a6a32f0ef618454;hp=22a3b586a1850a38d8ba11d45003754f3d05d05b;hpb=07b8335e7bfd631e0878e183c87238812d632c56;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index 22a3b58..35a3e3e 100644 --- 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,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();