From 48a891316490fd8bc8574aafbd390eb96011ee40 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 10 Apr 2023 14:35:56 +0100
Subject: test-assetFactory depends on all resource files

---
 test/Jamfile.jam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index bf1c408..390880d 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -54,7 +54,7 @@ run test-text.cpp ;
 run test-enumDetails.cpp ;
 run test-render.cpp : : : <library>test ;
 run test-glContextBhvr.cpp ;
-run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.xml *.png ] fixtures/rgb.txt ] : <library>test ;
+run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt ] : <library>test ;
 run perf-assetFactory.cpp : : : <library>benchmark <library>test <dependency>test-assetFactory ;
 run perf-persistence.cpp : : : <library>benchmark <library>test <dependency>test-persistence ;
 compile test-static-enumDetails.cpp ;
-- 
cgit v1.2.3


From b25bc3cc32c5a9057c66ad282fa1cdfe0ed6094a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 10 Apr 2023 18:45:13 +0100
Subject: First cut loading assets using assimp

This is far from perfect, specifically the created texture atlas is not compatibile with wrapping texture UVs
---
 assetFactory/assetFactory.cpp |   5 +-
 assetFactory/assetFactory.h   |   3 ++
 assetFactory/assimp.cpp       | 119 ++++++++++++++++++++++++++++++++++++++++++
 assetFactory/assimp.h         |  14 +++++
 res/foliage.xml               |   9 ++++
 test/perf-assetFactory.cpp    |  11 ++++
 test/test-assetFactory.cpp    |  17 ++++++
 7 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 assetFactory/assimp.cpp
 create mode 100644 assetFactory/assimp.h
 create mode 100644 res/foliage.xml

(limited to 'test')

diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index ec0e19f..917edfe 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -109,7 +109,7 @@ AssetFactory::createTexutre() const
 		std::transform(
 				textureFragments.begin(), textureFragments.end(), std::back_inserter(imageSizes), [](const auto & tf) {
 					return TexturePacker::Image {tf.second->image->width, tf.second->image->height};
-		});
+				});
 		const auto [layout, outSize] = TexturePacker {imageSizes}.pack();
 		// * create texture
 		texture = std::make_shared<Texture>(outSize.x, outSize.y, TextureOptions {.wrap = GL_CLAMP_TO_EDGE});
@@ -134,7 +134,8 @@ AssetFactory::persist(Persistence::PersistenceStore & store)
 	using MapObjects = Persistence::MapByMember<Shapes, std::shared_ptr<Object>>;
 	using MapAssets = Persistence::MapByMember<Assets>;
 	using MapTextureFragments = Persistence::MapByMember<TextureFragments>;
+	using MapAssImp = Persistence::MapByMember<AssImps, std::shared_ptr<AssImp>, &AssImp::path>;
 	return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects)
 			&& STORE_NAME_HELPER("textureFragment", textureFragments, MapTextureFragments)
-			&& STORE_NAME_HELPER("asset", assets, MapAssets);
+			&& STORE_NAME_HELPER("assimp", assimps, MapAssImp) && STORE_NAME_HELPER("asset", assets, MapAssets);
 }
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
index 52692c4..7843d44 100644
--- a/assetFactory/assetFactory.h
+++ b/assetFactory/assetFactory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "asset.h"
+#include "assimp.h"
 #include "persistence.h"
 #include "shape.h"
 #include "textureFragment.h"
@@ -12,6 +13,7 @@ class AssetFactory : public Persistence::Persistable {
 public:
 	using Shapes = std::map<std::string, Shape::Ptr, std::less<>>;
 	using Assets = std::map<std::string, Asset::Ptr, std::less<>>;
+	using AssImps = std::map<std::string, AssImp::Ptr, std::less<>>;
 	using TextureFragments = std::map<std::string, TextureFragment::Ptr, std::less<>>;
 	using Colour = glm::vec3;
 	using ColourAlpha = glm::vec4;
@@ -26,6 +28,7 @@ public:
 
 	Shapes shapes;
 	Assets assets;
+	AssImps assimps;
 	Colours colours;
 	TextureFragments textureFragments;
 
diff --git a/assetFactory/assimp.cpp b/assetFactory/assimp.cpp
new file mode 100644
index 0000000..55090f4
--- /dev/null
+++ b/assetFactory/assimp.cpp
@@ -0,0 +1,119 @@
+#include "assimp.h"
+#include "assetFactory.h"
+#include "collections.hpp"
+#include "ptr.hpp"
+#include "resource.h"
+#include <assimp/cimport.h>
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include <stb/stb_image.h>
+
+template<typename T>
+glm::vec<3, T>
+operator*(const aiVector3t<T> & v)
+{
+	return {v.x, v.y, v.z};
+}
+
+template<typename T>
+glm::vec<2, T>
+operator!(const aiVector3t<T> & v)
+{
+	return {v.x, v.y};
+}
+
+#define AIRANGE(parent, member) \
+	std::span \
+	{ \
+		(parent)->m##member, (parent)->mNum##member \
+	}
+
+using ScemeCPtr = std::shared_ptr<const aiScene>;
+class AssImpNode : public Shape {
+public:
+	AssImpNode(ScemeCPtr scene, const aiNode * node) : scene(std::move(scene)), node(node) { }
+
+	ScemeCPtr scene;
+	const aiNode * node;
+
+	CreatedFaces
+	createMesh(ModelFactoryMesh & mesh, float) const
+	{
+		CreatedFaces faces;
+		addMesh(faces, mesh, node);
+		return faces;
+	}
+
+	void
+	addMesh(CreatedFaces & faces, ModelFactoryMesh & mesh, const aiNode * node) const
+	{
+		for (const auto & m : AIRANGE(node, Meshes)) {
+			addMesh(faces, mesh, scene->mMeshes[m]);
+		}
+		for (const auto & n : AIRANGE(node, Children)) {
+			addMesh(faces, mesh, n);
+		}
+	}
+
+	void
+	addMesh(CreatedFaces & faces, ModelFactoryMesh & mesh, const aiMesh * amesh) const
+	{
+		const auto vhs = AIRANGE(amesh, Vertices) * [&mesh](auto && v) {
+			return mesh.add_vertex(*v);
+		};
+		const auto & m = *scene->mMaterials[amesh->mMaterialIndex];
+
+		AssetFactory::TextureFragmentCoords tfc;
+		if (auto mf = Persistence::ParseBase::getShared<AssetFactory>("assetFactory")) {
+			aiString path;
+			m.Get(AI_MATKEY_TEXTURE_DIFFUSE(0), path);
+			tfc = mf->getTextureCoords(path.C_Str());
+		}
+
+		for (const auto & f : AIRANGE(amesh, Faces)) {
+			const auto fvhs = AIRANGE(&f, Indices) * [&vhs](auto && i) {
+				return vhs[i];
+			};
+			const auto fh = faces.emplace(mesh.add_namedFace(amesh->mName.C_Str(), fvhs))->second;
+			if (amesh->HasTextureCoords(0)) {
+				for (auto idx = f.mIndices; const auto fheh : mesh.fh_range(fh)) {
+					const auto ouv = !amesh->mTextureCoords[0][*idx++];
+					const auto uv = glm::mix(tfc[0], tfc[2], ouv);
+					mesh.set_texcoord2D(fheh, uv);
+				}
+			}
+		}
+	}
+};
+
+void
+AssImp::postLoad()
+{
+	ScemeCPtr scene {
+			aiImportFile(Resource::mapPath(path).c_str(), aiProcess_RemoveRedundantMaterials), &aiReleaseImport};
+	if (!scene) {
+		throw std::runtime_error("Failed to load asset library: " + path);
+	}
+	if (auto mf = Persistence::ParseBase::getShared<AssetFactory>("assetFactory")) {
+		const auto root = AIRANGE(scene->mRootNode, Children);
+		std::transform(
+				root.begin(), root.end(), std::inserter(mf->shapes, mf->shapes.end()), [&scene](const aiNode * m) {
+					return AssetFactory::Shapes::value_type {m->mName.C_Str(), std::make_shared<AssImpNode>(scene, m)};
+				});
+		const auto textures = AIRANGE(scene, Textures);
+		std::transform(textures.begin(), textures.end(),
+				std::inserter(mf->textureFragments, mf->textureFragments.end()), [](const aiTexture * t) {
+					auto texture = std::make_shared<TextureFragment>();
+					texture->id = texture->path = t->mFilename.C_Str();
+					texture->image = std::make_unique<Image>(
+							std::span {reinterpret_cast<unsigned char *>(t->pcData), t->mWidth}, STBI_rgb_alpha);
+					return AssetFactory::TextureFragments::value_type {texture->id, texture};
+				});
+	}
+}
+
+bool
+AssImp::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(path);
+}
diff --git a/assetFactory/assimp.h b/assetFactory/assimp.h
new file mode 100644
index 0000000..55b551d
--- /dev/null
+++ b/assetFactory/assimp.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "persistence.h"
+
+class AssImp : public Persistence::Persistable {
+public:
+	using Ptr = std::shared_ptr<AssImp>;
+
+	void postLoad() override;
+
+	bool persist(Persistence::PersistenceStore & store) override;
+
+	std::string path;
+};
diff --git a/res/foliage.xml b/res/foliage.xml
new file mode 100644
index 0000000..1b0a1aa
--- /dev/null
+++ b/res/foliage.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ilt p.id="assetFactory">
+  <assimp path="shapespark-low-poly-plants-kit.fbx"/>
+  <asset p.typeid="Foliage" id="Tree-01-1" name="Tree-01-1">
+    <bodyMesh id="body">
+      <use type="Tree-01-1"/>
+    </bodyMesh>
+  </asset>
+</ilt>
diff --git a/test/perf-assetFactory.cpp b/test/perf-assetFactory.cpp
index c90ac52..147e4ba 100644
--- a/test/perf-assetFactory.cpp
+++ b/test/perf-assetFactory.cpp
@@ -14,6 +14,17 @@ brush47xml_load(benchmark::State & state)
 	}
 }
 
+static void
+foliagexml_load(benchmark::State & state)
+{
+	TestMainWindow window;
+
+	for (auto _ : state) {
+		benchmark::DoNotOptimize(AssetFactory::loadXML(RESDIR "/foliage.xml"));
+	}
+}
+
 BENCHMARK(brush47xml_load);
+BENCHMARK(foliagexml_load);
 
 BENCHMARK_MAIN();
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 54168aa..dd458ca 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -8,6 +8,8 @@
 #include "assetFactory/assetFactory.h"
 #include "assetFactory/object.h"
 #include "assetFactory/texturePacker.h"
+#include "game/scenary/foliage.h"
+#include "game/scenary/plant.h"
 #include "game/vehicles/railVehicle.h"
 #include "game/vehicles/railVehicleClass.h"
 #include "gfx/gl/sceneRenderer.h"
@@ -96,6 +98,21 @@ BOOST_AUTO_TEST_CASE(brush47xml, *boost::unit_test::timeout(5))
 
 	render();
 }
+
+BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
+{
+	auto mf = AssetFactory::loadXML(RESDIR "/foliage.xml");
+	BOOST_REQUIRE(mf);
+	auto tree_01_1 = mf->assets.at("Tree-01-1");
+	BOOST_REQUIRE(tree_01_1);
+	auto tree_01_1_f = std::dynamic_pointer_cast<Foliage>(tree_01_1);
+	BOOST_REQUIRE(tree_01_1_f);
+
+	auto plant = std::make_shared<Plant>(tree_01_1_f, Location {});
+	objects.objects.push_back(plant);
+
+	render();
+}
 BOOST_AUTO_TEST_SUITE_END();
 
 template<typename T> using InOut = std::tuple<T, T>;
-- 
cgit v1.2.3


From 1efd1c0cabb19c0d305b64d6e8aa1df3ab2150da Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 01:40:28 +0100
Subject: Extend timeout... this can be a bit slow now

---
 test/test-assetFactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index dd458ca..4fde5ed 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(texturePacker_many, *boost::unit_test::timeout(5))
 	BOOST_CHECK_EQUAL(totalSize, TexturePacker::area(result.second));
 }
 
-BOOST_AUTO_TEST_CASE(texturePacker_many_random, *boost::unit_test::timeout(5))
+BOOST_AUTO_TEST_CASE(texturePacker_many_random, *boost::unit_test::timeout(15))
 {
 	std::vector<TexturePacker::Image> images(2048);
 	std::mt19937 gen(std::random_device {}());
-- 
cgit v1.2.3


From 0638aaaf2a60efae95a1b404d7eee29e894047bc Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 01:54:19 +0100
Subject: No need to pass size around, we can get it back from the texture

---
 gfx/models/texture.cpp     | 30 ++++++++++++++++++++----------
 gfx/models/texture.h       | 12 ++++++------
 test/test-assetFactory.cpp |  2 +-
 test/test-render.cpp       |  6 +++---
 4 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp
index a500fed..ab256d5 100644
--- a/gfx/models/texture.cpp
+++ b/gfx/models/texture.cpp
@@ -44,12 +44,22 @@ Texture::bind(GLenum unit) const
 	glBindTexture(type, m_texture);
 }
 
+glm::ivec2
+Texture::getSize(const glTexture & texture)
+{
+	glm::ivec2 size;
+	glGetTextureLevelParameteriv(texture, 0, GL_TEXTURE_WIDTH, &size.x);
+	glGetTextureLevelParameteriv(texture, 0, GL_TEXTURE_HEIGHT, &size.y);
+	return size;
+}
+
 void
-Texture::save(const glTexture & texture, GLenum format, GLenum type, const glm::ivec2 & size, unsigned short channels,
-		const char * path, short tgaFormat)
+Texture::save(const glTexture & texture, GLenum format, GLenum type, unsigned short channels, const char * path,
+		short tgaFormat)
 {
 	using TGAHead = std::array<short, 9>;
 
+	const auto size = getSize(texture);
 	const size_t dataSize = (static_cast<size_t>(size.x * size.y * channels));
 	const size_t fileSize = dataSize + sizeof(TGAHead);
 
@@ -63,27 +73,27 @@ Texture::save(const glTexture & texture, GLenum format, GLenum type, const glm::
 }
 
 void
-Texture::save(const glm::ivec2 & size, const char * path) const
+Texture::save(const char * path) const
 {
-	save(m_texture, GL_BGR, GL_UNSIGNED_BYTE, size, 3, path, 2);
+	save(m_texture, GL_BGR, GL_UNSIGNED_BYTE, 3, path, 2);
 }
 
 void
-Texture::save(const glTexture & texture, const glm::ivec2 & size, const char * path)
+Texture::save(const glTexture & texture, const char * path)
 {
-	save(texture, GL_BGR, GL_UNSIGNED_BYTE, size, 3, path, 2);
+	save(texture, GL_BGR, GL_UNSIGNED_BYTE, 3, path, 2);
 }
 
 void
-Texture::saveDepth(const glTexture & texture, const glm::ivec2 & size, const char * path)
+Texture::saveDepth(const glTexture & texture, const char * path)
 {
-	save(texture, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, size, 1, path, 3);
+	save(texture, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 1, path, 3);
 }
 
 void
-Texture::saveNormal(const glTexture & texture, const glm::ivec2 & size, const char * path)
+Texture::saveNormal(const glTexture & texture, const char * path)
 {
-	save(texture, GL_BGR, GL_BYTE, size, 3, path, 2);
+	save(texture, GL_BGR, GL_BYTE, 3, path, 2);
 }
 
 TextureAtlas::TextureAtlas(GLsizei width, GLsizei height, GLuint count) : Texture(width, height, nullptr, {})
diff --git a/gfx/models/texture.h b/gfx/models/texture.h
index 7900f17..f4e1476 100644
--- a/gfx/models/texture.h
+++ b/gfx/models/texture.h
@@ -28,14 +28,14 @@ public:
 
 	virtual void bind(GLenum unit = GL_TEXTURE0) const;
 
-	void save(const glm::ivec2 & size, const char * path) const;
-	static void save(const glTexture &, const glm::ivec2 & size, const char * path);
-	static void saveDepth(const glTexture &, const glm::ivec2 & size, const char * path);
-	static void saveNormal(const glTexture &, const glm::ivec2 & size, const char * path);
+	void save(const char * path) const;
+	static void save(const glTexture &, const char * path);
+	static void saveDepth(const glTexture &, const char * path);
+	static void saveNormal(const glTexture &, const char * path);
 
 protected:
-	static void save(const glTexture &, GLenum, GLenum, const glm::ivec2 & size, unsigned short channels,
-			const char * path, short tgaFormat);
+	static void save(const glTexture &, GLenum, GLenum, unsigned short channels, const char * path, short tgaFormat);
+	static glm::ivec2 getSize(const glTexture &);
 
 	glTexture m_texture;
 	GLenum type;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 4fde5ed..59dc40d 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -32,7 +32,7 @@ public:
 		glDisable(GL_DEBUG_OUTPUT);
 		auto outpath = (TMP / boost::unit_test::framework::current_test_case().full_name()).replace_extension(".tga");
 		std::filesystem::create_directories(outpath.parent_path());
-		Texture::save(outImage, size, outpath.c_str());
+		Texture::save(outImage, outpath.c_str());
 	}
 	void
 	content(const SceneShader & shader) const override
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 7771760..8c6b31c 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(basic)
 	const TestScene scene;
 	ss.render(scene);
 	glDisable(GL_DEBUG_OUTPUT);
-	Texture::save(outImage, size, "/tmp/basic.tga");
+	Texture::save(outImage, "/tmp/basic.tga");
 }
 
 BOOST_AUTO_TEST_CASE(pointlight)
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(pointlight)
 	const PointLightScene scene;
 	ss.render(scene);
 	glDisable(GL_DEBUG_OUTPUT);
-	Texture::save(outImage, size, "/tmp/pointlight.tga");
+	Texture::save(outImage, "/tmp/pointlight.tga");
 }
 
 BOOST_AUTO_TEST_CASE(spotlight)
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(spotlight)
 	const PointLightScene scene;
 	ss.render(scene);
 	glDisable(GL_DEBUG_OUTPUT);
-	Texture::save(outImage, size, "/tmp/spotlight.tga");
+	Texture::save(outImage, "/tmp/spotlight.tga");
 }
 
 BOOST_AUTO_TEST_SUITE_END();
-- 
cgit v1.2.3


From 4bf94458d5d7abafb154e914620dc758d26719c2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 10:24:10 +0100
Subject: Global worker instance

---
 lib/worker.cpp       | 12 ++++++------
 lib/worker.h         | 35 ++++++++++-------------------------
 test/Jamfile.jam     |  1 +
 test/test-worker.cpp |  7 +++++++
 4 files changed, 24 insertions(+), 31 deletions(-)
 create mode 100644 test/test-worker.cpp

(limited to 'test')

diff --git a/lib/worker.cpp b/lib/worker.cpp
index fd255c7..cf59f56 100644
--- a/lib/worker.cpp
+++ b/lib/worker.cpp
@@ -1,9 +1,10 @@
 #include "worker.h"
-#if __cpp_lib_semaphore
-#	include "work.h"
-#	include <algorithm>
-#	include <iterator>
-#	include <mutex>
+#include "work.h"
+#include <algorithm>
+#include <iterator>
+#include <mutex>
+
+Worker Worker::instance;
 
 Worker::Worker() : todoLen {0}
 {
@@ -45,4 +46,3 @@ Worker::worker()
 		j->doWork();
 	}
 }
-#endif
diff --git a/lib/worker.h b/lib/worker.h
index 7cd06f9..136c50e 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -1,19 +1,17 @@
 #pragma once
 
+#include <deque>
+#include <memory>
+#include <mutex>
+#include <semaphore>
+#include <special_members.hpp>
+#include <thread>
 #include <utility>
-class Work;
-
-#if __cpp_lib_semaphore
-#	include <deque>
-#	include <memory>
-#	include <mutex>
-#	include <semaphore>
-#	include <special_members.hpp>
-#	include <thread>
-#	include <vector>
+#include <vector>
 
+class Work;
 class Worker {
-public:
+private:
 	Worker();
 	~Worker();
 
@@ -42,19 +40,6 @@ private:
 	ToDo todo;
 	std::counting_semaphore<16> todoLen;
 	std::mutex todoMutex;
-};
-
-#else
 
-class Worker {
-public:
-	template<typename T, typename... Params>
-	void
-	addWork(Params &&... params)
-		requires std::is_base_of_v<Work, T>
-	{
-		T(std::forward<Params>(params)...).doWork();
-	}
+	static Worker instance;
 };
-
-#endif
diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index 390880d..482b388 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -57,6 +57,7 @@ run test-glContextBhvr.cpp ;
 run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt ] : <library>test ;
 run perf-assetFactory.cpp : : : <library>benchmark <library>test <dependency>test-assetFactory ;
 run perf-persistence.cpp : : : <library>benchmark <library>test <dependency>test-persistence ;
+run test-worker.cpp ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
 explicit perf-assetFactory ;
diff --git a/test/test-worker.cpp b/test/test-worker.cpp
new file mode 100644
index 0000000..3c5ed7e
--- /dev/null
+++ b/test/test-worker.cpp
@@ -0,0 +1,7 @@
+#define BOOST_TEST_MODULE test_worker
+
+#include "testHelpers.h"
+#include <boost/test/unit_test.hpp>
+#include <stream_support.hpp>
+
+BOOST_AUTO_TEST_CASE(exists) { }
-- 
cgit v1.2.3


From aa77548bd637ffd1a7461136e6206906dc4c61c7 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 11:54:45 +0100
Subject: New WorkItem/job/promise/future based interface

---
 lib/worker.cpp       |  3 +-
 lib/worker.h         | 87 ++++++++++++++++++++++++++++++++++++++++++++++------
 test/test-worker.cpp | 39 ++++++++++++++++++++++-
 3 files changed, 116 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/lib/worker.cpp b/lib/worker.cpp
index 4f1352d..7e7f296 100644
--- a/lib/worker.cpp
+++ b/lib/worker.cpp
@@ -1,5 +1,4 @@
 #include "worker.h"
-#include "work.h"
 #include <algorithm>
 #include <iterator>
 #include <mutex>
@@ -19,7 +18,7 @@ Worker::~Worker()
 }
 
 void
-Worker::addWork(WorkPtr j)
+Worker::addWorkPtr(WorkPtr j)
 {
 	std::lock_guard<std::mutex> lck {todoMutex};
 	todoLen.release();
diff --git a/lib/worker.h b/lib/worker.h
index 96593d9..5356606 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <deque>
+#include <functional>
+#include <future>
 #include <memory>
 #include <mutex>
 #include <semaphore>
@@ -9,28 +11,93 @@
 #include <utility>
 #include <vector>
 
-class Work;
 class Worker {
+public:
+	class WorkItem {
+	public:
+		WorkItem() = default;
+		virtual ~WorkItem() = default;
+		NO_MOVE(WorkItem);
+		NO_COPY(WorkItem);
+
+		virtual void doWork() = 0;
+	};
+
+	template<typename T> class WorkItemT : public WorkItem {
+	public:
+		T
+		get()
+		{
+			return future.get();
+		}
+
+	protected:
+		std::promise<T> promise;
+		std::future<T> future {promise.get_future()};
+		friend Worker;
+	};
+
+	template<typename... Params>
+	static auto
+	addWork(Params &&... params)
+	{
+		return instance.addWorkImpl(std::forward<Params>(params)...);
+	}
+	template<typename T> using WorkPtrT = std::shared_ptr<WorkItemT<T>>;
+
 private:
+	template<typename T, typename... Params> class WorkItemTImpl : public WorkItemT<T> {
+	public:
+		WorkItemTImpl(Params &&... params) : params {std::forward<Params>(params)...} { }
+
+	private:
+		void
+		doWork() override
+		{
+			try {
+				if constexpr (std::is_void_v<T>) {
+					std::apply(
+							[](auto &&... p) {
+								return std::invoke(p...);
+							},
+							params);
+					WorkItemT<T>::promise.set_value();
+				}
+				else {
+					WorkItemT<T>::promise.set_value(std::apply(
+							[](auto &&... p) {
+								return std::invoke(p...);
+							},
+							params));
+				}
+			}
+			catch (...) {
+				WorkItemT<T>::promise.set_exception(std::current_exception());
+			}
+		}
+
+		std::tuple<Params...> params;
+	};
+
 	Worker();
 	~Worker();
 
 	NO_COPY(Worker);
 	NO_MOVE(Worker);
 
-	using WorkPtr = std::unique_ptr<Work>;
+	using WorkPtr = std::shared_ptr<WorkItem>;
 
-	template<typename T, typename... Params>
-	void
-	addWork(Params &&... params)
-		requires std::is_base_of_v<Work, T>
+	template<typename... Params>
+	auto
+	addWorkImpl(Params &&... params)
 	{
-		addWork(std::make_unique<T>(std::forward<Params>(params)...));
+		using T = decltype(std::invoke(std::forward<Params>(params)...));
+		auto work = std::make_shared<WorkItemTImpl<T, Params...>>(std::forward<Params>(params)...);
+		addWorkPtr(work);
+		return work;
 	}
 
-	void addWork(WorkPtr w);
-
-private:
+	void addWorkPtr(WorkPtr w);
 	void worker();
 
 	using Threads = std::vector<std::jthread>;
diff --git a/test/test-worker.cpp b/test/test-worker.cpp
index 3c5ed7e..c542020 100644
--- a/test/test-worker.cpp
+++ b/test/test-worker.cpp
@@ -2,6 +2,43 @@
 
 #include "testHelpers.h"
 #include <boost/test/unit_test.hpp>
+#include <set>
 #include <stream_support.hpp>
+#include <worker.h>
 
-BOOST_AUTO_TEST_CASE(exists) { }
+uint32_t
+workCounter()
+{
+	static std::atomic_uint32_t n;
+	usleep(1000);
+	return n++;
+}
+
+BOOST_AUTO_TEST_CASE(basic_slow_counter)
+{
+	std::vector<Worker::WorkPtrT<uint32_t>> ps;
+	for (int i {}; i < 30; ++i) {
+		ps.push_back(Worker::addWork(workCounter));
+	}
+	std::set<uint32_t> out;
+	std::transform(ps.begin(), ps.end(), std::inserter(out, out.end()), [](auto && p) {
+		return p->get();
+	});
+	BOOST_REQUIRE_EQUAL(out.size(), ps.size());
+	BOOST_CHECK_EQUAL(*out.begin(), 0);
+	BOOST_CHECK_EQUAL(*out.rbegin(), ps.size() - 1);
+}
+
+BOOST_AUTO_TEST_CASE(basic_error_handler)
+{
+	auto workitem = Worker::addWork([]() {
+		throw std::runtime_error {"test"};
+	});
+	BOOST_CHECK_THROW(workitem->get(), std::runtime_error);
+}
+
+BOOST_AUTO_TEST_CASE(basic_void_work)
+{
+	auto workitem = Worker::addWork([]() {});
+	BOOST_CHECK_NO_THROW(workitem->get());
+}
-- 
cgit v1.2.3


From e671adba5a57e1d4e848eb4d6de0f480e7b3709a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 12:29:24 +0100
Subject: Simplify doWork, add tests for various interface uses

---
 lib/worker.h         | 12 ++----------
 test/test-worker.cpp | 47 +++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 14 deletions(-)

(limited to 'test')

diff --git a/lib/worker.h b/lib/worker.h
index 5356606..1bc7c14 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -56,19 +56,11 @@ private:
 		{
 			try {
 				if constexpr (std::is_void_v<T>) {
-					std::apply(
-							[](auto &&... p) {
-								return std::invoke(p...);
-							},
-							params);
+					std::apply(std::invoke<Params &...>, params);
 					WorkItemT<T>::promise.set_value();
 				}
 				else {
-					WorkItemT<T>::promise.set_value(std::apply(
-							[](auto &&... p) {
-								return std::invoke(p...);
-							},
-							params));
+					WorkItemT<T>::promise.set_value(std::apply(std::invoke<Params &...>, params));
 				}
 			}
 			catch (...) {
diff --git a/test/test-worker.cpp b/test/test-worker.cpp
index c542020..319261b 100644
--- a/test/test-worker.cpp
+++ b/test/test-worker.cpp
@@ -14,6 +14,19 @@ workCounter()
 	return n++;
 }
 
+void
+workVoid()
+{
+	usleep(1000);
+}
+
+void
+workFail()
+{
+	usleep(1000);
+	throw std::runtime_error {"test"};
+}
+
 BOOST_AUTO_TEST_CASE(basic_slow_counter)
 {
 	std::vector<Worker::WorkPtrT<uint32_t>> ps;
@@ -31,14 +44,40 @@ BOOST_AUTO_TEST_CASE(basic_slow_counter)
 
 BOOST_AUTO_TEST_CASE(basic_error_handler)
 {
-	auto workitem = Worker::addWork([]() {
-		throw std::runtime_error {"test"};
-	});
+	auto workitem = Worker::addWork(workFail);
 	BOOST_CHECK_THROW(workitem->get(), std::runtime_error);
 }
 
 BOOST_AUTO_TEST_CASE(basic_void_work)
 {
-	auto workitem = Worker::addWork([]() {});
+	auto workitem = Worker::addWork(workVoid);
 	BOOST_CHECK_NO_THROW(workitem->get());
 }
+
+BOOST_AUTO_TEST_CASE(lambda_void)
+{
+	BOOST_CHECK_NO_THROW(Worker::addWork([]() {})->get());
+	BOOST_CHECK_NO_THROW(Worker::addWork([](int) {}, 0)->get());
+	BOOST_CHECK_NO_THROW(Worker::addWork([](int, int) {}, 0, 0)->get());
+}
+
+BOOST_AUTO_TEST_CASE(lambda_value)
+{
+	BOOST_CHECK_EQUAL(1, Worker::addWork([]() {
+		return 1;
+	})->get());
+	BOOST_CHECK_EQUAL(2,
+			Worker::addWork(
+					[](int i) {
+						return i;
+					},
+					2)
+					->get());
+	BOOST_CHECK_EQUAL(3,
+			Worker::addWork(
+					[](int i, int j) {
+						return i + j;
+					},
+					1, 2)
+					->get());
+}
-- 
cgit v1.2.3


From f8ee56f6dc8cf7e92c4bfc5930d32b14f634141c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 13:13:47 +0100
Subject: Current thread partakes in work effort while waiting

This will prevent deadlock if the work pool is otherwise busy by ensuring work is always being done
---
 lib/worker.cpp       | 21 +++++++++++++++++++++
 lib/worker.h         | 26 ++++++++++++++++++++++----
 test/test-worker.cpp | 21 +++++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/lib/worker.cpp b/lib/worker.cpp
index 7e7f296..45fb6df 100644
--- a/lib/worker.cpp
+++ b/lib/worker.cpp
@@ -42,3 +42,24 @@ Worker::worker()
 		j->doWork();
 	}
 }
+
+void
+Worker::assist()
+{
+	auto job = [this]() {
+		using namespace std::chrono_literals;
+		if (todoLen.try_acquire_for(100us)) {
+			if (std::lock_guard<std::mutex> lck {todoMutex}; todo.size()) {
+				WorkPtr x = std::move(todo.front());
+				if (x) {
+					todo.pop_front();
+				}
+				return x;
+			}
+		}
+		return WorkPtr {};
+	};
+	if (auto j = job()) {
+		j->doWork();
+	}
+}
diff --git a/lib/worker.h b/lib/worker.h
index 1bc7c14..d9a5a6f 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -14,12 +14,20 @@
 class Worker {
 public:
 	class WorkItem {
-	public:
-		WorkItem() = default;
+	protected:
+		WorkItem(Worker * worker) : worker {worker} { }
 		virtual ~WorkItem() = default;
 		NO_MOVE(WorkItem);
 		NO_COPY(WorkItem);
 
+		void
+		assist() const
+		{
+			worker->assist();
+		}
+		Worker * worker;
+
+	public:
 		virtual void doWork() = 0;
 	};
 
@@ -28,10 +36,16 @@ public:
 		T
 		get()
 		{
+			using namespace std::chrono_literals;
+			while (future.wait_for(0s) == std::future_status::timeout) {
+				assist();
+			}
 			return future.get();
 		}
 
 	protected:
+		WorkItemT(Worker * worker) : WorkItem {worker} { }
+
 		std::promise<T> promise;
 		std::future<T> future {promise.get_future()};
 		friend Worker;
@@ -48,7 +62,10 @@ public:
 private:
 	template<typename T, typename... Params> class WorkItemTImpl : public WorkItemT<T> {
 	public:
-		WorkItemTImpl(Params &&... params) : params {std::forward<Params>(params)...} { }
+		WorkItemTImpl(Worker * worker, Params &&... params) :
+			WorkItemT<T> {worker}, params {std::forward<Params>(params)...}
+		{
+		}
 
 	private:
 		void
@@ -84,13 +101,14 @@ private:
 	addWorkImpl(Params &&... params)
 	{
 		using T = decltype(std::invoke(std::forward<Params>(params)...));
-		auto work = std::make_shared<WorkItemTImpl<T, Params...>>(std::forward<Params>(params)...);
+		auto work = std::make_shared<WorkItemTImpl<T, Params...>>(this, std::forward<Params>(params)...);
 		addWorkPtr(work);
 		return work;
 	}
 
 	void addWorkPtr(WorkPtr w);
 	void worker();
+	void assist();
 
 	using Threads = std::vector<std::jthread>;
 	using ToDo = std::deque<WorkPtr>;
diff --git a/test/test-worker.cpp b/test/test-worker.cpp
index 319261b..76b7138 100644
--- a/test/test-worker.cpp
+++ b/test/test-worker.cpp
@@ -81,3 +81,24 @@ BOOST_AUTO_TEST_CASE(lambda_value)
 					1, 2)
 					->get());
 }
+
+BOOST_AUTO_TEST_CASE(recursive, *boost::unit_test::timeout(5))
+{
+	auto recurse = []() {
+		std::vector<Worker::WorkPtrT<uint32_t>> ps;
+		for (int i {}; i < 30; ++i) {
+			ps.push_back(Worker::addWork(workCounter));
+		}
+		return std::accumulate(ps.begin(), ps.end(), 0U, [](auto && out, auto && p) {
+			return out += p->get();
+		});
+	};
+	std::vector<Worker::WorkPtrT<uint32_t>> ps;
+	for (int i {}; i < 30; ++i) {
+		ps.push_back(Worker::addWork(recurse));
+	}
+	std::set<uint32_t> out;
+	std::transform(ps.begin(), ps.end(), std::inserter(out, out.end()), [](auto && p) {
+		return p->get();
+	});
+}
-- 
cgit v1.2.3


From 41b6cc54a739ef1776c4e827a0e82c33438f1c14 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 16:37:04 +0100
Subject: Adjust test render view to get a closer view of our tree

---
 test/test-assetFactory.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 59dc40d..c425e71 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -108,10 +108,10 @@ BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
 	auto tree_01_1_f = std::dynamic_pointer_cast<Foliage>(tree_01_1);
 	BOOST_REQUIRE(tree_01_1_f);
 
-	auto plant = std::make_shared<Plant>(tree_01_1_f, Location {});
+	auto plant = std::make_shared<Plant>(tree_01_1_f, Location {{-2, 2, 0}, {}});
 	objects.objects.push_back(plant);
 
-	render();
+	render(5);
 }
 BOOST_AUTO_TEST_SUITE_END();
 
-- 
cgit v1.2.3


From 7c2977ee4de2cfd967871a0927443f24361944b1 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 17:07:40 +0100
Subject: Use asset factory models in test-render

---
 test/Jamfile.jam     |  6 +++---
 test/test-render.cpp | 24 +++++++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index 482b388..d91af1d 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -52,11 +52,11 @@ run test-network.cpp ;
 run test-persistence.cpp : -- : [ sequence.insertion-sort [ glob-tree fixtures : *.json ] ] : <library>test ;
 run test-text.cpp ;
 run test-enumDetails.cpp ;
-run test-render.cpp : : : <library>test ;
+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 ] : <library>test ;
-run perf-assetFactory.cpp : : : <library>benchmark <library>test <dependency>test-assetFactory ;
-run perf-persistence.cpp : : : <library>benchmark <library>test <dependency>test-persistence ;
+run perf-assetFactory.cpp : -- : test-assetFactory : <library>benchmark <library>test ;
+run perf-persistence.cpp : -- : test-persistence : <library>benchmark <library>test ;
 run test-worker.cpp ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 8c6b31c..45acab5 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -6,8 +6,10 @@
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include <assetFactory/assetFactory.h>
 #include <game/geoData.h>
 #include <game/terrain.h>
+#include <game/vehicles/railVehicle.h>
 #include <game/vehicles/railVehicleClass.h>
 #include <gfx/gl/sceneRenderer.h>
 #include <gfx/models/texture.h>
@@ -19,18 +21,30 @@
 #include <ui/window.h>
 
 class TestScene : public SceneProvider {
-	RailVehicleClass train {"brush47"};
+	std::shared_ptr<RailVehicle> train1, train2;
+
 	Terrain terrain {[]() {
 		auto gd = std::make_shared<GeoData>(GeoData::Limits {{0, 0}, {100, 100}});
 		gd->generateRandom();
 		return gd;
 	}()};
+
+public:
+	TestScene()
+	{
+		const auto assetFactory = AssetFactory::loadXML(RESDIR "/brush47.xml");
+		const auto brush47rvc = std::dynamic_pointer_cast<RailVehicleClass>(assetFactory->assets.at("brush-47"));
+		train1 = std::make_shared<RailVehicle>(brush47rvc);
+		train1->location.pos = {52, 50, 2};
+		train2 = std::make_shared<RailVehicle>(brush47rvc);
+		train2->location.pos = {52, 30, 2};
+	}
 	void
 	content(const SceneShader & shader) const override
 	{
 		terrain.render(shader);
-		train.render(shader, Location {{52, 50, 2}}, {Location {{52, 56, 2}}, Location {{52, 44, 2}}});
-		train.render(shader, Location {{52, 30, 2}}, {Location {{52, 36, 2}}, Location {{52, 24, 2}}});
+		train1->render(shader);
+		train2->render(shader);
 	}
 	void
 	lights(const SceneShader &) const override
@@ -40,8 +54,8 @@ class TestScene : public SceneProvider {
 	shadows(const ShadowMapper & shadowMapper) const override
 	{
 		terrain.shadows(shadowMapper);
-		train.shadows(shadowMapper, Location {{52, 50, 2}}, {Location {{52, 56, 2}}, Location {{52, 44, 2}}});
-		train.shadows(shadowMapper, Location {{52, 30, 2}}, {Location {{52, 36, 2}}, Location {{52, 24, 2}}});
+		train1->shadows(shadowMapper);
+		train2->shadows(shadowMapper);
 	}
 };
 
-- 
cgit v1.2.3


From 47cd9d863fb09acb82d2428f881d61242f8ab437 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 17:33:02 +0100
Subject: Load all assets in red dir with asset factory

---
 application/main.cpp          |  9 ++++++++-
 assetFactory/assetFactory.cpp | 13 +++++++++++++
 assetFactory/assetFactory.h   |  1 +
 test/test-assetFactory.cpp    |  7 +++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/application/main.cpp b/application/main.cpp
index 1f91dab..aea3d2e 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -1,4 +1,5 @@
 #include <array>
+#include <assetFactory/assetFactory.h>
 #include <chrono>
 #include <collection.hpp>
 #include <game/activities/go.h>
@@ -11,6 +12,8 @@
 #include <game/objective.h>
 #include <game/objectives/goto.h>
 #include <game/orders.h>
+#include <game/scenary/foliage.h>
+#include <game/scenary/plant.h>
 #include <game/terrain.h>
 #include <game/vehicles/railVehicle.h>
 #include <game/vehicles/railVehicleClass.h>
@@ -43,6 +46,7 @@ public:
 		world.create<Terrain>(geoData);
 
 		{
+			const auto assets = AssetFactory::loadAll("res");
 			auto rl = world.create<RailLinks>();
 			const glm::vec3 j {-1120, -1100, 3}, k {-1100, -1000, 15}, l {-1000, -800, 20}, m {-900, -600, 30},
 					n {-600, -500, 32}, o {-500, -800, 30}, p {-600, -900, 25}, q {-1025, -1175, 10},
@@ -66,13 +70,16 @@ public:
 			rl->addLinksBetween(t, u);
 			rl->addLinksBetween(u, m);
 			const std::shared_ptr<Train> train = world.create<Train>(l3);
-			auto b47 = std::make_shared<RailVehicleClass>("brush47");
+			auto b47 = std::dynamic_pointer_cast<RailVehicleClass>(assets.at("brush-47"));
 			for (int N = 0; N < 6; N++) {
 				train->create<RailVehicle>(b47);
 			}
 			train->orders.removeAll();
 			train->orders.create<GoTo>(&train->orders, l3->ends[1], l3->length, rl->findNodeAt({-1100, -450, 15}));
 			train->currentActivity = train->orders.current()->createActivity();
+
+			auto foliage = std::dynamic_pointer_cast<Foliage>(assets.at("Tree-01-1"));
+			world.create<Plant>(foliage, Location {{-1100, -1100, 0}});
 		}
 
 		auto t_start = std::chrono::high_resolution_clock::now();
diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index 05f0634..af0cd54 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -11,6 +11,7 @@
 #include "resource.h"
 #include "saxParse-persistence.h"
 #include "texturePacker.h"
+#include <numeric>
 
 AssetFactory::AssetFactory() :
 	shapes {
@@ -29,6 +30,18 @@ AssetFactory::loadXML(const std::filesystem::path & filename)
 	return Persistence::SAXParsePersistence {}.loadState<std::shared_ptr<AssetFactory>>(file);
 }
 
+AssetFactory::Assets
+AssetFactory::loadAll(const std::filesystem::path & root)
+{
+	return std::accumulate(std::filesystem::recursive_directory_iterator {root},
+			std::filesystem::recursive_directory_iterator {}, Assets {}, [](auto && out, auto && path) {
+				if (path.path().extension() == ".xml") {
+					out.merge(loadXML(path)->assets);
+				}
+				return std::move(out);
+			});
+}
+
 AssetFactory::Colours
 AssetFactory::parseX11RGB(const char * path)
 {
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
index 9e5d205..e449ce2 100644
--- a/assetFactory/assetFactory.h
+++ b/assetFactory/assetFactory.h
@@ -22,6 +22,7 @@ public:
 
 	AssetFactory();
 	[[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &);
+	[[nodiscard]] static Assets loadAll(const std::filesystem::path &);
 	[[nodiscard]] ColourAlpha parseColour(std::string_view) const;
 	[[nodiscard]] GLuint getMaterialIndex(std::string_view) const;
 	[[nodiscard]] Asset::TexturePtr getTexture() const;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index c425e71..3d79213 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -115,6 +115,13 @@ BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
 }
 BOOST_AUTO_TEST_SUITE_END();
 
+BOOST_AUTO_TEST_CASE(loadall)
+{
+	const auto assets = AssetFactory::loadAll(RESDIR);
+	BOOST_CHECK(assets.at("brush-47"));
+	BOOST_CHECK(assets.at("Tree-01-1"));
+}
+
 template<typename T> using InOut = std::tuple<T, T>;
 BOOST_DATA_TEST_CASE(normalizeColourName,
 		boost::unit_test::data::make<InOut<std::string>>({
-- 
cgit v1.2.3


From 66da4f83c1b5bb6f3ceda880820e01c2f8e23e43 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 17:45:31 +0100
Subject: Remove the old .obj load, assets and supporting stuff

---
 Jamroot.jam                        |   1 -
 game/vehicles/railVehicleClass.cpp |  53 --------
 game/vehicles/railVehicleClass.h   |   9 --
 gfx/models/obj.h                   |  38 ------
 gfx/models/obj.impl.cpp            |  77 -----------
 gfx/models/obj.ll                  | 116 -----------------
 res/brush47.mtl                    |  13 --
 res/brush47.obj                    | 260 -------------------------------------
 res/brush47.png                    | Bin 111263 -> 0 bytes
 test/Jamfile.jam                   |   1 -
 test/test-obj.cpp                  |  39 ------
 11 files changed, 607 deletions(-)
 delete mode 100644 gfx/models/obj.h
 delete mode 100644 gfx/models/obj.impl.cpp
 delete mode 100644 gfx/models/obj.ll
 delete mode 100644 res/brush47.mtl
 delete mode 100644 res/brush47.obj
 delete mode 100644 res/brush47.png
 delete mode 100644 test/test-obj.cpp

(limited to 'test')

diff --git a/Jamroot.jam b/Jamroot.jam
index 2275dd6..35b48ea 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -22,7 +22,6 @@ project : requirements
 	<variant>profile:<lto>on
 	<variant>coverage:<coverage>on
 	<toolset>tidy:<enable>all
-	<toolset>tidy:<exclude>bin/link-static/gfx/models/obj.cpp
 	<toolset>tidy:<exclude>bin/link-static/lib/jsonParse.cpp
 	<toolset>tidy:<checkxx>boost-*
 	<toolset>tidy:<checkxx>bugprone-*
diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 4e9263c..b7a3b1e 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -2,7 +2,6 @@
 #include "gfx/gl/sceneShader.h"
 #include "gfx/gl/shadowMapper.h"
 #include "gfx/models/mesh.h"
-#include "gfx/models/obj.h"
 #include "gfx/models/texture.h"
 #include <algorithm>
 #include <array>
@@ -22,25 +21,6 @@
 #include <utility>
 #include <vector>
 
-RailVehicleClass::RailVehicleClass(const std::string & name) :
-	RailVehicleClass {std::make_unique<ObjParser>(Resource::mapPath(name + ".obj")),
-			Texture::cachedTexture.get(Resource::mapPath(name + ".png"))}
-{
-}
-
-RailVehicleClass::RailVehicleClass(std::unique_ptr<ObjParser> o, std::shared_ptr<Texture> t) :
-	texture {std::move(t)}, maxSpeed(95._mph)
-{
-	wheelBase = bogieOffset(*o);
-	length = objectLength(*o);
-	const auto m = o->createMeshes();
-	bodyMesh = m.at("Body");
-	bogies[0] = m.at("Bogie1");
-	bogies[1] = m.at("Bogie2");
-}
-
-RailVehicleClass::RailVehicleClass() { }
-
 bool
 RailVehicleClass::persist(Persistence::PersistenceStore & store)
 {
@@ -80,36 +60,3 @@ RailVehicleClass::shadows(
 		bogies[b]->Draw();
 	}
 }
-
-float
-RailVehicleClass::bogieOffset(ObjParser & o)
-{
-	float wheelBase {0};
-	// offset bogie positions so they can be set directly
-	for (auto & object : o.objects) { // bogie object index
-		if (!object.first.starts_with("Bogie")) {
-			continue;
-		}
-		std::set<std::pair<float, std::size_t>> vertexIds;
-		for (const auto & face : object.second) {
-			for (const auto & faceElement : face) {
-				vertexIds.emplace(o.vertices[faceElement.x - 1].y, faceElement.x - 1);
-			}
-		}
-		const auto offset = (vertexIds.begin()->first + vertexIds.rbegin()->first) / 2;
-		for (const auto & v : vertexIds) {
-			o.vertices[v.second].y -= offset;
-		}
-		wheelBase += std::abs(offset);
-	}
-	return wheelBase;
-}
-
-float
-RailVehicleClass::objectLength(ObjParser & o)
-{
-	const auto mme = std::minmax_element(o.vertices.begin(), o.vertices.end(), [](const auto & v1, const auto & v2) {
-		return v1.y < v2.y;
-	});
-	return mme.second->y - mme.first->y;
-}
diff --git a/game/vehicles/railVehicleClass.h b/game/vehicles/railVehicleClass.h
index 61ec4ec..1a52e2b 100644
--- a/game/vehicles/railVehicleClass.h
+++ b/game/vehicles/railVehicleClass.h
@@ -9,14 +9,10 @@
 class SceneShader;
 class ShadowMapper;
 class Texture;
-class ObjParser;
 class Location;
 
 class RailVehicleClass : public Asset {
 public:
-	explicit RailVehicleClass(const std::string & name);
-	RailVehicleClass();
-
 	void render(const SceneShader &, const Location &, const std::array<Location, 2> &) const;
 	void shadows(const ShadowMapper &, const Location &, const std::array<Location, 2> &) const;
 
@@ -31,10 +27,5 @@ protected:
 	friend Persistence::SelectionPtrBase<std::shared_ptr<RailVehicleClass>>;
 	bool persist(Persistence::PersistenceStore & store) override;
 	void postLoad() override;
-
-private:
-	RailVehicleClass(std::unique_ptr<ObjParser> obj, std::shared_ptr<Texture>);
-	static float bogieOffset(ObjParser & o);
-	static float objectLength(ObjParser & o);
 };
 using RailVehicleClassPtr = std::shared_ptr<RailVehicleClass>;
diff --git a/gfx/models/obj.h b/gfx/models/obj.h
deleted file mode 100644
index e28f7de..0000000
--- a/gfx/models/obj.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#ifndef yyFlexLexer
-#	define yyFlexLexer objbaseFlexLexer
-#	include <FlexLexer.h>
-#endif
-#include <filesystem>
-#include <fstream>
-#include <glm/glm.hpp>
-#include <map>
-#include <memory>
-#include <vector>
-
-class Mesh;
-class Vertex;
-
-class ObjParser : yyFlexLexer {
-public:
-	explicit ObjParser(const std::filesystem::path & fileName);
-	explicit ObjParser(std::unique_ptr<std::istream> in);
-
-	int yylex() override;
-
-	std::vector<glm::vec4> vertices;
-	std::vector<glm::vec3> texCoords;
-	std::vector<glm::vec3> normals;
-	using FaceElement = glm::vec<3, unsigned int>;
-	using Face = std::vector<FaceElement>;
-	using Faces = std::vector<Face>;
-	using Object = std::pair<std::string, Faces>;
-	std::vector<Object> objects;
-	glm::length_t axis {0};
-
-	using NamedMeshesData = std::map<std::string, std::pair<std::vector<Vertex>, std::vector<unsigned int>>>;
-	[[nodiscard]] NamedMeshesData createMeshData() const;
-	using NamedMeshes = std::map<std::string, std::shared_ptr<const Mesh>>;
-	[[nodiscard]] NamedMeshes createMeshes() const;
-};
diff --git a/gfx/models/obj.impl.cpp b/gfx/models/obj.impl.cpp
deleted file mode 100644
index 205abc8..0000000
--- a/gfx/models/obj.impl.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "obj.h"
-#include <algorithm>
-#include <cassert>
-#include <filesystem>
-#include <fstream>
-#include <gfx/models/mesh.h> // IWYU pragma: keep
-#include <gfx/models/vertex.hpp>
-#include <glm/glm.hpp>
-#include <iterator>
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
-
-ObjParser::ObjParser(const std::filesystem::path & fileName) : ObjParser {std::make_unique<std::ifstream>(fileName)} { }
-
-ObjParser::ObjParser(std::unique_ptr<std::istream> in) : yyFlexLexer(in.get())
-{
-	assert(in);
-	ObjParser::yylex();
-	assert(in->good());
-	constexpr const glm::mat4 obj2ilt {
-			-1, 0, 0, 0, // x
-			0, 0, 1, 0, // y
-			0, 1, 0, 0, // z
-			0, 0, 0, 0, // w
-	};
-	std::for_each(vertices.begin(), vertices.end(), [&obj2ilt](auto & v) {
-		v = v * obj2ilt;
-	});
-	std::for_each(normals.begin(), normals.end(), [&obj2ilt](auto & v) {
-		v = glm::vec4 {v, 0} * obj2ilt;
-	});
-}
-
-ObjParser::NamedMeshes
-ObjParser::createMeshes() const
-{
-	NamedMeshes out;
-	const auto data {createMeshData()};
-	std::transform(data.begin(), data.end(), std::inserter(out, out.end()), [](auto && obj) {
-		return std::make_pair(obj.first, std::make_shared<Mesh>(obj.second.first, obj.second.second));
-	});
-	return out;
-}
-
-ObjParser::NamedMeshesData
-ObjParser::createMeshData() const
-{
-	NamedMeshesData out;
-	std::transform(objects.begin(), objects.end(), std::inserter(out, out.end()), [this](auto && obj) {
-		std::vector<Vertex> overtices;
-		std::vector<ObjParser::FaceElement> vertexOrder;
-		std::vector<unsigned int> indices;
-		for (const auto & face : obj.second) {
-			for (auto idx = 2U; idx < face.size(); idx += 1) {
-				auto f = [&](auto idx) {
-					const auto & fe {face[idx]};
-					if (const auto existing = std::find(vertexOrder.begin(), vertexOrder.end(), fe);
-							existing != vertexOrder.end()) {
-						indices.push_back(static_cast<unsigned int>(std::distance(vertexOrder.begin(), existing)));
-					}
-					else {
-						indices.push_back(static_cast<unsigned int>(overtices.size()));
-						overtices.emplace_back(vertices[fe.x - 1], texCoords[fe.y - 1], -normals[fe.z - 1]);
-						vertexOrder.emplace_back(fe);
-					}
-				};
-				f(0U);
-				f(idx);
-				f(idx - 1);
-			}
-		}
-		return std::make_pair(obj.first, std::make_pair(overtices, indices));
-	});
-	return out;
-}
diff --git a/gfx/models/obj.ll b/gfx/models/obj.ll
deleted file mode 100644
index 84884fe..0000000
--- a/gfx/models/obj.ll
+++ /dev/null
@@ -1,116 +0,0 @@
-%option batch
-%option c++
-%option noyywrap
-%option 8bit
-%option stack
-%option yyclass="ObjParser"
-%option prefix="objbase"
-
-%{
-#include <gfx/models/obj.h>
-#include <glm/glm.hpp>
-#include <memory>
-#include <string>
-#include <vector>
-class objbaseFlexLexer;
-%}
-
-comment #.*
-float -?[0-9.]+
-index -?[0-9]+
-linestring [^\r\n]*
-truthy (1|on)
-falsey (0|off)
-
-%x FACE
-%x MTLLIB
-%x OBJECT
-%x SMOOTH
-%x USEMTL
-%x VERTEX
-%x NORMAL
-%x TEXCOORD
-
-%%
-
-<INITIAL>{comment} {
-  // fprintf(stderr, "COMMENT %s\n", YYText());
-}
-<INITIAL>"f " {
-  BEGIN(FACE);
-  objects.back().second.emplace_back();
-  objects.back().second.back().emplace_back();
-  axis = 0;
-}
-<INITIAL>"mtllib " {
-  BEGIN(MTLLIB);
-}
-<INITIAL>"o " {
-  BEGIN(OBJECT);
-}
-<INITIAL>"s " {
-  BEGIN(SMOOTH);
-}
-<INITIAL>"usemtl " {
-  BEGIN(USEMTL);
-}
-<INITIAL>"v " {
-  BEGIN(VERTEX);
-  vertices.emplace_back(0, 0, 0, 1);
-  axis = 0;
-}
-<INITIAL>"vn " {
-  BEGIN(NORMAL);
-  normals.emplace_back(0, 0, 0);
-  axis = 0;
-}
-<INITIAL>"vt " {
-  BEGIN(TEXCOORD);
-  texCoords.emplace_back(0, 1, 1);
-  axis = 0;
-}
-<USEMTL>{linestring} {
-  // fprintf(stderr, "USEMTL <%s>\n", YYText());
-}
-<MTLLIB>{linestring} {
-  // fprintf(stderr, "MTLLIB <%s>\n", YYText());
-}
-<OBJECT>{linestring} {
-  objects.emplace_back(YYText(), Faces{});
-}
-<SMOOTH>{truthy} {
-  // fprintf(stderr, "Set smooth\n");
-}
-<SMOOTH>{falsey} {
-  // fprintf(stderr, "Set flat\n");
-}
-<VERTEX>{float} {
-  vertices.back()[axis++] = std::stof(YYText());
-}
-<NORMAL>{float} {
-  normals.back()[axis++] = std::stof(YYText());
-}
-<TEXCOORD>{float} {
-  texCoords.back()[axis++] = std::stof(YYText());
-}
-<FACE>{index} {
-  objects.back().second.back().back()[axis] = std::stoi(YYText());
-}
-<FACE>\/ {
-  axis++;
-}
-<FACE>[ \t] {
-  objects.back().second.back().emplace_back();
-  axis = 0;
-}
-
-<*>[ \t] {
-}
-<*>[\r\n\f] {
-  BEGIN(INITIAL);
-}
-
-%%
-
-// Make iwyu think unistd.h is required
-[[maybe_unused]]static auto x=getpid;
diff --git a/res/brush47.mtl b/res/brush47.mtl
deleted file mode 100644
index a4ba512..0000000
--- a/res/brush47.mtl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Blender MTL File: 'brush47.blend'
-# Material Count: 1
-
-newmtl Brush47
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd brush47.png
diff --git a/res/brush47.obj b/res/brush47.obj
deleted file mode 100644
index 8fcb2b1..0000000
--- a/res/brush47.obj
+++ /dev/null
@@ -1,260 +0,0 @@
-# Blender v2.91.0 OBJ File: 'brush47.blend'
-# www.blender.org
-mtllib brush47.mtl
-o Body
-v -1.345000 1.200000 -9.690000
-v -1.345000 1.200000 9.690000
-v 1.345000 1.200000 -9.690000
-v 1.345000 1.200000 9.690000
-v -0.991447 3.900000 -8.536446
-v -1.345000 3.546447 -9.440000
-v -0.991447 3.900000 8.536446
-v -1.345000 3.546447 9.440000
-v 0.991447 3.900000 -8.536446
-v 1.345000 3.546447 -9.440000
-v 0.991447 3.900000 8.536446
-v 1.345000 3.546447 9.440000
-v -1.345000 2.723224 9.690000
-v 1.345000 2.723224 9.690000
-v 1.345000 2.723224 -9.690000
-v -1.345000 2.723224 -9.690000
-v 1.340000 0.500000 9.600000
-v -1.340000 0.500000 9.600000
-v -1.340000 1.200000 9.690000
-v -1.340000 0.500000 -9.600000
-v 1.340000 0.500000 -9.600000
-v -1.300000 0.200000 -2.250000
-v -1.300000 1.200000 -2.250000
-v -1.300000 0.200000 2.250000
-v -1.300000 1.200000 2.250000
-v 1.300000 0.200000 -2.250000
-v 1.300000 1.200000 -2.250000
-v 1.300000 0.200000 2.250000
-v 1.300000 1.200000 2.250000
-v 1.345000 1.200000 8.236500
-v 1.345000 1.200000 -8.236500
-v -1.345000 1.200000 -8.236500
-v -1.345000 1.200000 8.236500
-vt 0.025174 0.662500
-vt 0.025174 0.831250
-vt 0.037326 0.925000
-vt 0.957465 0.927083
-vt 0.971354 0.833333
-vt 0.971354 0.662500
-vt 0.900391 0.662500
-vt 0.096137 0.662500
-vt 0.025174 0.662500
-vt 0.025174 0.831250
-vt 0.037326 0.925000
-vt 0.957465 0.927083
-vt 0.971354 0.833333
-vt 0.971354 0.662500
-vt 0.900391 0.662500
-vt 0.096137 0.662500
-vt 0.605035 0.456250
-vt 0.605035 0.581250
-vt 0.359375 0.581250
-vt 0.359375 0.456250
-vt 0.605035 0.581250
-vt 0.605035 0.456250
-vt 0.359375 0.581250
-vt 0.359375 0.456250
-vt 0.026042 0.593750
-vt 0.971354 0.593750
-vt 0.026042 0.593750
-vt 0.971354 0.593750
-vt 0.088542 0.089583
-vt 0.088542 0.206250
-vt 0.918403 0.206250
-vt 0.918403 0.089583
-vt 0.926215 0.527083
-vt 0.926215 0.612500
-vt 0.834201 0.612500
-vt 0.834201 0.527083
-vt 0.083333 0.989583
-vt 0.913194 0.989583
-vt 0.037326 0.927083
-vt 0.152778 0.364583
-vt 0.197049 0.364583
-vt 0.204861 0.310417
-vt 0.144965 0.310417
-vt 0.083333 0.989583
-vt 0.913194 0.989583
-vt 0.037326 0.927083
-vt 0.152778 0.364583
-vt 0.197049 0.364583
-vt 0.204861 0.310417
-vt 0.144965 0.310417
-vt 0.834201 0.527083
-vt 0.834201 0.612500
-vt 0.927083 0.612500
-vt 0.927083 0.527083
-vt 0.114583 0.293750
-vt 0.114583 0.414583
-vt 0.010417 0.414583
-vt 0.010417 0.293750
-vt 0.010417 0.293750
-vt 0.010417 0.414583
-vt 0.114583 0.414583
-vt 0.114583 0.293750
-vt 0.043403 0.014583
-vt 0.002604 0.014583
-vt 0.002604 0.081250
-vt 0.043403 0.081250
-vt 0.043403 0.014583
-vt 0.002604 0.014583
-vt 0.002604 0.081250
-vt 0.043403 0.081250
-vn -1.0000 0.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0071 0.0000
-vn 1.0000 0.0071 -0.0000
-vn -0.3335 -0.9344 -0.1252
-vn 0.3335 -0.9344 -0.1252
-vn 0.3335 -0.9344 0.1252
-vn -0.3335 -0.9344 0.1252
-vn 0.6755 -0.1083 -0.7294
-vn 0.6276 -0.5509 -0.5500
-vn -0.6276 -0.5509 -0.5500
-vn -0.6755 -0.1083 -0.7294
-vn 0.6276 -0.5509 0.5500
-vn -0.6276 -0.5509 0.5500
-vn -0.6755 -0.1083 0.7294
-vn 0.6755 -0.1083 0.7294
-vn 0.8867 0.0030 -0.4622
-vn -0.6937 0.0482 -0.7186
-vn -0.6937 0.0482 0.7186
-vn 0.6937 0.0482 0.7186
-vn -0.6128 0.1051 -0.7832
-vn 0.6145 0.1049 -0.7819
-vn 0.0000 0.1275 -0.9918
-vn 0.6128 0.1051 0.7832
-vn -0.6128 0.1051 0.7832
-usemtl Brush47
-s off
-f 4/1/1 14/2/1 12/3/1 10/4/1 15/5/1 3/6/1 31/7/1 30/8/1
-f 1/9/2 16/10/2 6/11/2 8/12/2 13/13/2 2/14/2 33/15/2 32/16/2
-f 22/17/2 23/18/2 25/19/2 24/20/2
-f 24/20/3 25/19/3 29/21/3 28/22/3
-f 28/22/1 29/21/1 27/23/1 26/24/1
-f 26/24/4 27/23/4 23/18/4 22/17/4
-f 4/1/5 30/8/5 17/25/5
-f 31/7/5 3/6/5 21/26/5
-f 1/9/6 32/16/6 20/27/6
-f 33/15/6 2/14/6 18/28/6
-s 1
-f 11/29/7 7/30/8 5/31/9 9/32/10
-f 13/33/11 8/34/12 12/35/13 14/36/14
-f 5/37/9 7/38/8 8/12/12 6/39/15
-f 7/40/8 11/41/7 12/42/13 8/43/12
-f 11/44/7 9/45/10 10/4/16 12/46/13
-f 9/47/10 5/48/9 6/49/15 10/50/16
-f 15/51/17 10/52/16 6/53/15 16/54/18
-f 2/55/19 13/56/11 14/57/14 4/58/20
-f 3/59/21 15/60/17 16/61/18 1/62/22
-f 17/63/23 18/64/24 19/65/25 4/66/20
-f 20/67/26 21/68/27 3/69/21 1/70/22
-o Bogie2
-v -0.717500 0.000000 -2.700000
-v -0.717500 0.000000 -9.300000
-v -0.717500 1.200000 -2.700000
-v 0.717500 1.200000 -2.700000
-v 0.717500 0.000000 -2.700000
-v 0.717500 0.000000 -9.300000
-v 1.017500 1.200000 -2.700000
-v 1.017500 0.000000 -2.700000
-v 1.017500 0.000000 -9.300000
-v -1.017500 0.000000 -9.300000
-v -1.017501 0.000000 -2.700000
-v -1.017501 1.200000 -2.700000
-v -0.717500 0.654015 -9.300000
-v -0.717500 1.200000 -8.236500
-v -0.717500 0.661560 -9.285304
-v 0.717500 1.200000 -8.236500
-v 0.717500 0.654015 -9.300000
-v 1.017500 1.200000 -8.236500
-v 1.017500 0.654015 -9.300000
-v -1.017500 0.654015 -9.300000
-v -1.017500 1.200000 -8.236500
-vt 0.342014 0.591667
-vt 0.342014 0.435417
-vt 0.006076 0.435417
-vt 0.006076 0.520575
-vt 0.006824 0.521557
-vt 0.060208 0.591667
-vt 0.006076 0.435417
-vt 0.342014 0.435417
-vt 0.342014 0.591667
-vt 0.060208 0.591667
-vt 0.006076 0.520575
-vt 0.217014 0.270833
-vt 0.552951 0.270833
-vt 0.552951 0.427083
-vt 0.271146 0.427083
-vt 0.217014 0.355992
-vt 0.552083 0.429167
-vt 0.552083 0.272917
-vt 0.216146 0.272917
-vt 0.216146 0.358075
-vt 0.270278 0.429167
-vn 1.0000 0.0000 -0.0000
-vn -1.0000 0.0000 0.0000
-usemtl Brush47
-s off
-f 36/71/28 34/72/28 35/73/28 46/74/28 48/75/28 47/76/28
-f 39/77/29 38/78/29 37/79/29 49/80/29 50/81/29
-f 42/82/29 41/83/29 40/84/29 51/85/29 52/86/29
-f 45/87/28 44/88/28 43/89/28 53/90/28 54/91/28
-o Bogie1
-v 0.717500 0.000000 2.700000
-v 0.717500 1.200000 2.700000
-v 0.717500 0.000000 9.300000
-v -0.717500 0.000000 2.700000
-v -0.717500 1.200000 2.700000
-v -0.717500 0.000000 9.300000
-v 1.017500 0.000000 2.700001
-v 1.017500 1.200000 2.700001
-v 1.017500 0.000000 9.300000
-v -1.017500 0.000000 2.700000
-v -1.017500 1.200000 2.700000
-v -1.017500 0.000000 9.300000
-v 0.717500 0.654015 9.300000
-v 0.717500 1.200000 8.236500
-v 1.017500 0.654015 9.300000
-v 1.017500 1.200000 8.236500
-v -0.717500 1.200000 8.236500
-v -0.717500 0.661372 9.285670
-v -0.717500 0.654015 9.300000
-v -1.017500 1.200000 8.236500
-v -1.017500 0.654015 9.300000
-vt 0.342014 0.435417
-vt 0.006076 0.435417
-vt 0.006076 0.520575
-vt 0.060208 0.591667
-vt 0.342014 0.591667
-vt 0.006076 0.520575
-vt 0.006076 0.435417
-vt 0.342014 0.435417
-vt 0.342014 0.591667
-vt 0.060208 0.591667
-vt 0.006806 0.521533
-vt 0.552083 0.270833
-vt 0.216146 0.270833
-vt 0.216146 0.355992
-vt 0.270278 0.427083
-vt 0.552083 0.427083
-vt 0.215278 0.355992
-vt 0.215278 0.270833
-vt 0.552083 0.270833
-vt 0.552083 0.427083
-vt 0.269549 0.427083
-vn -1.0000 0.0000 -0.0000
-vn 1.0000 -0.0000 0.0000
-usemtl Brush47
-s off
-f 55/92/30 57/93/30 67/94/30 68/95/30 56/96/30
-f 73/97/31 60/98/31 58/99/31 59/100/31 71/101/31 72/102/31
-f 61/103/30 63/104/30 69/105/30 70/106/30 62/107/30
-f 75/108/31 66/109/31 64/110/31 65/111/31 74/112/31
diff --git a/res/brush47.png b/res/brush47.png
deleted file mode 100644
index 3d435d6..0000000
Binary files a/res/brush47.png and /dev/null differ
diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index d91af1d..b0eed5e 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -44,7 +44,6 @@ project : requirements
 lib test : [ glob *.cpp : test-*.cpp perf-*.cpp ] ;
 
 run test-collection.cpp ;
-run test-obj.cpp ;
 run test-maths.cpp ;
 run test-lib.cpp ;
 run test-geo.cpp ;
diff --git a/test/test-obj.cpp b/test/test-obj.cpp
deleted file mode 100644
index e6e725d..0000000
--- a/test/test-obj.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#define BOOST_TEST_MODULE test_obj
-
-#include <boost/test/unit_test.hpp>
-
-#include <gfx/models/obj.h>
-#include <gfx/models/vertex.hpp>
-#include <glm/glm.hpp>
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
-
-BOOST_AUTO_TEST_CASE(objparse)
-{
-	const ObjParser op {RESDIR "/brush47.obj"};
-	BOOST_CHECK_EQUAL(75, op.vertices.size());
-	BOOST_CHECK_EQUAL(112, op.texCoords.size());
-	BOOST_CHECK_EQUAL(31, op.normals.size());
-	BOOST_CHECK_EQUAL(3, op.objects.size());
-	const auto & object {op.objects.front()};
-	BOOST_CHECK_EQUAL("Body", object.first);
-	BOOST_CHECK_EQUAL(21, object.second.size());
-	BOOST_CHECK_EQUAL(8, object.second[0].size());
-	BOOST_CHECK_EQUAL(8, object.second[1].size());
-	BOOST_CHECK_EQUAL(4, object.second[12].size());
-}
-
-BOOST_AUTO_TEST_CASE(create_meshes)
-{
-	const ObjParser op {RESDIR "/brush47.obj"};
-	const auto ms = op.createMeshData();
-	BOOST_REQUIRE_EQUAL(3, ms.size());
-	BOOST_REQUIRE_EQUAL("Body", ms.begin()->first);
-	const auto & o = ms.at("Body");
-	BOOST_REQUIRE_EQUAL(88, o.first.size());
-	const auto & v = o.first.front();
-	BOOST_REQUIRE_CLOSE(-1.345, v.pos.x, 1);
-	BOOST_REQUIRE_EQUAL(138, o.second.size());
-}
-- 
cgit v1.2.3