Browse Source

Update data and emergent submodules

master
C. J. Howard 7 years ago
parent
commit
c83ab73039
4 changed files with 14 additions and 2 deletions
  1. +1
    -1
      data
  2. +1
    -1
      lib/emergent
  3. +11
    -0
      src/application.cpp
  4. +1
    -0
      src/application.hpp

+ 1
- 1
data

@ -1 +1 @@
Subproject commit 497de41a1d7cc7d82f73e6e9bb6da154f9f7eaee
Subproject commit 031f41c969d81eb5fd74bd66fda086c9c1860fce

+ 1
- 1
lib/emergent

@ -1 +1 @@
Subproject commit 1295773c23e7bf5e1f65f3a4dc61652cc8aba9f9
Subproject commit b69db97c5eaf02a34bb7af3a3ef8dcb92597cb51

+ 11
- 0
src/application.cpp View File

@ -1421,14 +1421,25 @@ bool Application::loadGame()
void Application::resizeUI() void Application::resizeUI()
{ {
// Adjust render target dimensions
defaultRenderTarget.width = static_cast<int>(resolution.x);
defaultRenderTarget.height = static_cast<int>(resolution.y);
// Adjust UI dimensions // Adjust UI dimensions
uiRootElement->setDimensions(resolution); uiRootElement->setDimensions(resolution);
uiRootElement->update(); uiRootElement->update();
darkenImage->setDimensions(resolution);
// Adjust UI camera projection // Adjust UI camera projection
uiCamera.setOrthographic(0.0f, resolution.x, resolution.y, 0.0f, -1.0f, 1.0f); uiCamera.setOrthographic(0.0f, resolution.x, resolution.y, 0.0f, -1.0f, 1.0f);
} }
void Application::restringUI()
{
}
void Application::openMenu(Menu* menu) void Application::openMenu(Menu* menu)
{ {
if (activeMenu != nullptr) if (activeMenu != nullptr)

+ 1
- 0
src/application.hpp View File

@ -87,6 +87,7 @@ public:
void resizeUI(); void resizeUI();
void restringUI();
void openMenu(Menu* menu); void openMenu(Menu* menu);
void closeMenu(); void closeMenu();

Loading…
Cancel
Save