mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 13:20:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DoNotSearchTwice' into 'master'

Browse Source 
Search only in the niffilemanager for nif files

See merge request OpenMW/openmw!823
This commit is contained in:
psi29a 2021-05-13 17:11:57 +00:00
commit d843ec321e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/resource/scenemanager.cpp
View File

@ -378,7 +378,7 @@ namespace Resource
Resource::ImageManager* mImageManager; Resource::ImageManager* mImageManager;
}; };
osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager) osg::ref_ptr<osg::Node> load (const std::string& normalizedFilename, const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
{ {
std::string ext = Resource::getFileExtension(normalizedFilename); std::string ext = Resource::getFileExtension(normalizedFilename);
if (ext == "nif") if (ext == "nif")
@ -400,7 +400,7 @@ namespace Resource
options->setReadFileCallback(new ImageReadCallback(imageManager)); options->setReadFileCallback(new ImageReadCallback(imageManager));
if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits"); if (ext == "dae") options->setOptionString("daeUseSequencedTextureUnits");
osgDB::ReaderWriter::ReadResult result = reader->readNode(*file, options); osgDB::ReaderWriter::ReadResult result = reader->readNode(*vfs->get(normalizedFilename), options);
if (!result.success()) if (!result.success())
{ {
std::stringstream errormsg; std::stringstream errormsg;
@ -527,9 +527,7 @@ namespace Resource
osg::ref_ptr<osg::Node> loaded; osg::ref_ptr<osg::Node> loaded;
try try
{ {
Files::IStreamPtr file = mVFS->get(normalized); loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
loaded = load(file, normalized, mImageManager, mNifFileManager);
} }
catch (std::exception& e) catch (std::exception& e)
{ {
@ -541,8 +539,7 @@ namespace Resource
if (mVFS->exists(normalized)) if (mVFS->exists(normalized))
{ {
Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead"; Log(Debug::Error) << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead";
Files::IStreamPtr file = mVFS->get(normalized); loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
loaded = load(file, normalized, mImageManager, mNifFileManager);
break; break;
} }
} }