summaryrefslogtreecommitdiff
path: root/game/terrain.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-05-27 13:44:08 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2024-05-27 13:44:08 +0100
commitad85d0843dc80d195120dd53dd4a8deee004af4b (patch)
tree420723815ac6753441f14fe51836555de5551a19 /game/terrain.h
parentMerge branch 'separate-water' (diff)
parentSurface asset test doesn't need render dump (diff)
downloadilt-ad85d0843dc80d195120dd53dd4a8deee004af4b.tar.bz2
ilt-ad85d0843dc80d195120dd53dd4a8deee004af4b.tar.xz
ilt-ad85d0843dc80d195120dd53dd4a8deee004af4b.zip
Merge remote-tracking branch 'origin/terrain-surfaces'
Diffstat (limited to 'game/terrain.h')
-rw-r--r--game/terrain.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/game/terrain.h b/game/terrain.h
index 54593fc..d088f89 100644
--- a/game/terrain.h
+++ b/game/terrain.h
@@ -2,6 +2,7 @@
#include "chronology.h"
#include "collection.h"
+#include "config/types.h"
#include "game/worldobject.h"
#include <gfx/models/mesh.h>
#include <gfx/renderable.h>
@@ -20,10 +21,16 @@ public:
void tick(TickDuration) override;
+ struct Vertex {
+ GlobalPosition3D pos;
+ Normal3D normal;
+ RGB colourBias;
+ };
+
private:
void generateMeshes();
std::shared_ptr<GeoData> geoData;
- Collection<Mesh, false> meshes;
+ Collection<MeshT<Vertex>, false> meshes;
std::shared_ptr<Texture> grass;
};