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

Merge pull request #56 from lioncash/tentacle 

MP1/CFlaahgraTentacle: Amend sphere collision list appending
This commit is contained in:
Phillip Stephens 2019-09-06 23:21:01 -07:00 committed by GitHub
parent c2777b42f8 d25f4fa9a3
commit eae1f1ab82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/MP1/World/CFlaahgraTentacle.cpp
View File

@ -84,15 +84,17 @@ void CFlaahgraTentacle::Think(float dt, CStateManager& mgr) {
void CFlaahgraTentacle::AddSphereCollisionList(const SSphereJointInfo* sphereJoints, s32 jointCount, void CFlaahgraTentacle::AddSphereCollisionList(const SSphereJointInfo* sphereJoints, s32 jointCount,
std::vector<CJointCollisionDescription>& outJoints) { std::vector<CJointCollisionDescription>& outJoints) {
const CAnimData* animData = GetModelData()->GetAnimationData(); const CAnimData* animData = GetModelData()->GetAnimationData();
for (u32 i = 0; i < jointCount; ++i) { for (s32 i = 0; i < jointCount; ++i) {
CSegId segId = animData->GetLocatorSegId(sphereJoints[i].name); const SSphereJointInfo& sphereJoint = sphereJoints[i];
if (segId == 0xFF) const CSegId segId = animData->GetLocatorSegId(sphereJoint.name);
if (segId == 0xFF) {
continue; continue;
outJoints.push_back( }
CJointCollisionDescription::SphereCollision(segId, sphereJoints->radius, sphereJoints->name, 10.f));
outJoints.push_back(CJointCollisionDescription::SphereCollision(segId, sphereJoint.radius, sphereJoint.name, 10.f));
} }
} }