Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix animation bug

This commit is contained in:
yangxiao 2014-06-26 21:58:26 +08:00
parent ccb39e51b2
commit 2175b25730
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCAnimate3D.cpp
View File

@ -95,7 +95,7 @@ void Animate3D::startWithTarget(Node *target)
_boneCurves.clear(); _boneCurves.clear();
auto skin = sprite->getSkin(); auto skin = sprite->getSkin();
for (unsigned int i = 0; i < skin->getSkinBoneCount(); i++) { for (unsigned int i = 0; i < skin->getBoneCount(); i++) {
auto bone = skin->getBoneByIndex(i); auto bone = skin->getBoneByIndex(i);
auto curve = _animation->getBoneCurveByName(bone->getName()); auto curve = _animation->getBoneCurveByName(bone->getName());
if (curve) if (curve)

4
cocos/3d/CCMeshSkin.cpp
View File

@ -324,9 +324,9 @@ bool MeshSkin::initFromSkinData(const SkinData& skindata)
return true; return true;
} }
ssize_t MeshSkin::getSkinBoneCount() const ssize_t MeshSkin::getBoneCount() const
{ {
return _skinBones.size(); return _skinBones.size() + _nodeBones.size();
} }
//get bone //get bone

4
cocos/3d/CCMeshSkin.h
View File

@ -189,8 +189,8 @@ public:
/**create a new meshskin if do not want to share meshskin*/ /**create a new meshskin if do not want to share meshskin*/
static MeshSkin* create(const std::string& filename, const std::string& name); static MeshSkin* create(const std::string& filename, const std::string& name);
/**get skin bone count*/ /**get total bone count, skin bone + node bone*/
ssize_t getSkinBoneCount() const; ssize_t getBoneCount() const;
/**get bone*/ /**get bone*/
Bone* getBoneByIndex(unsigned int index) const; Bone* getBoneByIndex(unsigned int index) const;