PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-20 22:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get/SetPhysicsState fixes

Browse Source 
Former-commit-id: 75909783bc
This commit is contained in:
Phillip Stephens
2022-10-05 10:53:15 -07:00
parent 2d128edc26
commit aa1df3e7d7
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/MetroidPrime/CActor.hpp
View File

@@ -265,7 +265,10 @@ public:
void SetRotation(const CQuaternion& rot) {
SetTransform(rot.BuildTransform4f(GetTranslation()));
}
CVector3f GetTranslation() const { return x34_transform.GetTranslation(); }
const CQuaternion& GetRotation() const {
return CQuaternion::FromMatrix(GetTransform());
}
const CVector3f& GetTranslation() const { return x34_transform.GetTranslation(); }
void SetTranslation(const CVector3f& vec);
CTransform4f GetLocatorTransform(const rstl::string& segName) const;
CTransform4f GetScaledLocatorTransform(const rstl::string& segName) const;

13
include/MetroidPrime/CPhysicsActor.hpp
View File

@@ -52,6 +52,8 @@ CHECK_SIZEOF(CMotionState, 0x34)
class CCollisionInfoList;
class CPhysicsActor : public CActor {
static const float skGravityConstant;
public:
CPhysicsActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info,
const CTransform4f& xf, const CModelData& mData, const CMaterialList& matList,
@@ -91,6 +93,15 @@ public:
void ComputeDerivedQuantities();
void Stop();
const CVector3f& GetConstantForceWR() const { return xfc_constantForce; }
void SetConstantForceWR(const CVector3f& force) { xfc_constantForce = force; }
const CAxisAngle& GetAngularMomentumWR() const { return x108_angularMomentum; }
const CVector3f& GetMomentumWR() const { return x150_momentum; }
const CVector3f& GetForceWR() const { return x15c_force; }
const CVector3f& GetImpulseWR() const { return x168_impulse; }
const CAxisAngle& GetTorqueWR() const { return x174_torque; }
const CAxisAngle& GetAngularImpulseWR() const { return x180_angularImpulse; }
CPhysicsState GetPhysicsState() const;
void SetPhysicsState(const CPhysicsState& state);
CMotionState GetMotionState() const;
@@ -100,6 +111,8 @@ public:
bool GetMovable() const { return xf8_24_movable; }
void SetMovable(bool v) { xf8_24_movable = v; }
static float GetGravityConstant() { return skGravityConstant; }
private:
f32 xe8_mass;
f32 xec_massRecip;

2
include/MetroidPrime/CPhysicsState.hpp
View File

@@ -14,7 +14,7 @@ public:
const CAxisAngle& torque, const CAxisAngle& angularImpulse);
CVector3f GetTranslation() const { return x0_translation; }
CQuaternion GetOrientationWR() const { return xc_orientation; }
const CQuaternion& GetOrientationWR() const { return xc_orientation; }
CVector3f GetConstantForceWR() const { return x1c_constantForce; }
CAxisAngle GetAngularMomentumWR() const { return x28_angularMomentum; }
CVector3f GetMomentumWR() const { return x34_momentum; }