diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-07-07 00:25:19 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-07-07 00:25:19 +0100 |
| commit | b43ed0554f5d6326f80e8d6bd85d75a422ca8c05 (patch) | |
| tree | 596e967d69b073109dad7db437a60093bf499e26 /ui/gameMainWindow.cpp | |
| parent | Replace deprecated GL_QUADS usage in text rendering (diff) | |
| parent | Replace deprecated GL_QUADS usage in text rendering (diff) | |
| download | ilt-b43ed0554f5d6326f80e8d6bd85d75a422ca8c05.tar.bz2 ilt-b43ed0554f5d6326f80e8d6bd85d75a422ca8c05.tar.xz ilt-b43ed0554f5d6326f80e8d6bd85d75a422ca8c05.zip | |
Merge branch 'imgui'
Diffstat (limited to 'ui/gameMainWindow.cpp')
| -rw-r--r-- | ui/gameMainWindow.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index ccbcdba..6168504 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -27,14 +27,15 @@ public: } }; -GameMainWindow::GameMainWindow(size_t w, size_t h) : - Window {w, h, "I Like Trains", SDL_WINDOW_OPENGL}, SceneRenderer {Window::size, 0} +GameMainWindow::GameMainWindow(size_t w, size_t h) : WindowContent {w, h}, SceneRenderer {{w, h}, 0} { uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810}); auto gms = uiComponents.create<GameMainSelector>(&camera, ScreenAbsCoord {w, h}); uiComponents.create<GameMainToolbar>(gms.get()); } +GameMainWindow::~GameMainWindow() { } + void GameMainWindow::tick(TickDuration) { @@ -45,7 +46,10 @@ void GameMainWindow::render() const { SceneRenderer::render(*this); - Window::render(); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDisable(GL_DEPTH_TEST); + uiComponents.apply(&UIComponent::render, uiShader, UIComponent::Position {}); } void |