mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 22:36:43 +00:00
Code Issues Releases Wiki Activity

Some cleanup

Browse source
This commit is contained in:
Chris Robinson 2013-01-09 06:32:31 -08:00
parent a9bcbfd8d3
commit 4b7cc1372f
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/nifogre/ogre_nif_loader.cpp
View file

@ -1008,7 +1008,7 @@ public:
virtual void loadResource(Ogre::Resource *resource) virtual void loadResource(Ogre::Resource *resource)
{ {
Ogre::Mesh *mesh = dynamic_cast<Ogre::Mesh*>(resource); Ogre::Mesh *mesh = dynamic_cast<Ogre::Mesh*>(resource);
assert(mesh && "Attempting to load a mesh into a non-mesh resource!"); OgreAssert(mesh, "Attempting to load a mesh into a non-mesh resource!");
if(!mShapeName.length()) if(!mShapeName.length())
{ {
@ -1116,7 +1116,7 @@ MeshInfoList NIFLoader::load(const std::string &name, const std::string &skelNam
Nif::NIFFile nif(name); Nif::NIFFile nif(name);
if (nif.numRecords() < 1) if (nif.numRecords() < 1)
{ {
nif.warn("Found no records in NIF."); nif.warn("Found no NIF records in "+name+".");
return meshes; return meshes;
} }
@ -1127,8 +1127,8 @@ MeshInfoList NIFLoader::load(const std::string &name, const std::string &skelNam
Nif::Node *node = dynamic_cast<Nif::Node*>(r); Nif::Node *node = dynamic_cast<Nif::Node*>(r);
if(node == NULL) if(node == NULL)
{ {
nif.warn("First record in file was not a node, but a "+ nif.warn("First record in "+name+" was not a node, but a "+
r->recName+". Skipping file."); r->recName+".");
return meshes; return meshes;
} }
@ -1204,16 +1204,13 @@ EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bo
return entitylist; return entitylist;
Ogre::SceneManager *sceneMgr = parentNode->getCreator(); Ogre::SceneManager *sceneMgr = parentNode->getCreator();
std::string filter = bonename; std::string filter; filter.resize(bonename.length());
std::transform(filter.begin(), filter.end(), filter.begin(), ::tolower); std::transform(bonename.begin(), bonename.end(), filter.begin(), ::tolower);
for(size_t i = 0;i < meshes.size();i++) for(size_t i = 0;i < meshes.size();i++)
{ {
Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].mMeshName); Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].mMeshName);
if(ent->hasSkeleton()) if(ent->hasSkeleton())
{ {
std::transform(meshes[i].mTargetNode.begin(), meshes[i].mTargetNode.end(),
meshes[i].mTargetNode.begin(), ::tolower);
if(meshes[i].mMeshName.find("@shape=tri "+filter) == std::string::npos) if(meshes[i].mMeshName.find("@shape=tri "+filter) == std::string::npos)
{ {
sceneMgr->destroyEntity(ent); sceneMgr->destroyEntity(ent);