diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-04-08 00:59:52 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-04-08 00:59:52 +0100 |
| commit | 34ea78ea50b015d660fbd9169f61506363959214 (patch) | |
| tree | 1cb1de6865c0c35e2c35fcd6e2b5610b0eedd8ab /application/main.cpp | |
| parent | Merge remote-tracking branch 'origin/deform-terrain' (diff) | |
| parent | Fix water texture wrapper in light of large position values (diff) | |
| download | ilt-34ea78ea50b015d660fbd9169f61506363959214.tar.bz2 ilt-34ea78ea50b015d660fbd9169f61506363959214.tar.xz ilt-34ea78ea50b015d660fbd9169f61506363959214.zip | |
Merge branch 'separate-water'
Diffstat (limited to 'application/main.cpp')
| -rw-r--r-- | application/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/application/main.cpp b/application/main.cpp index adaec9b..f0ba8bb 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -18,6 +18,7 @@ #include <game/vehicles/railVehicle.h> #include <game/vehicles/railVehicleClass.h> #include <game/vehicles/train.h> +#include <game/water.h> #include <game/worldobject.h> #include <glm/glm.hpp> #include <glm/gtx/transform.hpp> // IWYU pragma: keep @@ -43,6 +44,7 @@ public: windows.create<GameMainWindow>(DISPLAY_WIDTH, DISPLAY_HEIGHT); world.create<Terrain>(geoData); + world.create<Water>(geoData); assets = AssetFactory::loadAll("res"); { |