Merge branch 'vfs_normalized_path_19' into 'master'

Use normalized path for correctActorModelPath (#8138) See merge request OpenMW/openmw!4443
OpenMW · Nov 4, 2024 · 20f77ec · 20f77ec
2 parents 6f9e84b + afa7694
commit 20f77ec
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 48 deletions.
diff --git a/apps/navmeshtool/worldspacedata.cpp b/apps/navmeshtool/worldspacedata.cpp
@@ -121,7 +121,7 @@ namespace NavMeshTool
 
             for (CellRef& cellRef : cellRefs)
             {
-                std::string model(getModel(esmData, cellRef.mRefId, cellRef.mType));
+                VFS::Path::Normalized model(getModel(esmData, cellRef.mRefId, cellRef.mType));
                 if (model.empty())
                     continue;
 

diff --git a/apps/opencs/view/render/actor.cpp b/apps/opencs/view/render/actor.cpp
@@ -47,7 +47,7 @@ namespace CSVRender
         mBaseNode->removeChildren(0, mBaseNode->getNumChildren());
 
         // Load skeleton
-        std::string skeletonModel = mActorData->getSkeleton();
+        VFS::Path::Normalized skeletonModel = mActorData->getSkeleton();
         skeletonModel
             = Misc::ResourceHelpers::correctActorModelPath(skeletonModel, mData.getResourceSystem()->getVFS());
         loadSkeleton(skeletonModel);

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
@@ -413,8 +413,7 @@ namespace MWPhysics
             return;
 
         const VFS::Path::Normalized animationMesh = ptr.getClass().useAnim()
-            ? VFS::Path::toNormalized(
-                Misc::ResourceHelpers::correctActorModelPath(mesh.value(), mResourceSystem->getVFS()))
+            ? Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS())
             : VFS::Path::Normalized(mesh);
         osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(animationMesh);
         if (!shapeInstance || !shapeInstance->mCollisionShape)
@@ -564,7 +563,7 @@ namespace MWPhysics
     void PhysicsSystem::addActor(const MWWorld::Ptr& ptr, VFS::Path::NormalizedView mesh)
     {
         const VFS::Path::Normalized animationMesh
-            = Misc::ResourceHelpers::correctActorModelPath(mesh.value(), mResourceSystem->getVFS());
+            = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
         osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(animationMesh);
 
         // Try to get shape from basic model as fallback for creatures

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
@@ -1625,7 +1625,8 @@ namespace MWRender
                     const bool werewolf = false;
 
                     defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(
-                        getActorSkeleton(firstPerson, isFemale, isBeast, werewolf), mResourceSystem->getVFS());
+                        VFS::Path::toNormalized(getActorSkeleton(firstPerson, isFemale, isBeast, werewolf)),
+                        mResourceSystem->getVFS());
                 }
             }
         }

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
@@ -494,13 +494,14 @@ namespace MWRender
         }
 
         const std::string defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(
-            getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf), mResourceSystem->getVFS());
+            VFS::Path::toNormalized(getActorSkeleton(is1stPerson, isFemale, isBeast, isWerewolf)),
+            mResourceSystem->getVFS());
 
         std::string smodel = defaultSkeleton;
         bool isCustomModel = false;
         if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
         {
-            std::string model = Misc::ResourceHelpers::correctMeshPath(mNpc->mModel);
+            VFS::Path::Normalized model = Misc::ResourceHelpers::correctMeshPath(mNpc->mModel);
             isCustomModel = !isDefaultActorSkeleton(model);
             smodel = Misc::ResourceHelpers::correctActorModelPath(model, mResourceSystem->getVFS());
         }

diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
@@ -79,7 +79,8 @@ namespace MWRender
         std::string animationMesh = mesh;
         if (animated && !mesh.empty())
         {
-            animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+            animationMesh = Misc::ResourceHelpers::correctActorModelPath(
+                VFS::Path::toNormalized(mesh), mResourceSystem->getVFS());
             if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
                 animated = false;
         }
@@ -96,7 +97,8 @@ namespace MWRender
         ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
 
         bool animated = true;
-        std::string animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
+        std::string animationMesh
+            = Misc::ResourceHelpers::correctActorModelPath(VFS::Path::toNormalized(mesh), mResourceSystem->getVFS());
         if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
             animated = false;
 

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
@@ -1437,8 +1437,8 @@ namespace MWScript
                     osg::Vec3f pos(ptr.getRefData().getPosition().asVec3());
                     msg << "Coordinates: " << pos.x() << " " << pos.y() << " " << pos.z() << std::endl;
                     auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-                    const VFS::Path::Normalized model(
-                        ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getCorrectedModel(ptr), vfs));
+                    const VFS::Path::Normalized model = ::Misc::ResourceHelpers::correctActorModelPath(
+                        VFS::Path::toNormalized(ptr.getClass().getCorrectedModel(ptr)), vfs);
                     msg << "Model: " << model.value() << std::endl;
                     if (!model.empty())
                     {

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
@@ -1126,8 +1126,9 @@ namespace MWWorld
     void Scene::preload(const std::string& mesh, bool useAnim)
     {
         const VFS::Path::Normalized meshPath = useAnim
-            ? Misc::ResourceHelpers::correctActorModelPath(mesh, mRendering.getResourceSystem()->getVFS())
-            : mesh;
+            ? Misc::ResourceHelpers::correctActorModelPath(
+                VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS())
+            : VFS::Path::toNormalized(mesh);
 
         if (mRendering.getResourceSystem()->getSceneManager()->checkLoaded(meshPath, mRendering.getReferenceTime()))
             return;

diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
@@ -16,29 +16,16 @@
 
 namespace
 {
-
-    struct MatchPathSeparator
-    {
-        bool operator()(char ch) const { return ch == '\\' || ch == '/'; }
-    };
-
-    std::string getBasename(std::string const& pathname)
-    {
-        return std::string(
-            std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
-    }
-
-}
-
-bool changeExtension(std::string& path, std::string_view ext)
-{
-    std::string::size_type pos = path.rfind('.');
-    if (pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
+    bool changeExtension(std::string& path, std::string_view ext)
     {
-        path.replace(pos, path.length(), ext);
-        return true;
+        std::string::size_type pos = path.rfind('.');
+        if (pos != std::string::npos && path.compare(pos, path.length() - pos, ext) != 0)
+        {
+            path.replace(pos, path.length(), ext);
+            return true;
+        }
+        return false;
     }
-    return false;
 }
 
 bool Misc::ResourceHelpers::changeExtensionToDds(std::string& path)
@@ -106,15 +93,16 @@ std::string Misc::ResourceHelpers::correctResourcePath(
     // fall back to a resource in the top level directory if it exists
     std::string fallback{ topLevelDirectories.front() };
     fallback += '\\';
-    fallback += getBasename(correctedPath);
+    fallback += Misc::getFileName(correctedPath);
+
     if (vfs->exists(fallback))
         return fallback;
 
     if (changedToDds)
     {
         fallback = topLevelDirectories.front();
         fallback += '\\';
-        fallback += getBasename(origExt);
+        fallback += Misc::getFileName(origExt);
         if (vfs->exists(fallback))
             return fallback;
     }
@@ -154,22 +142,23 @@ std::string Misc::ResourceHelpers::correctBookartPath(
     return image;
 }
 
-std::string Misc::ResourceHelpers::correctActorModelPath(std::string_view resPath, const VFS::Manager* vfs)
+VFS::Path::Normalized Misc::ResourceHelpers::correctActorModelPath(
+    VFS::Path::NormalizedView resPath, const VFS::Manager* vfs)
 {
-    std::string mdlname(resPath);
-    std::string::size_type p = mdlname.find_last_of("/\\");
+    std::string mdlname(resPath.value());
+    std::string::size_type p = mdlname.find_last_of('/');
     if (p != std::string::npos)
-        mdlname.insert(mdlname.begin() + p + 1, 'x');
+        mdlname.insert(mdlname.begin() + static_cast<std::string::difference_type>(p) + 1, 'x');
     else
         mdlname.insert(mdlname.begin(), 'x');
-    std::string kfname = mdlname;
-    if (Misc::StringUtils::ciEndsWith(kfname, ".nif"))
-        kfname.replace(kfname.size() - 4, 4, ".kf");
+
+    VFS::Path::Normalized kfname(mdlname);
+    if (Misc::getFileExtension(mdlname) == "nif")
+        kfname.changeExtension("kf");
 
     if (!vfs->exists(kfname))
-    {
-        return std::string(resPath);
-    }
+        return VFS::Path::Normalized(resPath);
+
     return mdlname;
 }
 

diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
@@ -33,7 +33,7 @@ namespace Misc
         std::string correctBookartPath(std::string_view resPath, int width, int height, const VFS::Manager* vfs);
         /// Use "xfoo.nif" instead of "foo.nif" if "xfoo.kf" is available
         /// Note that if "xfoo.nif" is actually unavailable, we can't fall back to "foo.nif". :(
-        std::string correctActorModelPath(std::string_view resPath, const VFS::Manager* vfs);
+        VFS::Path::Normalized correctActorModelPath(VFS::Path::NormalizedView resPath, const VFS::Manager* vfs);
         std::string correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs);
 
         // Adds "meshes\\".