From 7638e9c3365e25109266e3e74b33b416762c68df Mon Sep 17 00:00:00 2001 From: "Stephen G. Tuggy" Date: Thu, 30 Jan 2025 17:11:18 -0800 Subject: [PATCH] WIP --- engine/src/gfx/lod_coll.cpp | 15 ++++++++------- engine/src/gfx/lod_coll.h | 2 +- engine/src/gfx/mesh.h | 7 +++---- engine/src/gfx/mesh_xml.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/engine/src/gfx/lod_coll.cpp b/engine/src/gfx/lod_coll.cpp index e6b5adc6f7..762ca1827f 100644 --- a/engine/src/gfx/lod_coll.cpp +++ b/engine/src/gfx/lod_coll.cpp @@ -50,16 +50,17 @@ LodColl & LodColl::operator=(LodColl && other) noexcept { return *this; } -std::shared_ptr LodColl::Create(const std::string &hash_name, std::shared_ptr original) { +std::shared_ptr LodColl::Create(const std::string &filename, const int faction, Flightgroup *fg, const std::vector &override_texture) { std::shared_ptr return_value = std::make_shared(Private()); - return_value->LoadMesh(hash_name, original); + + // return_value->LoadMesh(filename, original); return return_value; } -void LodColl::LoadMesh(const std::string &hash_name, std::shared_ptr original) { - this->hash_name_ = hash_name; - this->original_mesh_ = original; - // ... -} +// void LodColl::LoadMesh(const std::string &hash_name, std::shared_ptr original) { +// this->hash_name_ = hash_name; +// this->original_mesh_ = original; +// // ... +// } } // vega_gfx diff --git a/engine/src/gfx/lod_coll.h b/engine/src/gfx/lod_coll.h index 7015fa1a7e..e44ef20ec4 100644 --- a/engine/src/gfx/lod_coll.h +++ b/engine/src/gfx/lod_coll.h @@ -51,7 +51,7 @@ class LodColl: public std::enable_shared_from_this { LodColl(LodColl&&) noexcept; LodColl& operator=(LodColl&&) noexcept; - static std::shared_ptr Create(const std::string& hash_name, std::shared_ptr original); + static std::shared_ptr Create(const std::string& filename, int faction, Flightgroup *fg, const std::vector &override_texture); size_t NumberOfLODs() const; diff --git a/engine/src/gfx/mesh.h b/engine/src/gfx/mesh.h index 8335cc4f61..b9fbeaf7ad 100644 --- a/engine/src/gfx/mesh.h +++ b/engine/src/gfx/mesh.h @@ -178,7 +178,7 @@ class Mesh : public std::enable_shared_from_this { } private: - static std::shared_ptr create(const char *filename, const Vector &scalex, int faction, class Flightgroup *fg, + static std::shared_ptr Create(const char *filename, const Vector &scalex, int faction, class Flightgroup *fg, bool orig, const std::vector &textureOverride) { std::shared_ptr return_value = std::make_shared(); return_value->hash_name = filename; @@ -223,8 +223,8 @@ class Mesh : public std::enable_shared_from_this { return return_value; } -protected: - static std::shared_ptr create(std::string filename, const Vector &scalex, int faction, class Flightgroup *fg, bool orig) { +public: + static std::shared_ptr Create(std::string filename, const Vector &scalex, int faction, class Flightgroup *fg, bool orig) { std::shared_ptr return_value = std::make_shared(); return_value->hash_name = filename; return_value->convex = false; @@ -264,7 +264,6 @@ class Mesh : public std::enable_shared_from_this { } ///Loads a mesh that has been found in the hash table into this mesh (copying original data) -public: bool LoadExistant(std::shared_ptr mesh); bool LoadExistant(const string filehash, const Vector &scale, int faction); protected: diff --git a/engine/src/gfx/mesh_xml.cpp b/engine/src/gfx/mesh_xml.cpp index 67beab3c85..4ca9b0f150 100644 --- a/engine/src/gfx/mesh_xml.cpp +++ b/engine/src/gfx/mesh_xml.cpp @@ -848,7 +848,7 @@ void Mesh::beginElement(MeshXML *xml, const string &name, const AttributeList &a break; case MeshXML::LODFILE: xml->lod - .push_back(Mesh::create((*iter).value.c_str(), + .push_back(Mesh::Create((*iter).value.c_str(), xml->lodscale, xml->faction, xml->fg, @@ -1376,7 +1376,7 @@ std::deque> Mesh::LoadMeshes(const char *filename, } else { f.Close(); bool original = false; - std::shared_ptr m = Mesh::create(filename, scale, faction, fg, original, {}).get(); // FIXME: Stop using raw pointers + std::shared_ptr m = Mesh::Create(filename, scale, faction, fg, original, {}).get(); // FIXME: Stop using raw pointers ret; ret.push_back(m); return ret;