Mesh split, bogeys follow rails.

Wow. This commit is too big. It:

* splits obj loaded meshes into individual named objects.
* moves obj to mesh(es) code into new file obj.impl.cpp, removing the
  clutter from mesh
* removes Physical for providing the wrong level of abstraction
* bit of a hack to adjust loaded models to offset rail vehicle bogeys to
  0 centre, and then applies their calculated position to the mesh

All in all, quite a lot of mess... But the result is the rail vehicle
bogeys now follow the rails quite authentically.

13 files changed, 143 insertions, 125 deletions

diff --git a/game/physical.cpp b/game/physical.cpp
deleted file mode 100644
index ec3221f..0000000
--- a/game/physical.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "physical.h"
-#include "gfx/models/mesh.h"
-#include "gfx/models/texture.h"
-#include <cache.h>
-#include <gfx/gl/shader.h>
-#include <gfx/gl/transform.h>
-
-Cache<Mesh> Physical::cachedMesh;
-
-Physical::Physical(glm::vec3 where, const std::string & m, const std::string & t) :
-	location {where}, mesh {cachedMesh.get(m)}, texture {Texture::cachedTexture.get(t)}
-{
-}
-
-void
-Physical::render(const Shader & shader) const
-{
-	shader.setModel(location.GetModel());
-	texture->Bind();
-	mesh->Draw();
-}
diff --git a/game/physical.h b/game/physical.h
deleted file mode 100644
index 5fdc253..0000000
--- a/game/physical.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef PHYSICAL_H
-#define PHYSICAL_H
-
-#include <gfx/gl/transform.h>
-#include <gfx/renderable.h>
-#include <glm/glm.hpp>
-#include <memory>
-#include <string>
-
-class Shader;
-class Mesh;
-class Texture;
-template<typename Obj> class Cache;
-
-class Physical : public Renderable {
-public:
-	Physical(glm::vec3 where, const std::string & m, const std::string & t);
-
-	void render(const Shader & shader) const override;
-
-	[[nodiscard]] const auto &
-	getLocation() const
-	{
-		return location;
-	}
-
-protected:
-	Transform location;
-
-	std::shared_ptr<Mesh> mesh;
-	std::shared_ptr<Texture> texture;
-
-private:
-	static Cache<Mesh> cachedMesh;
-};
-
-#endif
diff --git a/game/vehicles/railloco.cpp b/game/vehicles/railloco.cpp
index 230fd4e..b47722e 100644
--- a/game/vehicles/railloco.cpp
+++ b/game/vehicles/railloco.cpp
@@ -1,14 +1,32 @@
 #include "railloco.h"
+#include "gfx/gl/shader.h"
 #include "gfx/gl/transform.h"
+#include "gfx/models/obj.h"
+#include "gfx/models/texture.h"
 #include <algorithm>
 #include <array>
+#include <cache.h>
 #include <glm/glm.hpp>
+#include <lib/resource.h>
 #include <maths.h>
 #include <memory>
+#include <set>
 #include <utility>
 #include <vector>
 
 void
+RailVehicle::render(const Shader & shader) const
+{
+	shader.setModel(location.GetModel());
+	texture->Bind();
+	bodyMesh->Draw();
+	for (const auto & bogey : bogeys) {
+		shader.setModel(bogey.location.GetModel());
+		bogey.mesh->Draw();
+	}
+}
+
+void
 RailLoco::move(TickDuration dur)
 {
 	linkDist += dur.count() * speed;
@@ -42,8 +60,8 @@ void
 RailLoco::updateRailVehiclePosition(RailVehicle * w, float trailBy) const
 {
 	const auto overhang {(w->length - w->wheelBase) / 2};
-	const auto b1Pos = getBogeyPosition(linkDist, trailBy += overhang);
-	const auto b2Pos = getBogeyPosition(linkDist, trailBy += wheelBase);
+	const auto & b1Pos = w->bogeys[0].location = getBogeyPosition(linkDist, trailBy += overhang);
+	const auto & b2Pos = w->bogeys[1].location = getBogeyPosition(linkDist, trailBy += wheelBase);
 	const auto diff = glm::normalize(b2Pos.GetPos() - b1Pos.GetPos());
 	w->location.GetPos() = (b1Pos.GetPos() + b2Pos.GetPos()) / 2.F;
 	w->location.GetRot() = {-vector_pitch(diff), vector_yaw(diff), 0};
@@ -71,16 +89,48 @@ RailLoco::updateWagons() const
 
 void RailWagon::tick(TickDuration) { }
 
-Brush47::Brush47(const LinkPtr & l) : RailLoco(l, "brush47.obj", "brush47.png")
+void
+bogeyOffset(ObjParser & o)
+{
+	// offset bogey positions so they can be set directly
+	for (int b = 1; b < 3; b++) { // bogey object index
+		std::set<std::pair<float, int>> vertexIds;
+		for (const auto & face : o.objects[b].second) {
+			for (const auto & faceElement : face) {
+				vertexIds.emplace(o.vertices[faceElement.x - 1].z, faceElement.x - 1);
+			}
+		}
+		auto offset = (vertexIds.begin()->first + vertexIds.rbegin()->first) / 2;
+		for (const auto & v : vertexIds) {
+			o.vertices[v.second].z -= offset;
+		}
+	}
+}
+
+Brush47::Brush47(const LinkPtr & l) : RailLoco(l, 0)
 {
-	wheelBase = 15.7F;
+	ObjParser o {Resource::mapPath("brush47.obj")};
+	bogeyOffset(o);
+	const auto m = o.createMeshes();
+	bodyMesh = m[0].second;
+	bogeys[0].mesh = m[1].second;
+	bogeys[1].mesh = m[2].second;
+	texture = Texture::cachedTexture.get(Resource::mapPath("brush47.png"));
+	wheelBase = 12.F;
 	length = 20.F;
 	linkDist = wheelBase;
 }
 
-Brush47Wagon::Brush47Wagon(const LinkPtr & l) : RailWagon(l, "brush47.obj", "brush47.png")
+Brush47Wagon::Brush47Wagon(const LinkPtr & l) : RailWagon(l, 0)
 {
-	wheelBase = 15.7F;
+	ObjParser o {Resource::mapPath("brush47.obj")};
+	bogeyOffset(o);
+	const auto m = o.createMeshes();
+	bodyMesh = m[0].second;
+	bogeys[0].mesh = m[1].second;
+	bogeys[1].mesh = m[2].second;
+	texture = Texture::cachedTexture.get(Resource::mapPath("brush47.png"));
+	wheelBase = 12.F;
 	length = 20.F;
 	linkDist = wheelBase;
 }
diff --git a/game/vehicles/railloco.h b/game/vehicles/railloco.h
index ce4012a..0d0425a 100644
--- a/game/vehicles/railloco.h
+++ b/game/vehicles/railloco.h
@@ -1,15 +1,28 @@
 #include "game/network/link.h"
 #include "game/vehicles/vehicle.h"
 #include "game/worldobject.h"
+#include "gfx/models/mesh.h"
 #include <memory>
 #include <string>
 #include <vector>
 
+class Texture;
 class RailVehicle : public Vehicle {
 public:
+	struct Bogey {
+		Transform location;
+		MeshPtr mesh;
+	};
+
 	using Vehicle::Vehicle;
+	void render(const Shader & shader) const override;
+
+	std::array<Bogey, 2> bogeys;
+	MeshPtr bodyMesh;
+	std::shared_ptr<Texture> texture;
 	float wheelBase;
 	float length;
+
 	friend class RailLoco;
 };
 
diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp
index fceb37c..b9d10bc 100644
--- a/game/vehicles/vehicle.cpp
+++ b/game/vehicles/vehicle.cpp
@@ -4,8 +4,7 @@
 #include <memory>
 #include <utility>
 
-Vehicle::Vehicle(const LinkPtr & l, const std::string & obj, const std::string & tex) :
-	Physical(l->ends.front().first->pos, obj, tex)
+Vehicle::Vehicle(const LinkPtr & l, float ld) : linkDist {ld}
 {
 	linkHist.add(l, 0);
 }
diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h
index 25ed5bb..945d43b 100644
--- a/game/vehicles/vehicle.h
+++ b/game/vehicles/vehicle.h
@@ -1,9 +1,9 @@
 #ifndef VEHICLE_H
 #define VEHICLE_H
 
-#include "game/physical.h"
 #include <game/network/link.h>
 #include <game/worldobject.h>
+#include <gfx/renderable.h>
 #include <memory>
 #include <string>
 #include <utility>
@@ -22,12 +22,14 @@ private:
 	float totalLen {0.F};
 };
 
-class Vehicle : public WorldObject, public Physical {
+class Vehicle : public WorldObject, public Renderable {
 public:
-	Vehicle(const LinkPtr & link, const std::string & obj, const std::string & tex);
-	float linkDist {0}; // distance long current link
+	Vehicle(const LinkPtr & link, float linkDist = 0);
+	float linkDist; // distance long current link
 	float speed {50}; // speed in m/s (~75 km/h)
 
+	Transform location;
+
 protected:
 	LinkHistory linkHist;
 };
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp
index 4db77cd..25a64e4 100644
--- a/gfx/followCameraController.cpp
+++ b/gfx/followCameraController.cpp
@@ -16,7 +16,7 @@ FollowCameraController::updateCamera(Camera * camera) const
 {
 	const auto [pos, rot] = [this]() {
 		const auto t {target.lock()};
-		return std::tie(t->getLocation().GetPos(), t->getLocation().GetRot());
+		return std::tie(t->location.GetPos(), t->location.GetRot());
 	}();
 
 	switch (mode) {
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index 25a4b58..c829f4e 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -7,15 +7,6 @@
 #include <resource.h>

 #include <vector>

 

-Mesh::Mesh(const std::filesystem::path & fileName) : Mesh(ObjParser {Resource::mapPath(fileName)}) { }

-

-Mesh::Mesh(const ObjParser & obj) : Mesh(packObjParser(obj), GL_TRIANGLES) { }

-

-Mesh::Mesh(std::pair<std::vector<Vertex>, std::vector<unsigned int>> && vandi, GLenum m) :

-	Mesh(vandi.first, vandi.second, m)

-{

-}

-

 Mesh::Mesh(std::span<Vertex> vertices, std::span<unsigned int> indices, GLenum m) :

 	m_vertexArrayObject {}, m_vertexArrayBuffers {}, m_numIndices {indices.size()}, mode {m}

 {

@@ -42,34 +33,6 @@ Mesh::Mesh(std::span<Vertex> vertices, std::span<unsigned int> indices, GLenum m
 	glBindVertexArray(0);

 }

 

-Mesh::Data

-Mesh::packObjParser(const ObjParser & obj)

-{

-	std::vector<Vertex> vertices;

-	std::vector<ObjParser::FaceElement> vertexOrder;

-	std::vector<unsigned int> indices;

-	std::for_each(obj.faces.begin(), obj.faces.end(), [&](const ObjParser::Face & face) {

-		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(std::distance(vertexOrder.begin(), existing));

-				}

-				else {

-					indices.push_back(vertices.size());

-					vertices.emplace_back(obj.vertices[fe.x - 1], obj.texCoords[fe.y - 1], -obj.normals[fe.z - 1]);

-					vertexOrder.emplace_back(fe);

-				}

-			};

-			f(0);

-			f(idx);

-			f(idx - 1);

-		}

-	});

-	return std::make_pair(vertices, indices);

-}

-

 Mesh::~Mesh()

 {

 	glDeleteBuffers(NUM_BUFFERS, m_vertexArrayBuffers.data());

diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 4982145..ea3a26b 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -17,9 +17,6 @@ enum MeshBufferPositions { POSITION_VB, TEXCOORD_VB, NORMAL_VB, INDEX_VB };
 

 class Mesh {

 public:

-	using Data = std::pair<std::vector<Vertex>, std::vector<unsigned int>>;

-	explicit Mesh(const std::filesystem::path & fileName);

-	explicit Mesh(const ObjParser & obj);

 	Mesh(std::span<Vertex> vertices, std::span<unsigned int> indices, GLenum = GL_TRIANGLES);

 	virtual ~Mesh();

 

@@ -29,10 +26,6 @@ public:
 	void Draw() const;

 

 private:

-	explicit Mesh(Data && vandi, GLenum = GL_TRIANGLES);

-

-	static Data packObjParser(const ObjParser &);

-

 	static constexpr unsigned int NUM_BUFFERS {4};

 

 	GLuint m_vertexArrayObject;

@@ -40,5 +33,6 @@ private:
 	size_t m_numIndices;

 	GLenum mode;

 };

+using MeshPtr = std::shared_ptr<const Mesh>;

 

 #endif

diff --git a/gfx/models/obj.h b/gfx/models/obj.h
index 96c5e94..2921e34 100644
--- a/gfx/models/obj.h
+++ b/gfx/models/obj.h
@@ -11,6 +11,8 @@
 #include <memory>
 #include <vector>
 
+class Mesh;
+
 class ObjParser : yyFlexLexer {
 public:
 	explicit ObjParser(const std::filesystem::path & fileName) : ObjParser {std::make_unique<std::ifstream>(fileName)}
@@ -19,7 +21,9 @@ public:
 
 	explicit ObjParser(std::unique_ptr<std::istream> in) : yyFlexLexer(in.get())
 	{
+		assert(in);
 		ObjParser::yylex();
+		assert(in->good());
 	}
 
 	int yylex() override;
@@ -29,8 +33,13 @@ public:
 	std::vector<glm::vec3> normals;
 	using FaceElement = glm::vec<3, int>;
 	using Face = std::vector<FaceElement>;
-	std::vector<Face> faces;
+	using Faces = std::vector<Face>;
+	using Object = std::pair<std::string, Faces>;
+	std::vector<Object> objects;
 	glm::length_t axis {0};
+
+	using NamedMesh = std::pair<std::string, std::shared_ptr<const Mesh>>;
+	[[nodiscard]] std::vector<NamedMesh> createMeshes() const;
 };
 
 #endif
diff --git a/gfx/models/obj.impl.cpp b/gfx/models/obj.impl.cpp
new file mode 100644
index 0000000..e410058
--- /dev/null
+++ b/gfx/models/obj.impl.cpp
@@ -0,0 +1,36 @@
+#include "obj.h"
+#include <gfx/models/mesh.h>
+#include <gfx/models/vertex.hpp>
+
+std::vector<ObjParser::NamedMesh>
+ObjParser::createMeshes() const
+{
+	std::vector<ObjParser::NamedMesh> out;
+	out.reserve(objects.size());
+	for (const auto & obj : objects) {
+		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(std::distance(vertexOrder.begin(), existing));
+					}
+					else {
+						indices.push_back(overtices.size());
+						overtices.emplace_back(vertices[fe.x - 1], texCoords[fe.y - 1], -normals[fe.z - 1]);
+						vertexOrder.emplace_back(fe);
+					}
+				};
+				f(0);
+				f(idx);
+				f(idx - 1);
+			}
+		}
+		out.emplace_back(obj.first, std::make_shared<Mesh>(overtices, indices));
+	}
+	return out;
+}
diff --git a/gfx/models/obj.ll b/gfx/models/obj.ll
index 9329a5a..a9a857b 100644
--- a/gfx/models/obj.ll
+++ b/gfx/models/obj.ll
@@ -43,8 +43,8 @@ falsey (0|off)
 }
 <INITIAL>"f " {
   BEGIN(FACE);
-  faces.emplace_back();
-  faces.back().emplace_back();
+  objects.back().second.emplace_back();
+  objects.back().second.back().emplace_back();
   axis = 0;
 }
 <INITIAL>"mtllib " {
@@ -81,7 +81,7 @@ falsey (0|off)
   // fprintf(stderr, "MTLLIB <%s>\n", YYText());
 }
 <OBJECT>{linestring} {
-  // fprintf(stderr, "OBJECT <%s>\n", YYText());
+  objects.emplace_back(YYText(), Faces{});
 }
 <SMOOTH>{truthy} {
   // fprintf(stderr, "Set smooth\n");
@@ -99,13 +99,13 @@ falsey (0|off)
   texCoords.back()[axis++] = std::stof(YYText());
 }
 <FACE>{index} {
-  faces.back().back()[axis] = std::stoi(YYText());
+  objects.back().second.back().back()[axis] = std::stoi(YYText());
 }
 <FACE>\/ {
   axis++;
 }
 <FACE>[ \t] {
-  faces.back().emplace_back();
+  objects.back().second.back().emplace_back();
   axis = 0;
 }
 
diff --git a/test/test-obj.cpp b/test/test-obj.cpp
index 64dc030..68221b8 100644
--- a/test/test-obj.cpp
+++ b/test/test-obj.cpp
@@ -13,8 +13,18 @@ BOOST_AUTO_TEST_CASE(objparse)
 	BOOST_CHECK_EQUAL(48, op.vertices.size());
 	BOOST_CHECK_EQUAL(104, op.texCoords.size());
 	BOOST_CHECK_EQUAL(25, op.normals.size());
-	BOOST_CHECK_EQUAL(28, op.faces.size());
-	BOOST_CHECK_EQUAL(6, op.faces[0].size());
-	BOOST_CHECK_EQUAL(6, op.faces[1].size());
-	BOOST_CHECK_EQUAL(4, op.faces[12].size());
+	BOOST_CHECK_EQUAL(3, op.objects.size());
+	const auto & object {op.objects.front()};
+	BOOST_CHECK_EQUAL("Body", object.first);
+	BOOST_CHECK_EQUAL(18, object.second.size());
+	BOOST_CHECK_EQUAL(6, object.second[0].size());
+	BOOST_CHECK_EQUAL(6, object.second[1].size());
+	BOOST_CHECK_EQUAL(4, object.second[12].size());
+}
+
+BOOST_AUTO_TEST_CASE(create_meshes)
+{
+	ObjParser op {"/home/randomdan/dev/game/res/brush47.obj"};
+	const auto ms = op.createMeshes();
+	BOOST_REQUIRE_EQUAL(3, ms.size());
 }