mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-13 16:43:07 +00:00
Code Issues Releases Wiki Activity

Use normalized path for getLODMeshName

Browse source
This commit is contained in:
elsid 2024-11-15 01:02:43 +01:00
parent 43f25fea5d
commit 36198e9413
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/objectpaging.cpp
View file

@ -668,7 +668,7 @@ namespace MWRender
model = mLODNameCache model = mLODNameCache
.emplace_hint(found, std::move(key), .emplace_hint(found, std::move(key),
Misc::ResourceHelpers::getLODMeshName(world.getESMVersions()[refNum.mContentFile], Misc::ResourceHelpers::getLODMeshName(world.getESMVersions()[refNum.mContentFile],
model, mSceneManager->getVFS(), lod)) model, *mSceneManager->getVFS(), lod))
->second; ->second;
} }

2
apps/openmw/mwrender/objectpaging.hpp
View file

@ -79,7 +79,7 @@ namespace MWRender
std::mutex mLODNameCacheMutex; std::mutex mLODNameCacheMutex;
typedef std::pair<std::string, unsigned char> LODNameCacheKey; // Key: mesh name, lod level typedef std::pair<std::string, unsigned char> LODNameCacheKey; // Key: mesh name, lod level
typedef std::map<LODNameCacheKey, std::string> LODNameCache; // Cache: key, mesh name to use using LODNameCache = std::map<LODNameCacheKey, VFS::Path::Normalized>; // Cache: key, mesh name to use
LODNameCache mLODNameCache; LODNameCache mLODNameCache;
}; };

47
components/misc/resourcehelpers.cpp
View file

@ -217,45 +217,56 @@ bool Misc::ResourceHelpers::isHiddenMarker(const ESM::RefId& id)
namespace namespace
{ {
std::string getLODMeshNameImpl(std::string resPath, std::string_view pattern) VFS::Path::Normalized getLODMeshNameImpl(VFS::Path::NormalizedView resPath, std::string_view pattern)
{ {
if (auto w = Misc::findExtension(resPath); w != std::string::npos) const std::string_view::size_type position = Misc::findExtension(resPath.value());
resPath.insert(w, pattern); if (position == std::string::npos)
return VFS::Path::normalizeFilename(resPath); return VFS::Path::Normalized(resPath);
std::string withPattern(resPath.value());
withPattern.insert(position, pattern);
return VFS::Path::Normalized(std::move(withPattern));
} }
std::string getBestLODMeshName(std::string const& resPath, const VFS::Manager* vfs, std::string_view pattern) VFS::Path::Normalized getBestLODMeshName(
VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, std::string_view pattern)
{ {
if (std::string result = getLODMeshNameImpl(resPath, pattern); vfs->exists(result)) if (VFS::Path::Normalized result = getLODMeshNameImpl(resPath, pattern); vfs.exists(result))
return result; return result;
return resPath; return VFS::Path::Normalized(resPath);
} }
}
std::string Misc::ResourceHelpers::getLODMeshName( std::string_view getDistantMeshPattern(int esmVersion)
int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod) {
{ static constexpr std::string_view dist = "_dist";
const std::string distantMeshPattern = [&esmVersion] { static constexpr std::string_view far = "_far";
static constexpr std::string_view lod = "_lod";
switch (esmVersion) switch (esmVersion)
{ {
case ESM::VER_120: case ESM::VER_120:
case ESM::VER_130: case ESM::VER_130:
return "_dist"; return dist;
case ESM::VER_080: case ESM::VER_080:
case ESM::VER_100: case ESM::VER_100:
return "_far"; return far;
case ESM::VER_094: case ESM::VER_094:
case ESM::VER_170: case ESM::VER_170:
return "_lod"; return lod;
default: default:
return ""; return std::string_view();
} }
}(); }
}
VFS::Path::Normalized Misc::ResourceHelpers::getLODMeshName(
int esmVersion, VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, unsigned char lod)
{
const std::string_view distantMeshPattern = getDistantMeshPattern(esmVersion);
for (int l = lod; l >= 0; --l) for (int l = lod; l >= 0; --l)
{ {
std::stringstream patern; std::stringstream patern;
patern << distantMeshPattern << "_" << l; patern << distantMeshPattern << "_" << l;
std::string const meshName = getBestLODMeshName(resPath, vfs, patern.str()); const VFS::Path::Normalized meshName = getBestLODMeshName(resPath, vfs, patern.view());
if (meshName != resPath) if (meshName != resPath)
return meshName; return meshName;
} }

4
components/misc/resourcehelpers.hpp
View file

@ -52,7 +52,9 @@ namespace Misc
/// marker objects that have a hardcoded function in the game logic, should be hidden from the player /// marker objects that have a hardcoded function in the game logic, should be hidden from the player
bool isHiddenMarker(const ESM::RefId& id); bool isHiddenMarker(const ESM::RefId& id);
std::string getLODMeshName(int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod = 0);
VFS::Path::Normalized getLODMeshName(
int esmVersion, VFS::Path::NormalizedView resPath, const VFS::Manager& vfs, unsigned char lod = 0);
} }
} }