mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-10-31 23:15:54 +00:00
Fixing ColPoints again
This commit is contained in:
parent
5b49c972a0
commit
dd602eb4a4
|
@ -256,8 +256,8 @@ CMatrix &Invert(const CMatrix &src, CMatrix &dst);
|
||||||
CVector operator*(const CMatrix &mat, const CVector &vec);
|
CVector operator*(const CMatrix &mat, const CVector &vec);
|
||||||
CMatrix operator*(const CMatrix &m1, const CMatrix &m2);
|
CMatrix operator*(const CMatrix &m1, const CMatrix &m2);
|
||||||
CVector MultiplyInverse(const CMatrix &mat, const CVector &vec);
|
CVector MultiplyInverse(const CMatrix &mat, const CVector &vec);
|
||||||
CVector Multiply3x3(const CMatrix &mat, const CVector &vec);
|
const CVector Multiply3x3(const CMatrix &mat, const CVector &vec);
|
||||||
CVector Multiply3x3(const CVector &vec, const CMatrix &mat);
|
const CVector Multiply3x3(const CVector &vec, const CMatrix &mat);
|
||||||
|
|
||||||
inline CMatrix
|
inline CMatrix
|
||||||
Invert(const CMatrix &matrix)
|
Invert(const CMatrix &matrix)
|
||||||
|
|
|
@ -136,7 +136,7 @@ MultiplyInverse(const CMatrix &mat, const CVector &vec)
|
||||||
mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z);
|
mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
CVector
|
const CVector
|
||||||
Multiply3x3(const CMatrix &mat, const CVector &vec)
|
Multiply3x3(const CMatrix &mat, const CVector &vec)
|
||||||
{
|
{
|
||||||
return CVector(
|
return CVector(
|
||||||
|
@ -145,7 +145,7 @@ Multiply3x3(const CMatrix &mat, const CVector &vec)
|
||||||
mat.m_matrix.right.z * vec.x + mat.m_matrix.up.z * vec.y + mat.m_matrix.at.z * vec.z);
|
mat.m_matrix.right.z * vec.x + mat.m_matrix.up.z * vec.y + mat.m_matrix.at.z * vec.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
CVector
|
const CVector
|
||||||
Multiply3x3(const CVector &vec, const CMatrix &mat)
|
Multiply3x3(const CVector &vec, const CMatrix &mat)
|
||||||
{
|
{
|
||||||
return CVector(
|
return CVector(
|
||||||
|
|
|
@ -1934,7 +1934,7 @@ CAutomobile::Render(void)
|
||||||
CVector rearWheelFwd = GetForward();
|
CVector rearWheelFwd = GetForward();
|
||||||
for(i = 0; i < 4; i++){
|
for(i = 0; i < 4; i++){
|
||||||
if (m_aWheelTimer[i] > 0.0f) {
|
if (m_aWheelTimer[i] > 0.0f) {
|
||||||
contactPoints[i] = m_aWheelColPoints[0].point - GetPosition();
|
contactPoints[i] = m_aWheelColPoints[i].point - GetPosition();
|
||||||
contactSpeeds[i] = GetSpeed(contactPoints[i]);
|
contactSpeeds[i] = GetSpeed(contactPoints[i]);
|
||||||
if (i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_FRONT_RIGHT)
|
if (i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_FRONT_RIGHT)
|
||||||
m_aWheelSpeed[i] = ProcessWheelRotation(m_aWheelState[i], frontWheelFwd, contactSpeeds[i], 0.5f*mi->m_wheelScale);
|
m_aWheelSpeed[i] = ProcessWheelRotation(m_aWheelState[i], frontWheelFwd, contactSpeeds[i], 0.5f*mi->m_wheelScale);
|
||||||
|
|
Loading…
Reference in a new issue