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

CRelAngle fix

Browse Source
This commit is contained in:
Jack Andersen
2018-12-16 17:52:51 -10:00
parent 62d68a98da
commit b7f35e0528
14 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/MP1/CSamusDoll.cpp
View File

@@ -223,6 +223,7 @@ void CSamusDoll::Update(float dt, CRandom16& rand) {
if (x250_phazonIndirectTexture) {
x260_phazonOffsetAngle += 0.03f;
x260_phazonOffsetAngle.makeRel();
g_Renderer->AllocatePhazonSuitMaskTexture();
}
@@ -596,23 +597,23 @@ void CSamusDoll::SetRotation(float xDelta, float zDelta, float dt) {
zeus::CEulerAngles angles(xb0_userRot);
zeus::CRelAngle angX(angles.x());
angX.makeRel();
zeus::CRelAngle angZ(angles.z());
angZ.makeRel();
angX += xDelta;
angX.makeRel();
angZ += zDelta;
angZ.makeRel();
float angXCenter = angX;
if (angXCenter > M_PIF)
angXCenter -= 2.f * M_PIF;
angXCenter = zeus::clamp(-1.555f, angXCenter, 1.555f);
float angZCenter = angZ;
if (angZCenter > M_PIF)
angZCenter -= 2.f * M_PIF;
zeus::CQuaternion quat;
quat.rotateZ(angZCenter);
quat.rotateX(angXCenter);
quat.rotateZ(angZ);
quat.rotateX(zeus::CRelAngle(angXCenter).asRel());
xb0_userRot = quat;
}