From c83ab730392563277dcdd2aeea734877e18fdecf Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Wed, 18 Oct 2017 23:33:35 +0800 Subject: [PATCH] Update data and emergent submodules --- data | 2 +- lib/emergent | 2 +- src/application.cpp | 11 +++++++++++ src/application.hpp | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/data b/data index 497de41..031f41c 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 497de41a1d7cc7d82f73e6e9bb6da154f9f7eaee +Subproject commit 031f41c969d81eb5fd74bd66fda086c9c1860fce diff --git a/lib/emergent b/lib/emergent index 1295773..b69db97 160000 --- a/lib/emergent +++ b/lib/emergent @@ -1 +1 @@ -Subproject commit 1295773c23e7bf5e1f65f3a4dc61652cc8aba9f9 +Subproject commit b69db97c5eaf02a34bb7af3a3ef8dcb92597cb51 diff --git a/src/application.cpp b/src/application.cpp index fbce7c2..28c591e 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -1421,14 +1421,25 @@ bool Application::loadGame() void Application::resizeUI() { + // Adjust render target dimensions + defaultRenderTarget.width = static_cast(resolution.x); + defaultRenderTarget.height = static_cast(resolution.y); + // Adjust UI dimensions uiRootElement->setDimensions(resolution); uiRootElement->update(); + darkenImage->setDimensions(resolution); + // Adjust UI camera projection uiCamera.setOrthographic(0.0f, resolution.x, resolution.y, 0.0f, -1.0f, 1.0f); } +void Application::restringUI() +{ + +} + void Application::openMenu(Menu* menu) { if (activeMenu != nullptr) diff --git a/src/application.hpp b/src/application.hpp index 0a5e4d7..a4f3802 100644 --- a/src/application.hpp +++ b/src/application.hpp @@ -87,6 +87,7 @@ public: void resizeUI(); + void restringUI(); void openMenu(Menu* menu); void closeMenu();