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

Remove an unneeded method

Browse source
This commit is contained in:
Chris Robinson 2013-04-06 10:33:07 -07:00
parent ebcb4c66c3
commit c283991126
1 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
components/nifogre/ogrenifloader.cpp
View file

@ -1070,7 +1070,7 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
} }
// Convert NiTriShape to Ogre::SubMesh // Convert NiTriShape to Ogre::SubMesh
void handleNiTriShape(Ogre::Mesh *mesh, Nif::NiTriShape const *shape) void createSubMesh(Ogre::Mesh *mesh, const Nif::NiTriShape *shape)
{ {
Ogre::SkeletonPtr skel; Ogre::SkeletonPtr skel;
const Nif::NiTriShapeData *data = shape->data.getPtr(); const Nif::NiTriShapeData *data = shape->data.getPtr();
@ -1295,30 +1295,6 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
} }
} }
bool findTriShape(Ogre::Mesh *mesh, const Nif::Node *node)
{
if(node->recType == Nif::RC_NiTriShape && mShapeIndex == node->recIndex)
{
handleNiTriShape(mesh, dynamic_cast<const Nif::NiTriShape*>(node));
return true;
}
const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
if(ninode)
{
const Nif::NodeList &children = ninode->children;
for(size_t i = 0;i < children.length();i++)
{
if(!children[i].empty())
{
if(findTriShape(mesh, children[i].getPtr()))
return true;
}
}
}
return false;
}
typedef std::map<std::string,NIFMeshLoader> LoaderMap; typedef std::map<std::string,NIFMeshLoader> LoaderMap;
static LoaderMap sLoaders; static LoaderMap sLoaders;
@ -1441,8 +1417,8 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
return; return;
} }
const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif->getRecord(mShapeIndex)); const Nif::Record *record = nif->getRecord(mShapeIndex);
findTriShape(mesh, node); createSubMesh(mesh, dynamic_cast<const Nif::NiTriShape*>(record));
} }
void createEntities(Ogre::SceneManager *sceneMgr, const Nif::Node *node, EntityList &entities, int flags=0) void createEntities(Ogre::SceneManager *sceneMgr, const Nif::Node *node, EntityList &entities, int flags=0)