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

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen 2017-12-26 14:51:22 -10:00
parent 45245a1ffc 2a341847d4
commit 4b53046a51
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/DNAMP1/ANCS.cpp
View File

@ -1364,14 +1364,19 @@ bool ANCS::CookANIM(const hecl::ProjectPath& outPath,
/* Build bone ID map */ /* Build bone ID map */
std::unordered_map<std::string, atInt32> boneIdMap; std::unordered_map<std::string, atInt32> boneIdMap;
std::experimental::optional<CINF> rigCinf;
std::experimental::optional<DNAANIM::RigInverter<CINF>> rigInv; std::experimental::optional<DNAANIM::RigInverter<CINF>> rigInv;
for (const DNAANCS::Actor::Armature& arm : actor.armatures) for (const DNAANCS::Actor::Armature& arm : actor.armatures)
{ {
CINF cinf(arm, boneIdMap);
if (!rigInv) if (!rigInv)
{ {
rigCinf.emplace(arm, boneIdMap);
auto matrices = ds.getBoneMatrices(arm.name); auto matrices = ds.getBoneMatrices(arm.name);
rigInv.emplace(cinf, matrices); rigInv.emplace(*rigCinf, matrices);
}
else
{
CINF cinf(arm, boneIdMap);
} }
} }

2
amuse

@ -1 +1 @@
Subproject commit 3eba4cc1ac7cf08c23107302807e6d1adf9087db Subproject commit 4c2a26247886fd6b0baaef37d57b6c4ad78bf42b

2
hecl

@ -1 +1 @@
Subproject commit fac818d9a0b4cf41934cb9b7f780fe87cafba293 Subproject commit caf9749c101cde38bf0971d8afca5e3b62a98579