summaryrefslogtreecommitdiff
path: root/game/terrain.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-04-08 00:59:52 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2024-04-08 00:59:52 +0100
commit34ea78ea50b015d660fbd9169f61506363959214 (patch)
tree1cb1de6865c0c35e2c35fcd6e2b5610b0eedd8ab /game/terrain.cpp
parentMerge remote-tracking branch 'origin/deform-terrain' (diff)
parentFix water texture wrapper in light of large position values (diff)
downloadilt-34ea78ea50b015d660fbd9169f61506363959214.tar.bz2
ilt-34ea78ea50b015d660fbd9169f61506363959214.tar.xz
ilt-34ea78ea50b015d660fbd9169f61506363959214.zip
Merge branch 'separate-water'
Diffstat (limited to 'game/terrain.cpp')
-rw-r--r--game/terrain.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/game/terrain.cpp b/game/terrain.cpp
index 91a228f..201c732 100644
--- a/game/terrain.cpp
+++ b/game/terrain.cpp
@@ -15,9 +15,7 @@
#include <utility>
#include <vector>
-Terrain::Terrain(std::shared_ptr<GeoData> tm) :
- geoData {std::move(tm)}, grass {std::make_shared<Texture>("grass.png")},
- water {std::make_shared<Texture>("water.png")}
+Terrain::Terrain(std::shared_ptr<GeoData> tm) : geoData {std::move(tm)}, grass {std::make_shared<Texture>("grass.png")}
{
generateMeshes();
}
@@ -47,9 +45,8 @@ Terrain::generateMeshes()
}
void
-Terrain::tick(TickDuration dur)
+Terrain::tick(TickDuration)
{
- waveCycle += dur.count();
}
void
@@ -58,10 +55,6 @@ Terrain::render(const SceneShader & shader) const
shader.landmass.use();
grass->bind();
meshes.apply(&Mesh::Draw);
-
- shader.water.use(waveCycle);
- water->bind();
- meshes.apply(&Mesh::Draw);
}
void