mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:23:52 +00:00
Code Issues Releases Wiki Activity

Rename nonaccum to animroot

Browse source
This commit is contained in:
Chris Robinson 2013-01-28 22:09:41 -08:00
parent 7df4d0d19f
commit 487c83e943
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/nifogre/ogre_nif_loader.cpp
View file

@ -305,7 +305,7 @@ static TextKeyMap extractTextKeys(const Nif::NiTextKeyExtraData *tk)
} }
void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonaccum, TextKeyMap &textkeys, std::vector<Nif::NiKeyframeController const*> &ctrls, Ogre::Bone *parent=NULL) void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&animroot, TextKeyMap &textkeys, std::vector<Nif::NiKeyframeController const*> &ctrls, Ogre::Bone *parent=NULL)
{ {
if(node->recType == Nif::RC_NiTriShape) if(node->recType == Nif::RC_NiTriShape)
return; return;
@ -326,18 +326,18 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc
while(!ctrl.empty()) while(!ctrl.empty())
{ {
if(ctrl->recType == Nif::RC_NiKeyframeController) if(ctrl->recType == Nif::RC_NiKeyframeController)
ctrls.push_back(static_cast<Nif::NiKeyframeController*>(ctrl.getPtr())); ctrls.push_back(static_cast<const Nif::NiKeyframeController*>(ctrl.getPtr()));
ctrl = ctrl->next; ctrl = ctrl->next;
} }
Nif::ExtraPtr e = node->extra; Nif::ExtraPtr e = node->extra;
while(!e.empty()) while(!e.empty())
{ {
if(e->recType == Nif::RC_NiTextKeyExtraData && !nonaccum) if(e->recType == Nif::RC_NiTextKeyExtraData && !animroot)
{ {
const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr()); const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
textkeys = extractTextKeys(tk); textkeys = extractTextKeys(tk);
nonaccum = bone; animroot = bone;
} }
e = e->extra; e = e->extra;
} }
@ -349,7 +349,7 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc
for(size_t i = 0;i < children.length();i++) for(size_t i = 0;i < children.length();i++)
{ {
if(!children[i].empty()) if(!children[i].empty())
buildBones(skel, children[i].getPtr(), nonaccum, textkeys, ctrls, bone); buildBones(skel, children[i].getPtr(), animroot, textkeys, ctrls, bone);
} }
} }
} }
@ -369,10 +369,10 @@ void loadResource(Ogre::Resource *resource)
const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif.getRecord(0)); const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif.getRecord(0));
std::vector<const Nif::NiKeyframeController*> ctrls; std::vector<const Nif::NiKeyframeController*> ctrls;
Ogre::Bone *nonaccum = NULL; Ogre::Bone *animroot = NULL;
TextKeyMap textkeys; TextKeyMap textkeys;
try { try {
buildBones(skel, node, nonaccum, textkeys, ctrls); buildBones(skel, node, animroot, textkeys, ctrls);
} }
catch(std::exception &e) { catch(std::exception &e) {
std::cerr<< "Exception while loading "<<skel->getName() <<std::endl; std::cerr<< "Exception while loading "<<skel->getName() <<std::endl;
@ -402,14 +402,14 @@ void loadResource(Ogre::Resource *resource)
return; return;
} }
if(!nonaccum) if(!animroot)
{ {
warn(Ogre::StringConverter::toString(ctrls.size())+" animated node(s) in "+ warn(Ogre::StringConverter::toString(ctrls.size())+" animated node(s) in "+
skel->getName()+", but no text keys. Uses NiBSAnimationNode?"); skel->getName()+", but no text keys. Uses NiBSAnimationNode?");
return; return;
} }
Ogre::UserObjectBindings &bindings = nonaccum->getUserObjectBindings(); Ogre::UserObjectBindings &bindings = animroot->getUserObjectBindings();
bindings.setUserAny(sTextKeyExtraDataID, Ogre::Any(true)); bindings.setUserAny(sTextKeyExtraDataID, Ogre::Any(true));
std::string currentgroup; std::string currentgroup;