zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed weight bug when more then one mesh in an x file is skinned 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@972 dfc29bdd-3216-0410-991c-e03cc46cb475
master
lukeph 2007-09-18 02:51:06 +00:00
parent 81bd54f2fd
commit 0812b44901
3 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ISkinnedMesh.h
View File

@ -137,6 +137,7 @@ namespace scene
//! List of child joints //! List of child joints
core::array<SJoint*> Children; core::array<SJoint*> Children;
//! List of attached meshes
core::array<u32> AttachedMeshes; core::array<u32> AttachedMeshes;
//! Animation keys causing translation change //! Animation keys causing translation change

76
source/Irrlicht/CXMeshFileLoader.cpp
View File

@ -200,40 +200,35 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
} }
} }
for (i=0;i<AnimatedMesh->getAllJoints().size();++i) for (u32 j=0;j<mesh->Weights.size();++j)
{ {
ISkinnedMesh::SWeight& Weight = (*mesh->Weights[j]);
ISkinnedMesh::SJoint *Joint=AnimatedMesh->getAllJoints()[i]; u32 id = Weight.vertex_id;
for (u32 j=0;j<Joint->Weights.size();++j) if (id>=verticesLink.size())
{ {
os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
id=0;
}
ISkinnedMesh::SWeight& Weight = Joint->Weights[j]; if (verticesLinkBuffer[id].size()==1)
u32 id = Weight.vertex_id; {
Weight.vertex_id=verticesLink[id][0];
if (id>verticesLink.size()) Weight.buffer_id=verticesLinkBuffer[id][0];
}
else if (verticesLinkBuffer[id].size() != 0)
{
for (u32 k=1; k < verticesLinkBuffer[id].size(); ++k)
{ {
os::Printer::log("X loader: Weight id out of range", ELL_WARNING); ISkinnedMesh::SWeight* WeightClone = AnimatedMesh->createWeight(Joint);
id=0; WeightClone->strength = Weight.strength;
} WeightClone->vertex_id = verticesLink[id][k];
WeightClone->buffer_id = verticesLinkBuffer[id][k];
if (verticesLinkBuffer[id].size()==1)
{
Weight.vertex_id=verticesLink[id][0];
Weight.buffer_id=verticesLinkBuffer[id][0];
}
else if (verticesLinkBuffer[id].size() != 0)
{
for (u32 k=1; k < verticesLinkBuffer[id].size(); ++k)
{
ISkinnedMesh::SWeight* WeightClone = AnimatedMesh->createWeight(Joint);
WeightClone->strength = Weight.strength;
WeightClone->vertex_id = verticesLink[id][k];
WeightClone->buffer_id = verticesLinkBuffer[id][k];
}
} }
} }
} }
} }
#else #else
{ {
@ -290,26 +285,23 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
buffer->Indices.push_back( verticesLink[ mesh->Indices[id] ] ); buffer->Indices.push_back( verticesLink[ mesh->Indices[id] ] );
} }
for (i=0; i<AnimatedMesh->getAllJoints().size(); ++i)
for (u32 j=0;j<mesh->Weights.size();++j)
{ {
ISkinnedMesh::SJoint *Joint = AnimatedMesh->getAllJoints()[i]; ISkinnedMesh::SWeight& Weight = (*mesh->Weights[j]);
for (u32 j=0;j<Joint->Weights.size();++j) u32 id = Weight.vertex_id;
if (id>=verticesLink.size())
{ {
ISkinnedMesh::SWeight& Weight = Joint->Weights[j]; os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
id=0;
u32 id = Weight.vertex_id;
if (id>=verticesLink.size())
{
os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
id=0;
}
Weight.vertex_id=verticesLink[id];
Weight.buffer_id=verticesLinkBuffer[id];
} }
Weight.vertex_id=verticesLink[id];
Weight.buffer_id=verticesLinkBuffer[id];
} }
} }
#endif #endif
@ -884,12 +876,16 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
const u32 jointStart = joint->Weights.size(); const u32 jointStart = joint->Weights.size();
joint->Weights.reallocate(jointStart+nWeights); joint->Weights.reallocate(jointStart+nWeights);
mesh.Weights.reallocate( mesh.Weights.size() + nWeights );
for (i=0; i<nWeights; ++i) for (i=0; i<nWeights; ++i)
{ {
CSkinnedMesh::SWeight *weight=AnimatedMesh->createWeight(joint); CSkinnedMesh::SWeight *weight=AnimatedMesh->createWeight(joint);
weight->buffer_id=0; weight->buffer_id=0;
weight->vertex_id=readInt(); weight->vertex_id=readInt();
mesh.Weights.push_back(weight);
} }
// read vertex weights // read vertex weights

2
source/Irrlicht/CXMeshFileLoader.h
View File

@ -76,6 +76,8 @@ public:
s32 AttachedJointID; s32 AttachedJointID;
bool HasSkinning; bool HasSkinning;
core::array<ISkinnedMesh::SWeight*> Weights;
}; };
private: private: