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

Merge pull request #165 from lioncash/elastic 

CGroundMovement: Set optsCopy's wall elastic constant to 0.03f
This commit is contained in:
Luke S 2020-02-26 13:17:18 -05:00 committed by GitHub
parent e192a44ed7 6afcf634b0
commit 5fa244a058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Character/CGroundMovement.cpp
View File

@ -384,10 +384,13 @@ void CGroundMovement::MoveGroundCollider_New(CStateManager& mgr, CPhysicsActor&
/* NoStepLogic must be the only set material bit to bypass step logic */ /* NoStepLogic must be the only set material bit to bypass step logic */
if (material2.XOR({EMaterialTypes::NoStepLogic})) { if (material2.XOR({EMaterialTypes::NoStepLogic})) {
SMovementOptions optsCopy = opts; SMovementOptions optsCopy = opts;
zeus::CVector3f postToPre = physStatePre.GetTranslation() - physStatePost.GetTranslation();
float postToPreMag = postToPre.magSquared();
optsCopy.x19_alwaysClip = noJump; optsCopy.x19_alwaysClip = noJump;
float quarterStepUp = 0.25f * stepUp; optsCopy.x30_wallElasticConstant = 0.03f;
const zeus::CVector3f postToPre = physStatePre.GetTranslation() - physStatePost.GetTranslation();
const float postToPreMag = postToPre.magSquared();
const float quarterStepUp = 0.25f * stepUp;
rstl::reserved_vector<CPhysicsState, 2> physStateList; rstl::reserved_vector<CPhysicsState, 2> physStateList;
rstl::reserved_vector<float, 2> stepDeltaList; rstl::reserved_vector<float, 2> stepDeltaList;
rstl::reserved_vector<CCollisionInfo, 2> collisionInfoList; rstl::reserved_vector<CCollisionInfo, 2> collisionInfoList;