diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-11-13 15:44:09 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-11-14 23:46:14 +0000 |
| commit | b27c66cb2aaa897e4c18b3be3a0b121b6695e7e1 (patch) | |
| tree | dec28585a610de4618d392fe72fd4e4968c2f636 /ui/gameMainWindow.cpp | |
| parent | Pass the output framebuffer id to scene renderer (diff) | |
| download | ilt-b27c66cb2aaa897e4c18b3be3a0b121b6695e7e1.tar.bz2 ilt-b27c66cb2aaa897e4c18b3be3a0b121b6695e7e1.tar.xz ilt-b27c66cb2aaa897e4c18b3be3a0b121b6695e7e1.zip | |
Refactor shading output components
SceneShader and Camera are part of SceneRenderer
Diffstat (limited to 'ui/gameMainWindow.cpp')
| -rw-r--r-- | ui/gameMainWindow.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index dfb51e9..e49f4a9 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -3,7 +3,6 @@ #include "gameMainSelector.h" #include "gfx/camera_controller.h" #include "manualCameraController.h" -#include "maths.h" #include "modeHelper.hpp" #include "toolbar.h" #include "window.h" @@ -30,8 +29,7 @@ public: }; GameMainWindow::GameMainWindow(size_t w, size_t h) : - Window {w, h, "I Like Trains", SDL_WINDOW_OPENGL}, SceneRenderer {size, 0}, camera {{-1250.0F, -1250.0F, 35.0F}, quarter_pi, rdiv(w, h), - 0.1F, 10000.0F} + Window {w, h, "I Like Trains", SDL_WINDOW_OPENGL}, SceneRenderer {size, 0} { uiComponents.create<ManualCameraController>(glm::vec2 {-1150, -1150}); auto gms = uiComponents.create<GameMainSelector>(&camera, glm::vec2 {w, h}); @@ -42,13 +40,12 @@ void GameMainWindow::tick(TickDuration) { uiComponents.apply<CameraController>(&CameraController::updateCamera, &camera); - shader.setView(camera.GetViewProjection()); } void GameMainWindow::render() const { - SceneRenderer::render([this] { + SceneRenderer::render([this](const auto & shader) { gameState->world.apply<Renderable>(&Renderable::render, shader); uiComponents.apply<WorldOverlay>(&WorldOverlay::render, shader); }); |