Commit ef99c270 authored by hybrid's avatar hybrid

Remove unused elements from skeleton code.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2843 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a78dda33
...@@ -752,24 +752,14 @@ void COgreMeshFileLoader::composeObject(void) ...@@ -752,24 +752,14 @@ void COgreMeshFileLoader::composeObject(void)
scaleMatrix.setScale( Skeleton.Bones[i].Scale ); scaleMatrix.setScale( Skeleton.Bones[i].Scale );
joint->LocalMatrix *= scaleMatrix; joint->LocalMatrix *= scaleMatrix;
} }
/*
joint->LocalMatrix[2]=-joint->LocalMatrix[2];
joint->LocalMatrix[6]=-joint->LocalMatrix[6];
joint->LocalMatrix[8]=-joint->LocalMatrix[8];
joint->LocalMatrix[9]=-joint->LocalMatrix[9];
*/
joint->LocalMatrix.setTranslation( Skeleton.Bones[i].Position ); joint->LocalMatrix.setTranslation( Skeleton.Bones[i].Position );
} }
// Joints hierarchy // Joints hierarchy
core::array<bool> isRoot;
isRoot.set_used(Skeleton.Bones.size());
memset(isRoot.pointer(), true, Skeleton.Bones.size());
for (u32 i=0; i<Skeleton.Bones.size(); ++i) for (u32 i=0; i<Skeleton.Bones.size(); ++i)
{ {
if (Skeleton.Bones[i].Parent<m->getJointCount()) if (Skeleton.Bones[i].Parent<m->getJointCount())
{ {
m->getAllJoints()[Skeleton.Bones[i].Parent]->Children.push_back(m->getAllJoints()[Skeleton.Bones[i].Handle]); m->getAllJoints()[Skeleton.Bones[i].Parent]->Children.push_back(m->getAllJoints()[Skeleton.Bones[i].Handle]);
isRoot[Skeleton.Bones[i].Handle]=false;
} }
} }
...@@ -781,9 +771,10 @@ void COgreMeshFileLoader::composeObject(void) ...@@ -781,9 +771,10 @@ void COgreMeshFileLoader::composeObject(void)
{ {
for (u32 k=0; k<Meshes[i].SubMeshes[j].BoneAssignments.size(); ++k) for (u32 k=0; k<Meshes[i].SubMeshes[j].BoneAssignments.size(); ++k)
{ {
ISkinnedMesh::SWeight* w = m->addWeight(m->getAllJoints()[Meshes[i].SubMeshes[j].BoneAssignments[k].BoneID]); OgreBoneAssignment& ba = Meshes[i].SubMeshes[j].BoneAssignments[k];
w->strength=Meshes[i].SubMeshes[j].BoneAssignments[k].Weight; ISkinnedMesh::SWeight* w = m->addWeight(m->getAllJoints()[ba.BoneID]);
w->vertex_id=Meshes[i].SubMeshes[j].BoneAssignments[k].VertexID; w->strength=ba.Weight;
w->vertex_id=ba.VertexID;
w->buffer_id=bufCount; w->buffer_id=bufCount;
} }
++bufCount; ++bufCount;
...@@ -1437,9 +1428,6 @@ bool COgreMeshFileLoader::loadSkeleton(io::IReadFile* meshFile, const core::stri ...@@ -1437,9 +1428,6 @@ bool COgreMeshFileLoader::loadSkeleton(io::IReadFile* meshFile, const core::stri
else else
keyframe.Scale=core::vector3df(1,1,1); keyframe.Scale=core::vector3df(1,1,1);
keyframe.BoneID=bone; keyframe.BoneID=bone;
#ifdef IRR_OGRE_LOADER_DEBUG
// os::Printer::log("Keyframe time", core::stringc(keyframe.Time));
#endif
} }
break; break;
case COGRE_ANIMATION_LINK: case COGRE_ANIMATION_LINK:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment