From 489fa7f930689dc9ff271138e613a8d68d88ee45 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 20 Sep 2024 20:17:32 +0100
Subject: Add basic environment object

Will hold world time/date, weather, location etc
---
 ui/gameMainWindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui')

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
-- 
cgit v1.2.3