summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-05-10 01:34:21 +0200
committerSergeanur <s.anureev@yandex.ua>2021-05-10 01:45:04 +0200
commit3dda658e4296c0b009f0670d6a9c6d2da2878569 (patch)
tree42fd6704034e4ebb218a0b23a5fe727f58822a07 /src/entities/Physical.cpp
parentSmall Acos fix (diff)
downloadre3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar.gz
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar.bz2
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar.lz
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar.xz
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.tar.zst
re3-3dda658e4296c0b009f0670d6a9c6d2da2878569.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Physical.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index b897a6e2..03fbad03 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -462,7 +462,7 @@ CPhysical::ApplyMoveForce(float jx, float jy, float jz)
void
CPhysical::ApplyTurnForce(float jx, float jy, float jz, float px, float py, float pz)
{
- CVector com = Multiply3x3(m_matrix, m_vecCentreOfMass);
+ CVector com = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
CVector turnimpulse = CrossProduct(CVector(px, py, pz)-com, CVector(jx, jy, jz));
m_vecTurnSpeed += turnimpulse*(1.0f/m_fTurnMass);
}
@@ -477,7 +477,7 @@ CPhysical::ApplyFrictionMoveForce(float jx, float jy, float jz)
void
CPhysical::ApplyFrictionTurnForce(float jx, float jy, float jz, float px, float py, float pz)
{
- CVector com = Multiply3x3(m_matrix, m_vecCentreOfMass);
+ CVector com = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
CVector turnimpulse = CrossProduct(CVector(px, py, pz)-com, CVector(jx, jy, jz));
m_vecTurnFriction += turnimpulse*(1.0f/m_fTurnMass);
}
@@ -1023,7 +1023,7 @@ CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CV
moveSpeed += vImpulse * (1.0f/m_fMass);
// ApplyTurnForce
- CVector com = Multiply3x3(m_matrix, m_vecCentreOfMass);
+ CVector com = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
CVector turnimpulse = CrossProduct(pointpos-com, vImpulse);
turnSpeed += turnimpulse*(1.0f/m_fTurnMass);