PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-18 06:45:23 +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

11
src/MetroidPrime/CPhysicsActor.cpp
View File

@@ -1,5 +1,7 @@
#include "MetroidPrime/CPhysicsActor.hpp"
const float CPhysicsActor::skGravityConstant = 9.81f * 2.5f;
CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, const rstl::string& name,
const CEntityInfo& info, const CTransform4f& xf,
const CModelData& mData, const CMaterialList& matList,
@@ -80,15 +82,14 @@ void CPhysicsActor::ComputeDerivedQuantities() {
}
CPhysicsState CPhysicsActor::GetPhysicsState() const {
CQuaternion quat(CQuaternion::FromMatrix(x34_transform));
return CPhysicsState(GetTranslation(), quat, xfc_constantForce, x108_angularMomentum,
x150_momentum, x15c_force, x168_impulse, x174_torque, x180_angularImpulse);
return CPhysicsState(GetTranslation(), GetRotation(), GetConstantForceWR(),
GetAngularMomentumWR(), GetMomentumWR(), GetForceWR(), GetImpulseWR(),
GetTorqueWR(), GetAngularImpulseWR());
}
void CPhysicsActor::SetPhysicsState(const CPhysicsState& state) {
SetTranslation(state.GetTranslation());
CQuaternion quat(state.GetOrientationWR());
CQuaternion quat = state.GetOrientationWR();
SetTransform(quat.BuildTransform4f(GetTranslation()));
xfc_constantForce = state.GetConstantForceWR();
x108_angularMomentum = state.GetAngularMomentumWR();