From 737ce277a6e49d88a04be1e384eef09d486f513b Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 6 Apr 2024 00:47:37 +0100 Subject: Split water from terrain Shares the geo data instance, and still has the same implementation at this stage. --- application/main.cpp | 2 ++ game/terrain.cpp | 11 ++-------- game/terrain.h | 3 +-- game/water.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ game/water.h | 29 ++++++++++++++++++++++++++ test/test-render.cpp | 15 ++++++++----- 6 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 game/water.cpp create mode 100644 game/water.h 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 #include #include +#include #include #include #include // IWYU pragma: keep @@ -43,6 +44,7 @@ public: windows.create(DISPLAY_WIDTH, DISPLAY_HEIGHT); world.create(geoData); + world.create(geoData); assets = AssetFactory::loadAll("res"); { 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 #include -Terrain::Terrain(std::shared_ptr tm) : - geoData {std::move(tm)}, grass {std::make_shared("grass.png")}, - water {std::make_shared("water.png")} +Terrain::Terrain(std::shared_ptr tm) : geoData {std::move(tm)}, grass {std::make_shared("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; Collection meshes; - std::shared_ptr grass, water; + std::shared_ptr 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +Water::Water(std::shared_ptr tm) : geoData {std::move(tm)}, water {std::make_shared("water.png")} +{ + generateMeshes(); +} + +void +Water::generateMeshes() +{ + std::vector indices; + indices.reserve(geoData->n_faces() * 3); + std::vector vertices; + vertices.reserve(geoData->n_vertices()); + std::map 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(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 +#include +#include + +class SceneShader; +class Texture; +class GeoData; + +class Water : public WorldObject, public Renderable { +public: + explicit Water(std::shared_ptr); + + void render(const SceneShader & shader) const override; + + void tick(TickDuration) override; + float waveCycle {0.F}; + +private: + void generateMeshes(); + + std::shared_ptr geoData; + Collection meshes; + std::shared_ptr water; +}; diff --git a/test/test-render.cpp b/test/test-render.cpp index 6c20a23..79424f5 100644 --- a/test/test-render.cpp +++ b/test/test-render.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -26,11 +27,10 @@ class TestScene : public SceneProvider { AssetFactory::loadXML(RESDIR "/brush47.xml")->assets.at("brush-47")); std::shared_ptr train1, train2; RailLinks rail; + std::shared_ptr gd = std::make_shared(GeoData::createFlat({0, 0}, {1000000, 1000000}, 1)); - Terrain terrain {[]() { - auto gd = std::make_shared(GeoData::createFlat({0, 0}, {1000000, 1000000}, 1)); - return gd; - }()}; + Terrain terrain {gd}; + Water water {gd}; public: TestScene() @@ -51,6 +51,7 @@ public: content(const SceneShader & shader) const override { terrain.render(shader); + water.render(shader); brush47rvc->render(shader); rail.render(shader); } @@ -132,12 +133,16 @@ BOOST_AUTO_TEST_CASE(terrain) ss.camera.setView({310000000, 490000000, 600000}, glm::normalize(glm::vec3 {1, 1, -0.5F})); class TestTerrain : public SceneProvider { - Terrain terrain {std::make_shared(GeoData::loadFromAsciiGrid(FIXTURESDIR "height/SD19.asc"))}; + std::shared_ptr gd + = std::make_shared(GeoData::loadFromAsciiGrid(FIXTURESDIR "height/SD19.asc")); + Terrain terrain {gd}; + Water water {gd}; void content(const SceneShader & shader) const override { terrain.render(shader); + water.render(shader); } void -- cgit v1.2.3