summaryrefslogtreecommitdiff
path: root/game/terrain.h
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.h
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.h')
-rw-r--r--game/terrain.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/game/terrain.h b/game/terrain.h
index d62f138..54593fc 100644
--- a/game/terrain.h
+++ b/game/terrain.h
@@ -19,12 +19,11 @@ public:
void shadows(const ShadowMapper &) const override;
void tick(TickDuration) override;
- float waveCycle {0.F};
private:
void generateMeshes();
std::shared_ptr<GeoData> geoData;
Collection<Mesh, false> meshes;
- std::shared_ptr<Texture> grass, water;
+ std::shared_ptr<Texture> grass;
};