archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 08:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

SetPosition, final part

Browse Source
This commit is contained in:
Sergeanur
2020-05-05 04:45:18 +03:00
parent 131e8af174
commit 84c9484e55
20 changed files with 129 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicles/Automobile.cpp
View File

@ -3186,10 +3186,10 @@ CAutomobile::PlaceOnRoadProperly(void)
float c = Cos(angle);
float s = Sin(angle);
GetRight() = CVector((front.y - rear.y)/len, -(front.x - rear.x)/len, 0.0f);
GetForward() = CVector(-c*GetRight().y, c*GetRight().x, s);
GetUp() = CrossProduct(GetRight(), GetForward());
GetPosition() = CVector((front.x + rear.x)/2.0f, (front.y + rear.y)/2.0f, (frontZ + rearZ)/2.0f + GetHeightAboveRoad());
GetMatrix().GetRight() = CVector((front.y - rear.y) / len, -(front.x - rear.x) / len, 0.0f);
GetMatrix().GetForward() = CVector(-c * GetRight().y, c * GetRight().x, s);
GetMatrix().GetUp() = CrossProduct(GetRight(), GetForward());
GetMatrix().GetPosition() = CVector((front.x + rear.x) / 2.0f, (front.y + rear.y) / 2.0f, (frontZ + rearZ) / 2.0f + GetHeightAboveRoad());
}
void
@ -4408,7 +4408,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
if(GetUp().z > 0.0f){
// simulate fast upward movement if going fast
float speed = CVector2D(m_vecMoveSpeed).MagnitudeSqr();
obj->GetPosition() += GetUp()*speed;
obj->GetMatrix().Translate(GetUp()*speed);
}
}
obj->ApplyMoveForce(dist);

20
src/vehicles/Plane.cpp
View File

@ -359,8 +359,8 @@ CPlane::ProcessControl(void)
CVector posFront2 = (1.0f - f)*pPathNodes[curPathNodeFront2].p + f*pPathNodes[nextPathNodeFront2].p;
// Now set matrix
GetPosition() = (posRear + posFront)/2.0f;
GetPosition().z += 4.3f;
GetMatrix().GetPosition() = (posRear + posFront) / 2.0f;
GetMatrix().GetPosition().z += 4.3f;
CVector fwd = posFront - posRear;
fwd.Normalise();
if(pitch != 0.0f){
@ -375,9 +375,9 @@ CPlane::ProcessControl(void)
right.z += 3.0f*roll.z;
right.Normalise();
CVector up = CrossProduct(right, fwd);
GetRight() = right;
GetUp() = up;
GetForward() = fwd;
GetMatrix().GetRight() = right;
GetMatrix().GetUp() = up;
GetMatrix().GetForward() = fwd;
// Set speed
m_vecMoveSpeed = fwd*PlanePathSpeed[m_nPlaneId]/60.0f;
@ -511,8 +511,8 @@ CPlane::ProcessControl(void)
CVector posFront2 = (1.0f - f)*pathNodes[curPathNodeFront2].p + f*pathNodes[nextPathNodeFront2].p;
// Now set matrix
GetPosition() = (posRear + posFront)/2.0f;
GetPosition().z += 1.0f;
GetMatrix().GetPosition() = (posRear + posFront) / 2.0f;
GetMatrix().GetPosition().z += 1.0f;
CVector fwd = posFront - posRear;
fwd.Normalise();
CVector fwd2 = posFront2 - posRear;
@ -522,9 +522,9 @@ CPlane::ProcessControl(void)
right.z += 3.0f*roll.z;
right.Normalise();
CVector up = CrossProduct(right, fwd);
GetRight() = right;
GetUp() = up;
GetForward() = fwd;
GetMatrix().GetRight() = right;
GetMatrix().GetUp() = up;
GetMatrix().GetForward() = fwd;
// Set speed
m_vecMoveSpeed = fwd*planePathSpeed/60.0f;