mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Diminish error marker prominence

Browse Source 
Don't render ESM4 actors or SpeedTree objects
This commit is contained in:
Alexei Kotov 2023-09-22 01:00:32 +03:00
parent f507e17807
commit c800152ca2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwclass/esm4base.hpp
View File

@ -150,11 +150,8 @@ namespace MWClass
std::string getModel(const MWWorld::ConstPtr& ptr) const override std::string getModel(const MWWorld::ConstPtr& ptr) const override
{ {
// TODO: Not clear where to get something renderable: // TODO: Implement actor rendering. This function will typically return the skeleton.
// ESM4::Npc::mModel is usually an empty string return {};
// ESM4::Race::mModelMale is only a skeleton
// For now show error marker as a dummy model.
return "meshes/marker_error.nif";
} }
}; };
} }

5
components/resource/scenemanager.cpp
View File

@ -726,6 +726,11 @@ namespace Resource
auto ext = Misc::getFileExtension(normalizedFilename); auto ext = Misc::getFileExtension(normalizedFilename);
if (ext == "nif") if (ext == "nif")
return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager); return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager);
else if (ext == "spt")
{
Log(Debug::Warning) << "Ignoring SpeedTree data file " << normalizedFilename;
return new osg::Node();
}
else else
return loadNonNif(normalizedFilename, *vfs->get(normalizedFilename), imageManager); return loadNonNif(normalizedFilename, *vfs->get(normalizedFilename), imageManager);
} }