diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-01-14 01:46:50 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-01-16 15:43:10 +0000 |
| commit | 574d767d54edbca6d4a01e6ab876a26f7478ff5f (patch) | |
| tree | 0ec5021f1fe59a3169bf8dc69a35278154456689 /ui | |
| parent | Progressive constructors for RayTracer (diff) | |
| download | ilt-574d767d54edbca6d4a01e6ab876a26f7478ff5f.tar.bz2 ilt-574d767d54edbca6d4a01e6ab876a26f7478ff5f.tar.xz ilt-574d767d54edbca6d4a01e6ab876a26f7478ff5f.zip | |
Process UI layers in reverse, so it's stack like
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gameMainWindow.cpp | 3 | ||||
| -rw-r--r-- | ui/window.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index 3f9ce8c..b559341 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -75,6 +75,7 @@ public: else { clicked.clear(); } + return true; } } return false; @@ -88,9 +89,9 @@ private: GameMainWindow::GameMainWindow(size_t w, size_t h) : Window {w, h, "I Like Trains"}, camera {{-1250.0F, -1250.0F, 35.0F}, quarter_pi, rdiv(w, h), 0.1F, 10000.0F} { + uiComponents.create<ManualCameraController>(glm::vec2 {-1150, -1150}); uiComponents.create<GameMainSelector>(&camera, glm::vec2 {w, h}); uiComponents.create<GameMainToolbar>(); - uiComponents.create<ManualCameraController>(glm::vec2 {-1150, -1150}); shader.setUniform("lightDirection", glm::normalize(glm::vec3 {1, 0, -1})); shader.setUniform("lightColor", {.6, .6, .6}); diff --git a/ui/window.cpp b/ui/window.cpp index 74a3a2f..9ecc88c 100644 --- a/ui/window.cpp +++ b/ui/window.cpp @@ -63,7 +63,7 @@ Window::handleInput(const SDL_Event & e) eAdjusted.button.y = size.y - e.button.y;
break;
}
- uiComponents.applyOne(&UIComponent::handleInput, eAdjusted, UIComponent::Position {{}, size});
+ uiComponents.rapplyOne(&UIComponent::handleInput, eAdjusted, UIComponent::Position {{}, size});
return true;
}
return false;
|