Rename TerrainMesh to GeoData to drop inplace

5 files changed, 10 insertions, 237 deletions

diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index d88a238..6f62056 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -46,7 +46,7 @@ lib test : [ glob *.cpp : test-*.cpp perf-*.cpp ] ;
 run test-collection.cpp ;
 run test-maths.cpp ;
 run test-lib.cpp ;
-run test-geo.cpp ;
+run test-geoData.cpp : -- : fixtures/height/SD19.asc : <library>test ;
 run test-network.cpp : : : <library>test ;
 run test-persistence.cpp : -- : [ sequence.insertion-sort [ glob-tree fixtures : *.json ] ] : <library>test ;
 run test-text.cpp : : : <library>test ;
@@ -55,13 +55,12 @@ run test-render.cpp : -- : test-assetFactory : <library>test ;
 run test-glContextBhvr.cpp ;
 run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt test-instancing ] : <library>test ;
 run perf-assetFactory.cpp : -- : test-assetFactory : <library>benchmark <library>test ;
+run perf-geoData.cpp : : : <library>test <library>benchmark ;
 run perf-persistence.cpp : -- : test-persistence : <library>benchmark <library>test ;
 run test-worker.cpp ;
 run test-instancing.cpp : : : <library>test ;
 run test-glContainer.cpp : : : <library>test ;
 run test-pack.cpp : : : <library>test ;
-run test-terrain.cpp : -- : fixtures/height/SD19.asc : <library>test <library>..//OpenMeshCore ;
-run perf-terrain.cpp : : : <library>test <library>..//OpenMeshCore <library>benchmark ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
 explicit perf-assetFactory ;
diff --git a/test/perf-terrain.cpp b/test/perf-geoData.cpp
index e998f60..e1546c1 100644
--- a/test/perf-terrain.cpp
+++ b/test/perf-geoData.cpp
@@ -1,8 +1,8 @@
 #include <benchmark/benchmark.h>
-#include <game/terrain2.h>
+#include <game/geoData.h>
 
 namespace {
-	const TerrainMesh tm {FIXTURESDIR "height/SD19.asc"};
+	const GeoData tm {GeoData::loadFromAsciiGrid(FIXTURESDIR "height/SD19.asc")};
 
 	void
 	terrain_findPoint(benchmark::State & state)
diff --git a/test/test-geo.cpp b/test/test-geo.cpp
deleted file mode 100644
index 9874fb7..0000000
--- a/test/test-geo.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-#define BOOST_TEST_MODULE test_geo
-
-#include "testHelpers.h"
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/unit_test.hpp>
-#include <stream_support.h>
-
-#include <game/geoData.h>
-#include <lib/ray.h>
-
-struct TestGeoData : public GeoData {
-	TestGeoData() : GeoData {{{-10, -5}, {30, 40}}, 5.F} { }
-};
-
-namespace std {
-	std::ostream &
-	operator<<(std::ostream & s, const Ray & r)
-	{
-		return (s << r.start << "->" << r.direction);
-	}
-}
-
-BOOST_FIXTURE_TEST_SUITE(tgd, TestGeoData)
-
-BOOST_AUTO_TEST_CASE(initialize)
-{
-	BOOST_CHECK_EQUAL(limit.first, glm::ivec2(-10, -5));
-	BOOST_CHECK_EQUAL(limit.second, glm::ivec2(30, 40));
-	BOOST_CHECK_EQUAL(scale, 5.F);
-	BOOST_CHECK_EQUAL(size, glm::uvec2(41, 46));
-	BOOST_CHECK_EQUAL(nodes.size(), 1886);
-	BOOST_CHECK(std::all_of(nodes.begin(), nodes.end(), [](const auto & n) {
-		return n.height == -1.5F;
-	}));
-}
-
-BOOST_AUTO_TEST_CASE(coords)
-{
-	BOOST_CHECK_EQUAL(at(-10, -5), 0);
-	BOOST_CHECK_EQUAL(at(-9, -5), 1);
-	BOOST_CHECK_EQUAL(at(0, -5), 10);
-	BOOST_CHECK_EQUAL(at(30, -5), 40);
-	BOOST_CHECK_EQUAL(at(30, 40), 1885);
-}
-
-BOOST_AUTO_TEST_CASE(coords_bad)
-{
-	BOOST_CHECK_THROW(std::ignore = at(-11, -5), std::range_error);
-	BOOST_CHECK_THROW(std::ignore = at(-10, -6), std::range_error);
-	BOOST_CHECK_THROW(std::ignore = at(-11, -6), std::range_error);
-	BOOST_CHECK_THROW(std::ignore = at(31, 40), std::range_error);
-	BOOST_CHECK_THROW(std::ignore = at(30, 41), std::range_error);
-	BOOST_CHECK_THROW(std::ignore = at(31, 41), std::range_error);
-}
-
-BOOST_AUTO_TEST_CASE(gen_random)
-{
-	// Can only really its sanity
-	generateRandom();
-	// Some terrain above sea level
-	BOOST_CHECK(std::any_of(nodes.begin(), nodes.end(), [](const auto & n) {
-		return n.height > 0;
-	}));
-	// Still an island
-	for (int x = limit.first.x; x <= limit.second.x; x += 1) {
-		BOOST_CHECK_EQUAL(nodes[at(x, limit.first.y)].height, -1.5F);
-		BOOST_CHECK_EQUAL(nodes[at(x, limit.second.y)].height, -1.5F);
-	}
-	for (int y = limit.first.y; y <= limit.second.y; y += 1) {
-		BOOST_CHECK_EQUAL(nodes[at(limit.first.x, y)].height, -1.5F);
-		BOOST_CHECK_EQUAL(nodes[at(limit.second.x, y)].height, -1.5F);
-	}
-}
-
-BOOST_AUTO_TEST_CASE(load_uk_heightmap)
-{
-	loadFromImages(FIXTURESDIR "/height/V0txo.jpg", 100.F);
-	// Some terrain above sea level
-	BOOST_CHECK(std::any_of(nodes.begin(), nodes.end(), [](const auto & n) {
-		return n.height > 0;
-	}));
-}
-
-BOOST_AUTO_TEST_CASE(get_height_at)
-{
-	// at(x,y) is index based
-	nodes[at(0, 0)].height = 1;
-	nodes[at(1, 0)].height = 2;
-	nodes[at(0, 1)].height = 3;
-	nodes[at(1, 1)].height = 4;
-
-	// positionAt(x,y) is world based
-	// Corners
-	BOOST_CHECK_EQUAL(positionAt({0, 0}), glm::vec3(0, 0, 1));
-	BOOST_CHECK_EQUAL(positionAt({5, 0}), glm::vec3(5, 0, 2));
-	BOOST_CHECK_EQUAL(positionAt({0, 5}), glm::vec3(0, 5, 3));
-	BOOST_CHECK_EQUAL(positionAt({5, 5}), glm::vec3(5, 5, 4));
-
-	// Edge midpoints
-	BOOST_CHECK_EQUAL(positionAt({0, 2.5F}), glm::vec3(0, 2.5F, 2));
-	BOOST_CHECK_EQUAL(positionAt({5, 2.5F}), glm::vec3(5, 2.5F, 3));
-	BOOST_CHECK_EQUAL(positionAt({2.5F, 0}), glm::vec3(2.5F, 0, 1.5F));
-	BOOST_CHECK_EQUAL(positionAt({2.5F, 5}), glm::vec3(2.5F, 5, 3.5F));
-
-	// Centre
-	BOOST_CHECK_EQUAL(positionAt({2.5F, 2.5F}), glm::vec3(2.5F, 2.5F, 2.5F));
-}
-
-using TestRayTracerData = std::tuple<glm::vec2, glm::vec2, glm::vec2::value_type, std::vector<glm::vec2>>;
-BOOST_TEST_DECORATOR(*boost::unit_test::timeout(1))
-
-BOOST_DATA_TEST_CASE(raytracer,
-		boost::unit_test::data::make<TestRayTracerData>({
-				{{1, 2}, {4, 5}, 4,
-						{
-								{0, 0},
-								{0, 4},
-								{4, 4},
-								{4, 8},
-								{8, 8},
-								{8, 12},
-								{12, 12},
-								{12, 16},
-								{12, 20},
-								{16, 20},
-						}},
-				{{-1, -1}, {-4, -5}, 5,
-						{
-								{-5, -5},
-								{-5, -10},
-								{-10, -10},
-								{-10, -15},
-								{-15, -15},
-								{-15, -20},
-								{-20, -20},
-								{-20, -25},
-						}},
-		}),
-		start, dir, scale, points)
-{
-	GeoData::RayTracer rt {start / scale, glm::normalize(dir)};
-	for (const auto & point : points) {
-		BOOST_CHECK_CLOSE_VEC(point, rt.next() * scale);
-	}
-}
-
-using TestRayData = std::tuple<glm::vec3, glm::vec3, glm::vec3>;
-BOOST_TEST_DECORATOR(*boost::unit_test::timeout(1))
-
-BOOST_DATA_TEST_CASE(intersect_ray,
-		boost::unit_test::data::make<TestRayData>({
-				{{-1, -1, 1.0}, {1, 1, 0}, {0, 0, 1}},
-				{{-1, -1, 2.5}, {1, 1, 0}, {2.5F, 2.5F, 2.5F}},
-				{{-20, -20, 2.5}, {1, 1, 0}, {2.5F, 2.5F, 2.5F}},
-				// outside the map looking in
-				{{-205, -205, 4}, {1, 1, 0}, {5, 5, 4}},
-				{{-205, 5, 4}, {1, 0, 0}, {5, 5, 4}},
-				{{-205, 215, 4}, {1, -1, 0}, {5, 5, 4}},
-				{{215, -205, 4}, {-1, 1, 0}, {5, 5, 4}},
-				{{215, 5, 4}, {-1, 0, 0}, {5, 5, 4}},
-				{{215, 215, 4}, {-1, -1, 0}, {5, 5, 4}},
-				{{5, 215, 4}, {0, -1, 0}, {5, 5, 4}},
-				{{5, -205, 4}, {0, 1, 0}, {5, 5, 4}},
-		}),
-		start, dir, pos)
-{
-	// at(x,y) is index based
-	nodes[at(0, 0)].height = 1;
-	nodes[at(1, 0)].height = 2;
-	nodes[at(0, 1)].height = 3;
-	nodes[at(1, 1)].height = 4;
-
-	const auto intersect = intersectRay({start, glm::normalize(dir)});
-
-	BOOST_CHECK_IF(has_intersect, intersect) {
-		BOOST_CHECK_CLOSE_VEC(*intersect, pos);
-	}
-}
-
-auto xs = boost::unit_test::data::xrange(-20.F, 0.F, 0.6F), ys = boost::unit_test::data::xrange(-20.F, 0.F, 0.7F);
-auto targetsx = boost::unit_test::data::xrange(0.2F, 4.9F, 1.3F),
-	 targetsy = boost::unit_test::data::xrange(0.3F, 4.9F, 1.3F);
-BOOST_TEST_DECORATOR(*boost::unit_test::timeout(1))
-
-BOOST_DATA_TEST_CASE(intersect_ray_many, xs * ys * targetsx * targetsy, x, y, targetx, targety)
-{
-	// at(x,y) is index based
-	nodes[at(0, 0)].height = 1;
-	nodes[at(1, 0)].height = 2;
-	nodes[at(0, 1)].height = 3;
-	nodes[at(1, 1)].height = 4;
-
-	const glm::vec3 start {x, y, 10};
-	const auto target {this->positionAt({targetx, targety})};
-	const Ray ray {start, glm::normalize(target - start)};
-
-	BOOST_TEST_CONTEXT(ray) {
-		const auto intersect = intersectRay(ray);
-
-		BOOST_CHECK_IF(has_intersect, intersect) {
-			BOOST_CHECK_CLOSE_VEC(*intersect, target);
-		}
-	}
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::timeout(1))
-
-BOOST_DATA_TEST_CASE(intersect_ray_miss,
-		boost::unit_test::data::make<Ray>({
-				{{3, 3, 5}, {-1, -1, 0}},
-				{{0, 0, 5}, {0, 0, 1}},
-				{{0, 0, 5}, {0, 0, -1}},
-		}),
-		ray)
-{
-	// at(x,y) is index based
-	nodes[at(0, 0)].height = 1;
-	nodes[at(1, 0)].height = 2;
-	nodes[at(0, 1)].height = 3;
-	nodes[at(1, 1)].height = 4;
-
-	BOOST_REQUIRE(!intersectRay(ray));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/test-terrain.cpp b/test/test-geoData.cpp
index 71fc1ec..d79f5b8 100644
--- a/test/test-terrain.cpp
+++ b/test/test-geoData.cpp
@@ -4,11 +4,11 @@
 #include <boost/test/unit_test.hpp>
 #include <stream_support.h>
 
-#include <game/terrain2.h>
+#include <game/geoData.h>
 
-class TestTerrainMesh : public TerrainMesh {
+class TestTerrainMesh : public GeoData {
 public:
-	TestTerrainMesh() : TerrainMesh {TerrainMesh::loadFromAsciiGrid(FIXTURESDIR "height/SD19.asc")} { }
+	TestTerrainMesh() : GeoData {GeoData::loadFromAsciiGrid(FIXTURESDIR "height/SD19.asc")} { }
 };
 
 constexpr size_t ncols = 200, nrows = 200, xllcorner = 310000, yllcorner = 490000, cellsize = 50;
@@ -82,7 +82,7 @@ BOOST_DATA_TEST_CASE(findPointOnTerrain,
 						{0, 1, 2, 3, 4, 5, 6, 10, 100, 150, 200, 1000, 1234, 17439, 79201, 79200, 79199}),
 		p, fh, start)
 {
-	BOOST_CHECK_EQUAL(fh, fixedTerrtain.findPoint(p, TerrainMesh::FaceHandle(start)).idx());
+	BOOST_CHECK_EQUAL(fh, fixedTerrtain.findPoint(p, GeoData::FaceHandle(start)).idx());
 }
 
 using FindPositionData = std::tuple<glm::vec2, float>;
@@ -149,7 +149,7 @@ BOOST_DATA_TEST_CASE(walkTerrainSetsFromFace,
 		}),
 		from, to, visits)
 {
-	TerrainMesh::PointFace pf {from};
+	GeoData::PointFace pf {from};
 	BOOST_CHECK_NO_THROW(fixedTerrtain.walk(pf, to, [](auto) {}));
 	BOOST_CHECK_EQUAL(pf.face(&fixedTerrtain).idx(), visits.front());
 }
diff --git a/test/test-render.cpp b/test/test-render.cpp
index b16f241..fb2a71b 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -26,8 +26,7 @@ class TestScene : public SceneProvider {
 	std::shared_ptr<RailVehicle> train1, train2;
 
 	Terrain terrain {[]() {
-		auto gd = std::make_shared<GeoData>(GeoData::Limits {{0, 0}, {100, 100}});
-		gd->generateRandom();
+		auto gd = std::make_shared<GeoData>(GeoData::createFlat({0, 0}, {1000, 1000}, 1));
 		return gd;
 	}()};