diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-09-23 20:11:20 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-09-23 20:11:20 +0100 |
| commit | 7aeca8c54d218f28ba8d4f0e5be1aec6219dbf54 (patch) | |
| tree | 6f9c122e0abdb4949a3c102b2245d007969d6091 /ui | |
| parent | Don't create lots of unnecessary tmps (diff) | |
| parent | Adjust light colour as sun rises/sets (diff) | |
| download | ilt-7aeca8c54d218f28ba8d4f0e5be1aec6219dbf54.tar.bz2 ilt-7aeca8c54d218f28ba8d4f0e5be1aec6219dbf54.tar.xz ilt-7aeca8c54d218f28ba8d4f0e5be1aec6219dbf54.zip | |
Merge branch 'sunpos'
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gameMainWindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index 6168504..c53300b 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -1,16 +1,17 @@ #include "gameMainWindow.h" #include "editNetwork.h" #include "gameMainSelector.h" -#include "gfx/camera_controller.h" #include "manualCameraController.h" #include "modeHelper.h" #include "toolbar.h" #include "window.h" #include <SDL2/SDL.h> #include <collection.h> +#include <game/environment.h> #include <game/gamestate.h> #include <game/network/rail.h> #include <game/worldobject.h> // IWYU pragma: keep +#include <gfx/camera_controller.h> #include <gfx/renderable.h> #include <glad/gl.h> #include <glm/glm.hpp> @@ -65,10 +66,9 @@ GameMainWindow::content(const SceneShader & shader) const } void -GameMainWindow::environment(const SceneShader & s, const SceneRenderer & r) const +GameMainWindow::environment(const SceneShader &, const SceneRenderer & r) const { - // default for now - SceneProvider::environment(s, r); + gameState->environment->render(r, *this); } void |