AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 22:46:09 +00:00
Code Issues Projects Releases Wiki Activity

zeus constexpr refactor and thermal visor fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-02-23 21:15:54 -10:00
parent 1186b8097c
commit 8df0a4913c
226 changed files with 1339 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/World/CPuddleToadGamma.cpp
View File

@@ -140,7 +140,7 @@ bool CPuddleToadGamma::PlayerInVortexArea(const CStateManager& mgr) {
zeus::CVector3f playerOffset =
player.GetTranslation() + zeus::CVector3f{0.f, 0.f, player.GetMorphBall()->GetBallRadius()};
zeus::CVector3f rotatedOffset = GetTransform().rotate(zeus::CVector3f::skForward);
zeus::CVector3f rotatedOffset = GetTransform().rotate(zeus::skForward);
zeus::CVector3f vec1 = (playerOffset - (xf.origin - (1.f * rotatedOffset)));
float f31 = vec1.normalized().dot(rotatedOffset);
@@ -214,7 +214,7 @@ void CPuddleToadGamma::SuckPlayer(CStateManager& mgr, float arg) {
float d = x5a8_ * (x5b0_ / (posDiff.magnitude() * posDiff.magnitude()));
zeus::CVector3f force = d * (player.GetMass() * -posDiff);
player.ApplyForceWR(force, zeus::CAxisAngle::sIdentity);
player.ApplyForceWR(force, zeus::CAxisAngle());
}
void CPuddleToadGamma::Attack(CStateManager& mgr, EStateMsg msg, float) {