4 files changed, 91 insertions, 11 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
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;
 };
diff --git a/game/water.cpp b/game/water.cpp
new file mode 100644
index 0000000..1c0e9ca
--- /dev/null
+++ b/game/water.cpp
@@ -0,0 +1,59 @@
+#include "water.h"
+#include "game/geoData.h"
+#include "gfx/models/texture.h"
+#include <algorithm>
+#include <cstddef>
+#include <gfx/gl/sceneShader.h>
+#include <gfx/gl/shadowMapper.h>
+#include <gfx/image.h>
+#include <gfx/models/mesh.h>
+#include <gfx/models/vertex.h>
+#include <glm/glm.hpp>
+#include <iterator>
+#include <location.h>
+#include <maths.h>
+#include <utility>
+#include <vector>
+
+Water::Water(std::shared_ptr<GeoData> tm) : geoData {std::move(tm)}, water {std::make_shared<Texture>("water.png")}
+{
+	generateMeshes();
+}
+
+void
+Water::generateMeshes()
+{
+	std::vector<unsigned int> indices;
+	indices.reserve(geoData->n_faces() * 3);
+	std::vector<Vertex> vertices;
+	vertices.reserve(geoData->n_vertices());
+	std::map<GeoData::VertexHandle, size_t> vertexIndex;
+	std::transform(geoData->vertices_sbegin(), geoData->vertices_end(), std::back_inserter(vertices),
+			[this, &vertexIndex](const GeoData::VertexHandle v) {
+				vertexIndex.emplace(v, vertexIndex.size());
+				const auto p = geoData->point(v);
+				return Vertex {p, RelativePosition2D(p) / 10000.F, geoData->normal(v)};
+			});
+	std::for_each(
+			geoData->faces_sbegin(), geoData->faces_end(), [this, &vertexIndex, &indices](const GeoData::FaceHandle f) {
+				std::transform(geoData->fv_begin(f), geoData->fv_end(f), std::back_inserter(indices),
+						[&vertexIndex](const GeoData::VertexHandle v) {
+							return vertexIndex[v];
+						});
+			});
+	meshes.create<Mesh>(vertices, indices);
+}
+
+void
+Water::tick(TickDuration dur)
+{
+	waveCycle += dur.count();
+}
+
+void
+Water::render(const SceneShader & shader) const
+{
+	shader.water.use(waveCycle);
+	water->bind();
+	meshes.apply(&Mesh::Draw);
+}
diff --git a/game/water.h b/game/water.h
new file mode 100644
index 0000000..20796d7
--- /dev/null
+++ b/game/water.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "chronology.h"
+#include "collection.h"
+#include "game/worldobject.h"
+#include <gfx/models/mesh.h>
+#include <gfx/renderable.h>
+#include <memory>
+
+class SceneShader;
+class Texture;
+class GeoData;
+
+class Water : public WorldObject, public Renderable {
+public:
+	explicit Water(std::shared_ptr<GeoData>);
+
+	void render(const SceneShader & shader) 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> water;
+};