mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 08:15:35 +00:00
Code Issues Releases Wiki Activity

Rename skel to mSkel

Browse source
This commit is contained in:
Jan-Peter Nilsson 2011-01-12 00:19:43 +01:00
parent 3b47eb4a69
commit 696861349e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/nifogre/ogre_nif_loader.cpp
View file

@ -644,7 +644,7 @@ void NIFLoader::handleNiTriShape(NiTriShape *shape, int flags, BoundsFinder &bou
it != boneList.end(); it++) it != boneList.end(); it++)
{ {
//get the bone from bones array of skindata //get the bone from bones array of skindata
bonePtr = skel->getBone(shape->skin->bones[boneIndex].name.toString()); bonePtr = mSkel->getBone(shape->skin->bones[boneIndex].name.toString());
// final_vector = old_vector + old_rotation*new_vector*old_scale // final_vector = old_vector + old_rotation*new_vector*old_scale
vecPos = bonePtr->_getDerivedPosition() + vecPos = bonePtr->_getDerivedPosition() +
@ -767,7 +767,7 @@ void NIFLoader::handleNode(Nif::Node *node, int flags,
//FIXME: "Bip01" isn't every time the root bone //FIXME: "Bip01" isn't every time the root bone
if (node->name == "Bip01" || node->name == "Root Bone") //root node, create a skeleton if (node->name == "Bip01" || node->name == "Root Bone") //root node, create a skeleton
{ {
skel = SkeletonManager::getSingleton().create(getSkeletonName(), resourceGroup, true); mSkel = SkeletonManager::getSingleton().create(getSkeletonName(), resourceGroup, true);
/*if (node->extra->recType == RC_NiTextKeyExtraData ) /*if (node->extra->recType == RC_NiTextKeyExtraData )
{ {
@ -776,16 +776,16 @@ void NIFLoader::handleNode(Nif::Node *node, int flags,
}*/ }*/
} }
if (!skel.isNull()) //if there is a skeleton if (!mSkel.isNull()) //if there is a skeleton
{ {
std::string name = node->name.toString(); std::string name = node->name.toString();
//if (isBeast && isChest) //if (isBeast && isChest)
// std::cout << "NAME: " << name << "\n"; // std::cout << "NAME: " << name << "\n";
// Quick-n-dirty workaround for the fact that several // Quick-n-dirty workaround for the fact that several
// bones may have the same name. // bones may have the same name.
if(!skel->hasBone(name)) if(!mSkel->hasBone(name))
{ {
bone = skel->createBone(name); bone = mSkel->createBone(name);
if (parentBone) if (parentBone)
parentBone->addChild(bone); parentBone->addChild(bone);
@ -1017,7 +1017,7 @@ void NIFLoader::loadResource(Resource *resource)
//cout << "THISNAME: " << ptr->getName() << "\n"; //cout << "THISNAME: " << ptr->getName() << "\n";
//cout << "RESOURCE:"<< resource->getName(); //cout << "RESOURCE:"<< resource->getName();
mesh = 0; mesh = 0;
skel.setNull(); mSkel.setNull();
// Set up the VFS if it hasn't been done already // Set up the VFS if it hasn't been done already
if (!vfs) vfs = new OgreVFS(resourceGroup); if (!vfs) vfs = new OgreVFS(resourceGroup);

2
components/nifogre/ogre_nif_loader.hpp
View file

@ -135,7 +135,7 @@ class NIFLoader : Ogre::ManualResourceLoader
// pointer to the ogre mesh which is currently build // pointer to the ogre mesh which is currently build
Ogre::Mesh *mesh; Ogre::Mesh *mesh;
Ogre::SkeletonPtr skel; Ogre::SkeletonPtr mSkel;
}; };
#endif #endif