Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Modified to calculate bone transformation matrices in world space, rather than object space.

Browse Source 
This was SVN commit r416.
This commit is contained in:
notpete 2004-06-07 20:00:56 +00:00
parent 97b7efab20
commit 178e5a1c47
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/graphics/Model.cpp
View File

@ -94,12 +94,19 @@ static CVector3D SkinPoint(const CVector3D& pos,const SVertexBlend& blend,
// SkinPoint: skin the given point using the given blend and matrix data
static CVector3D SkinPoint(const CVector3D& pos,const SVertexBlend& blend,
const CMatrix3D* bonestates)
{
CVector3D result(0,0,0);
for (int i=0;i<SVertexBlend::SIZE && blend.m_Bone[i]!=0xff;i++) {
const CMatrix3D& m=bonestates[blend.m_Bone[i]];
{
CVector3D result,tmp;
// must have at least one valid bone if we're using SkinPoint
assert(blend.m_Bone[0]!=0xff);
CVector3D tmp=m.Transform(pos);
const CMatrix3D& m=bonestates[blend.m_Bone[0]];
m.Transform(pos,result);
result*=blend.m_Weight[0];
for (int i=1;i<SVertexBlend::SIZE && blend.m_Bone[i]!=0xff;i++) {
const CMatrix3D& m=bonestates[blend.m_Bone[i]];
m.Transform(pos,tmp);
result+=tmp*blend.m_Weight[i];
}
@ -211,9 +218,8 @@ void CModel::GenerateBoneMatrices()
const CMatrix3D& transform=GetTransform();
for (int i=0;i<m_pModelDef->GetNumBones();i++) {
CMatrix3D m=m_BoneMatrices[i];
m.Concatenate(transform);
m.GetInverse(m_InvBoneMatrices[i]);
m_BoneMatrices[i].Concatenate(transform);
m_BoneMatrices[i].GetInverse(m_InvBoneMatrices[i]);
}
// update transform of boned props
@ -226,8 +232,9 @@ void CModel::GenerateBoneMatrices()
CMatrix3D proptransform=prop.m_Point->m_Transform;;
if (prop.m_Point->m_BoneIndex!=0xff) {
proptransform.Concatenate(m_BoneMatrices[prop.m_Point->m_BoneIndex]);
}
proptransform.Concatenate(transform);
} else {
proptransform.Concatenate(transform);
}
prop.m_Model->SetTransform(proptransform);
}
}
@ -331,8 +338,9 @@ void CModel::SetTransform(const CMatrix3D& transform)
CMatrix3D proptransform=prop.m_Point->m_Transform;;
if (prop.m_Point->m_BoneIndex!=0xff) {
proptransform.Concatenate(m_BoneMatrices[prop.m_Point->m_BoneIndex]);
}
proptransform.Concatenate(transform);
} else {
proptransform.Concatenate(transform);
}
prop.m_Model->SetTransform(proptransform);
}
}