mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove an unused parameter

Browse Source
This commit is contained in:
Chris Robinson 2012-07-17 22:41:26 -07:00
parent b04c3cbcac
commit a32740cf5e
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/nifogre/ogre_nif_loader.cpp
View File

@ -180,20 +180,19 @@ void loadResource(Ogre::Resource *resource)
buildBones(skel, node);
}
static bool createSkeleton(const std::string &name, const std::string &group, Nif::Node *node, Ogre::SkeletonPtr *skel)
static bool createSkeleton(const std::string &name, const std::string &group, Nif::Node *node)
{
if(node->boneTrafo != NULL)
{
Ogre::SkeletonManager &skelMgr = Ogre::SkeletonManager::getSingleton();
Ogre::SkeletonPtr tmp = skelMgr.getByName(name);
if(tmp.isNull())
Ogre::SkeletonPtr skel = skelMgr.getByName(name);
if(skel.isNull())
{
static NIFSkeletonLoader loader;
tmp = skelMgr.create(name, group, true, &loader);
skel = skelMgr.create(name, group, true, &loader);
}
if(skel) *skel = tmp;
return true;
}
@ -205,7 +204,7 @@ static bool createSkeleton(const std::string &name, const std::string &group, Ni
{
if(!children[i].empty())
{
if(createSkeleton(name, group, children[i].getPtr(), skel))
if(createSkeleton(name, group, children[i].getPtr()))
return true;
}
}
@ -843,13 +842,10 @@ public:
NIFMeshLoader::LoaderMap NIFMeshLoader::sLoaders;
MeshPairList NIFLoader::load(const std::string &name, Ogre::SkeletonPtr *skel, const std::string &group)
MeshPairList NIFLoader::load(const std::string &name, const std::string &group)
{
MeshPairList meshes;
if(skel != NULL)
skel->setNull();
Nif::NIFFile nif(name);
if (nif.numRecords() < 1)
{
@ -869,7 +865,7 @@ MeshPairList NIFLoader::load(const std::string &name, Ogre::SkeletonPtr *skel, c
return meshes;
}
bool hasSkel = NIFSkeletonLoader::createSkeleton(name, group, node, skel);
bool hasSkel = NIFSkeletonLoader::createSkeleton(name, group, node);
NIFMeshLoader meshldr(name, group, hasSkel);
meshldr.createMeshes(node, meshes);
@ -881,7 +877,7 @@ EntityList NIFLoader::createEntities(Ogre::SceneNode *parent, const std::string
{
EntityList entitylist;
MeshPairList meshes = load(name, NULL, group);
MeshPairList meshes = load(name, group);
if(meshes.size() == 0)
return entitylist;

4
components/nifogre/ogre_nif_loader.hpp
View File

@ -86,9 +86,7 @@ typedef std::vector< std::pair<Ogre::MeshPtr,std::string> > MeshPairList;
*/
class NIFLoader
{
static MeshPairList load(const std::string &name,
Ogre::SkeletonPtr *skel=NULL,
const std::string &group="General");
static MeshPairList load(const std::string &name, const std::string &group);
public:
static EntityList createEntities(Ogre::SceneNode *parent,