PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CUnitVector3f non-match 

Former-commit-id: 60c82b0a89
This commit is contained in:
Luke Street 2022-10-03 00:56:11 -04:00
parent cd85b46d6d
commit 682ce50113
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Kyoto/Math/CUnitVector3f.hpp
View File

@ -8,7 +8,7 @@
class CUnitVector3f : public CVector3f { class CUnitVector3f : public CVector3f {
public: public:
CUnitVector3f(f32 x, f32 y, f32 z) : CVector3f(x, y, z) { Normalize(); } CUnitVector3f(f32 x, f32 y, f32 z) : CVector3f(x, y, z) { Normalize(); }
CUnitVector3f(const CVector3f& vec) : CVector3f(vec) { Normalize(); } CUnitVector3f(const CVector3f& vec);// : CVector3f(vec) { Normalize(); }
// TODO // TODO
}; };
CHECK_SIZEOF(CUnitVector3f, 0xc) CHECK_SIZEOF(CUnitVector3f, 0xc)

2
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -642,7 +642,7 @@ void CScriptSpecialFunction::ThinkIntroBossRingController(float dt, CStateManage
case kRS_Rotate: { case kRS_Rotate: {
x1ac_ringRotateTarget = x1ac_ringRotateTarget =
CQuaternion::AxisAngle( CQuaternion::AxisAngle(
CVector3f(0.f, 0.f, 1.f), CUnitVector3f(0.f, 0.f, 1.f),
CRelAngle::FromDegrees(xfc_float1 * (x1b8_ringReverse ? 1.f : -1.f) * dt)) CRelAngle::FromDegrees(xfc_float1 * (x1b8_ringReverse ? 1.f : -1.f) * dt))
.Transform(x1ac_ringRotateTarget); .Transform(x1ac_ringRotateTarget);
bool allReachedTarget = true; bool allReachedTarget = true;