From f8e7c47bbd33fb67afa3ba5478fceb13ddb09243 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 19 Feb 2021 01:16:38 +0000 Subject: 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. --- gfx/followCameraController.cpp | 2 +- gfx/models/mesh.cpp | 37 ------------------------------------- gfx/models/mesh.h | 8 +------- gfx/models/obj.h | 11 ++++++++++- gfx/models/obj.impl.cpp | 36 ++++++++++++++++++++++++++++++++++++ gfx/models/obj.ll | 10 +++++----- 6 files changed, 53 insertions(+), 51 deletions(-) create mode 100644 gfx/models/obj.impl.cpp (limited to 'gfx') 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 #include -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> && vandi, GLenum m) : - Mesh(vandi.first, vandi.second, m) -{ -} - Mesh::Mesh(std::span vertices, std::span indices, GLenum m) : m_vertexArrayObject {}, m_vertexArrayBuffers {}, m_numIndices {indices.size()}, mode {m} { @@ -42,34 +33,6 @@ Mesh::Mesh(std::span vertices, std::span indices, GLenum m glBindVertexArray(0); } -Mesh::Data -Mesh::packObjParser(const ObjParser & obj) -{ - std::vector vertices; - std::vector vertexOrder; - std::vector 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>; - explicit Mesh(const std::filesystem::path & fileName); - explicit Mesh(const ObjParser & obj); Mesh(std::span vertices, std::span 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; #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 #include +class Mesh; + class ObjParser : yyFlexLexer { public: explicit ObjParser(const std::filesystem::path & fileName) : ObjParser {std::make_unique(fileName)} @@ -19,7 +21,9 @@ public: explicit ObjParser(std::unique_ptr in) : yyFlexLexer(in.get()) { + assert(in); ObjParser::yylex(); + assert(in->good()); } int yylex() override; @@ -29,8 +33,13 @@ public: std::vector normals; using FaceElement = glm::vec<3, int>; using Face = std::vector; - std::vector faces; + using Faces = std::vector; + using Object = std::pair; + std::vector objects; glm::length_t axis {0}; + + using NamedMesh = std::pair>; + [[nodiscard]] std::vector 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 +#include + +std::vector +ObjParser::createMeshes() const +{ + std::vector out; + out.reserve(objects.size()); + for (const auto & obj : objects) { + std::vector overtices; + std::vector vertexOrder; + std::vector 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(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) } "f " { BEGIN(FACE); - faces.emplace_back(); - faces.back().emplace_back(); + objects.back().second.emplace_back(); + objects.back().second.back().emplace_back(); axis = 0; } "mtllib " { @@ -81,7 +81,7 @@ falsey (0|off) // fprintf(stderr, "MTLLIB <%s>\n", YYText()); } {linestring} { - // fprintf(stderr, "OBJECT <%s>\n", YYText()); + objects.emplace_back(YYText(), Faces{}); } {truthy} { // fprintf(stderr, "Set smooth\n"); @@ -99,13 +99,13 @@ falsey (0|off) texCoords.back()[axis++] = std::stof(YYText()); } {index} { - faces.back().back()[axis] = std::stoi(YYText()); + objects.back().second.back().back()[axis] = std::stoi(YYText()); } \/ { axis++; } [ \t] { - faces.back().emplace_back(); + objects.back().second.back().emplace_back(); axis = 0; } -- cgit v1.2.3