diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-09-20 20:17:32 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-09-20 20:17:44 +0100 |
| commit | 489fa7f930689dc9ff271138e613a8d68d88ee45 (patch) | |
| tree | f4f4b3c8ca55e08f797dc04e0ba3d745133fba13 /ui | |
| parent | Update getSunPos to use a standard time_t (diff) | |
| download | ilt-489fa7f930689dc9ff271138e613a8d68d88ee45.tar.bz2 ilt-489fa7f930689dc9ff271138e613a8d68d88ee45.tar.xz ilt-489fa7f930689dc9ff271138e613a8d68d88ee45.zip | |
Add basic environment object
Will hold world time/date, weather, location etc
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 |