Merge branch 'lessgoofymaterialptr' into 'master'

Simplify material file pointer acrobatics See merge request OpenMW/openmw!4049
OpenMW · Apr 24, 2024 · a628c65 · a628c65
2 parents 99a0755 + 78eda53
commit a628c65
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 64 deletions.
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
@@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>
 
-#include <components/bgsm/reader.hpp>
+#include <components/bgsm/file.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
@@ -88,11 +88,10 @@ void readFile(
         }
         else
         {
-            Bgsm::Reader reader;
             if (vfs != nullptr)
-                reader.parse(vfs->get(pathStr));
+                Bgsm::parse(vfs->get(pathStr));
             else
-                reader.parse(Files::openConstrainedFileStream(fullPath));
+                Bgsm::parse(Files::openConstrainedFileStream(fullPath));
         }
     }
     catch (std::exception& e)

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -108,7 +108,7 @@ add_component_dir (settings
     )
 
 add_component_dir (bgsm
-    reader stream file
+    stream file
     )
 
 add_component_dir (bsa

diff --git a/components/bgsm/file.cpp b/components/bgsm/file.cpp
@@ -1,9 +1,37 @@
 #include "file.hpp"
 
+#include <array>
+#include <stdexcept>
+
 #include "stream.hpp"
 
 namespace Bgsm
 {
+    MaterialFilePtr parse(Files::IStreamPtr&& inputStream)
+    {
+        std::shared_ptr<Bgsm::MaterialFile> file;
+        BGSMStream stream(std::move(inputStream));
+
+        std::array<char, 4> signature;
+        stream.readArray(signature);
+        std::string shaderType(signature.data(), 4);
+        if (shaderType == "BGEM")
+        {
+            file = std::make_shared<BGEMFile>();
+            file->mShaderType = Bgsm::ShaderType::Effect;
+        }
+        else if (shaderType == "BGSM")
+        {
+            file = std::make_shared<BGSMFile>();
+            file->mShaderType = Bgsm::ShaderType::Lighting;
+        }
+        else
+            throw std::runtime_error("Invalid material file");
+
+        file->read(stream);
+        return file;
+    }
+
     void MaterialFile::read(BGSMStream& stream)
     {
         stream.read(mVersion);

diff --git a/components/bgsm/file.hpp b/components/bgsm/file.hpp
@@ -10,6 +10,8 @@
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
+#include <components/files/istreamptr.hpp>
+
 namespace Bgsm
 {
     class BGSMStream;
@@ -160,5 +162,6 @@ namespace Bgsm
     };
 
     using MaterialFilePtr = std::shared_ptr<const Bgsm::MaterialFile>;
+    MaterialFilePtr parse(Files::IStreamPtr&& stream);
 }
 #endif
diff --git a/components/bgsm/reader.cpp b/components/bgsm/reader.cpp
diff --git a/components/bgsm/reader.hpp b/components/bgsm/reader.hpp
diff --git a/components/resource/bgsmfilemanager.cpp b/components/resource/bgsmfilemanager.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Object>
 
-#include <components/bgsm/reader.hpp>
 #include <components/vfs/manager.hpp>
 
 #include "objectcache.hpp"
@@ -41,9 +40,7 @@ namespace Resource
             return static_cast<BgsmFileHolder*>(obj.get())->mBgsmFile;
         else
         {
-            Bgsm::Reader reader;
-            reader.parse(mVFS->get(name));
-            Bgsm::MaterialFilePtr file = reader.getFile();
+            Bgsm::MaterialFilePtr file = Bgsm::parse(mVFS->get(name));
             obj = new BgsmFileHolder(file);
             mCache->addEntryToObjectCache(name.value(), obj);
             return file;