AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Initial working RigInverter

This commit is contained in:
Jack Andersen 2016-04-08 13:11:26 -10:00
parent 84541e1ed7
commit 0ff9794f94
6 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
DataSpec/DNACommon/RigInverter.cpp
View File

@ -87,16 +87,18 @@ RigInverter<CINFType>::RigInverter(const CINFType& cinf,
for (const typename CINFType::Bone& b : cinf.bones) for (const typename CINFType::Bone& b : cinf.bones)
{ {
m_bones.emplace_back(cinf, b); m_bones.emplace_back(cinf, b);
const std::string* name = cinf.getBoneNameFromId(b.id); const std::string* name = cinf.getBoneNameFromId(b.id);
if (name) if (name)
{ {
auto search = matrices.find(*name); auto search = matrices.find(*name);
if (search != matrices.cend()) if (search != matrices.cend())
{ {
m_bones.back().m_inverter = zeus::CMatrix3f(search->second[0], zeus::CMatrix3f boneMtx(search->second[0],
search->second[1], search->second[1],
search->second[2]); search->second[2]);
m_bones.back().m_restorer = m_bones.back().m_inverter.transposed(); m_bones.back().m_inverter = boneMtx.transposed();
m_bones.back().m_restorer = boneMtx;
} }
} }
} }
@ -104,7 +106,32 @@ RigInverter<CINFType>::RigInverter(const CINFType& cinf,
template <class CINFType> template <class CINFType>
zeus::CQuaternion zeus::CQuaternion
RigInverter<CINFType>::transformRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const RigInverter<CINFType>::invertRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const
{
for (const Bone& b : m_bones)
if (b.m_origBone.id == boneId)
return b.m_restorer * zeus::CMatrix3f(origRot) * b.m_inverter;
return origRot;
}
template <class CINFType>
zeus::CVector3f
RigInverter<CINFType>::invertPosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const
{
for (const Bone& b : m_bones)
if (b.m_origBone.id == boneId)
{
zeus::CVector3f localPos = origPos;
if (subDelta)
localPos -= b.m_parentDelta;
return b.m_inverter * localPos;
}
return origPos;
}
template <class CINFType>
zeus::CQuaternion
RigInverter<CINFType>::restoreRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const
{ {
for (const Bone& b : m_bones) for (const Bone& b : m_bones)
if (b.m_origBone.id == boneId) if (b.m_origBone.id == boneId)
@ -114,15 +141,15 @@ RigInverter<CINFType>::transformRotation(atUint32 boneId, const zeus::CQuaternio
template <class CINFType> template <class CINFType>
zeus::CVector3f zeus::CVector3f
RigInverter<CINFType>::transformPosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const RigInverter<CINFType>::restorePosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const
{ {
for (const Bone& b : m_bones) for (const Bone& b : m_bones)
if (b.m_origBone.id == boneId) if (b.m_origBone.id == boneId)
{ {
zeus::CVector3f localPos = origPos; zeus::CVector3f localPos = b.m_restorer * origPos;
if (subDelta) if (subDelta)
localPos -= b.m_parentDelta; localPos += b.m_parentDelta;
return zeus::CQuaternion::rotate(b.m_inverter, localPos); return localPos;
} }
return origPos; return origPos;
} }

8
DataSpec/DNACommon/RigInverter.hpp
View File

@ -36,8 +36,12 @@ public:
hecl::BlenderConnection::DataStream::Matrix3f>& matrices); hecl::BlenderConnection::DataStream::Matrix3f>& matrices);
const CINFType& getCINF() const {return m_cinf;} const CINFType& getCINF() const {return m_cinf;}
const std::vector<Bone>& getBones() const {return m_bones;} const std::vector<Bone>& getBones() const {return m_bones;}
zeus::CQuaternion transformRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const;
zeus::CVector3f transformPosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const; zeus::CQuaternion invertRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const;
zeus::CVector3f invertPosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const;
zeus::CQuaternion restoreRotation(atUint32 boneId, const zeus::CQuaternion& origRot) const;
zeus::CVector3f restorePosition(atUint32 boneId, const zeus::CVector3f& origPos, bool subDelta) const;
}; };
} }

9
DataSpec/DNAMP1/ANIM.cpp
View File

@ -34,10 +34,7 @@ void ANIM::IANIM::sendANIMToBlender(hecl::BlenderConnection::PyOutStream& os, co
"\n"; "\n";
if (bone.second) if (bone.second)
os << "#bone_trans_head = (0.0,0.0,0.0)\n" os << "transCurves = []\n"
"#if arm_obj.data.bones[bone_string].parent is not None:\n"
"# bone_trans_head = Vector(arm_obj.data.bones[bone_string].head_local) - Vector(arm_obj.data.bones[bone_string].parent.head_local)\n"
"transCurves = []\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=2, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=2, action_group=bone_string))\n"
@ -66,7 +63,7 @@ void ANIM::IANIM::sendANIMToBlender(hecl::BlenderConnection::PyOutStream& os, co
} }
for (zeus::CQuaternion& rot : fixedRotKeys) for (zeus::CQuaternion& rot : fixedRotKeys)
rot = rig.transformRotation(bone.first, rot); rot = rig.invertRotation(bone.first, rot);
for (int c=0 ; c<4 ; ++c) for (int c=0 ; c<4 ; ++c)
{ {
@ -91,7 +88,7 @@ void ANIM::IANIM::sendANIMToBlender(hecl::BlenderConnection::PyOutStream& os, co
} }
for (zeus::CVector3f& t : fixedTransKeys) for (zeus::CVector3f& t : fixedTransKeys)
t = rig.transformPosition(bone.first, t, true); t = rig.invertPosition(bone.first, t, true);
for (int c=0 ; c<3 ; ++c) for (int c=0 ; c<3 ; ++c)
{ {

5
DataSpec/DNAMP2/ANIM.cpp
View File

@ -31,10 +31,7 @@ void ANIM::IANIM::sendANIMToBlender(hecl::BlenderConnection::PyOutStream& os, co
"\n"; "\n";
if (std::get<1>(bone.second)) if (std::get<1>(bone.second))
os << "#bone_trans_head = (0.0,0.0,0.0)\n" os << "transCurves = []\n"
"#if arm_obj.data.bones[bone_string].parent is not None:\n"
"# bone_trans_head = Vector(arm_obj.data.bones[bone_string].head_local) - Vector(arm_obj.data.bones[bone_string].parent.head_local)\n"
"transCurves = []\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=2, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=2, action_group=bone_string))\n"

6
DataSpec/DNAMP3/ANIM.cpp
View File

@ -44,12 +44,6 @@ void ANIM::IANIM::sendANIMToBlender(hecl::BlenderConnection::PyOutStream& os, co
if (std::get<1>(bone.second)) if (std::get<1>(bone.second))
{ {
if (!additive)
os << "#bone_trans_head = (0.0,0.0,0.0)\n"
"#if arm_obj.data.bones[bone_string].parent is not None:\n"
"# bone_trans_head = Vector(arm_obj.data.bones[bone_string].head_local) - Vector(arm_obj.data.bones[bone_string].parent.head_local)\n";
else
os << "#bone_trans_head = (0.0,0.0,0.0)\n";
os << "transCurves = []\n" os << "transCurves = []\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=0, action_group=bone_string))\n"
"transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n" "transCurves.append(act.fcurves.new('pose.bones[\"'+bone_string+'\"].location', index=1, action_group=bone_string))\n"

2
hecl

@ -1 +1 @@
Subproject commit 76788ee293a8e25131e6fae118b9337f70b8f371 Subproject commit 50f43c48616e47408fc6e24c86c41156cc350a77