AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-07 02:45:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #184 from lioncash/reference

Browse Source 
CHierarchyPoseBuilder: Fix missing ampersand in CharLayoutInfo() return value
This commit is contained in:
Phillip Stephens 2020-03-06 16:13:05 -08:00 committed by GitHub
commit 915a0785a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CBoneTracking.cpp
View File

@ -38,7 +38,7 @@ void CBoneTracking::PreRender(const CStateManager& mgr, CAnimData& animData, con
TCastToConstPtr<CActor> targetAct = mgr.GetObjectById(x34_target); TCastToConstPtr<CActor> targetAct = mgr.GetObjectById(x34_target);
if (x36_24_active && tracking && (targetAct || x24_targetPosition)) { if (x36_24_active && tracking && (targetAct || x24_targetPosition)) {
x36_25_hasTrackedRotation = true; x36_25_hasTrackedRotation = true;
auto layoutInfo = pb.CharLayoutInfo(); const auto& layoutInfo = pb.CharLayoutInfo();
CSegId bone; CSegId bone;
if (x36_26_noParent) if (x36_26_noParent)
bone = x14_segId; bone = x14_segId;

2
Runtime/Character/CHierarchyPoseBuilder.hpp
View File

@ -38,7 +38,7 @@ class CHierarchyPoseBuilder {
public: public:
CHierarchyPoseBuilder(const CLayoutDescription& layout); CHierarchyPoseBuilder(const CLayoutDescription& layout);
const TLockedToken<CCharLayoutInfo> CharLayoutInfo() const { return x0_layoutDesc.ScaledLayout(); } const TLockedToken<CCharLayoutInfo>& CharLayoutInfo() const { return x0_layoutDesc.ScaledLayout(); }
bool HasRoot() const { return xcf0_hasRoot; } bool HasRoot() const { return xcf0_hasRoot; }
void BuildTransform(const CSegId& boneId, zeus::CTransform& xfOut) const; void BuildTransform(const CSegId& boneId, zeus::CTransform& xfOut) const;
void BuildNoScale(CPoseAsTransforms& pose); void BuildNoScale(CPoseAsTransforms& pose);

2
Runtime/Character/CIkChain.cpp
View File

@ -15,7 +15,7 @@ void CIkChain::Deactivate() { x44_24_activated = false; }
void CIkChain::Activate(const CAnimData& animData, const CSegId& segId, const zeus::CTransform& xf) { void CIkChain::Activate(const CAnimData& animData, const CSegId& segId, const zeus::CTransform& xf) {
x0_bone = segId; x0_bone = segId;
auto info = animData.GetPoseBuilder().CharLayoutInfo(); const auto& info = animData.GetPoseBuilder().CharLayoutInfo();
x1_p1 = info->GetRootNode()->GetBoneMap()[x0_bone].x0_parentId; x1_p1 = info->GetRootNode()->GetBoneMap()[x0_bone].x0_parentId;
if (x1_p1 != 2) { if (x1_p1 != 2) {
x2_p2 = info->GetRootNode()->GetBoneMap()[x1_p1].x0_parentId; x2_p2 = info->GetRootNode()->GetBoneMap()[x1_p1].x0_parentId;