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

Header merge & CScriptPickup progress

Browse Source 
Former-commit-id: 45c5450376
This commit is contained in:
Luke Street
2022-10-05 19:06:15 -04:00
parent b95f4a88b2
commit a578b055a2
55 changed files with 542 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MetroidPrime/CPhysicsActor.cpp
View File

@@ -91,7 +91,7 @@ CPhysicsState CPhysicsActor::GetPhysicsState() const {
void CPhysicsActor::SetPhysicsState(const CPhysicsState& state) {
SetTranslation(state.GetTranslation());
CQuaternion quat = state.GetOrientationWR();
const CQuaternion& quat = state.GetOrientationWR();
SetTransform(quat.BuildTransform4f(GetTranslation()));
xfc_constantForce = state.GetConstantForceWR();
x108_angularMomentum = state.GetAngularMomentumWR();
@@ -187,8 +187,6 @@ void CPhysicsActor::UseCollisionImpulses() {
}
void CPhysicsActor::MoveToWR(const CVector3f& trans, float d) {
float f = (1.f / d);
CVector3f diff = trans - GetTranslation();
xfc_constantForce = f * GetMass() * diff;
xfc_constantForce = (trans - GetTransform().GetTranslation()) * GetMass() * (1.f / d);
ComputeDerivedQuantities();
}