1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:29:55 +00:00

Merge branch 'fix_terrain_texture_cache' into 'master'

Fix performance regression in the terrain texture cache

See merge request OpenMW/openmw!3954
This commit is contained in:
psi29a 2024-03-16 12:50:59 +00:00
commit 379d9a096f
2 changed files with 2 additions and 2 deletions

View file

@ -52,7 +52,7 @@ namespace Resource
Nif::Reader reader(*file, mEncoder); Nif::Reader reader(*file, mEncoder);
reader.parse(mVFS->get(name)); reader.parse(mVFS->get(name));
obj = new NifFileHolder(file); obj = new NifFileHolder(file);
mCache->addEntryToObjectCache(name, obj); mCache->addEntryToObjectCache(name.value(), obj);
return file; return file;
} }
} }

View file

@ -72,7 +72,7 @@ namespace Resource
double mExpiryDelay; double mExpiryDelay;
}; };
class ResourceManager : public GenericResourceManager<VFS::Path::Normalized> class ResourceManager : public GenericResourceManager<std::string>
{ {
public: public:
explicit ResourceManager(const VFS::Manager* vfs, double expiryDelay) explicit ResourceManager(const VFS::Manager* vfs, double expiryDelay)