diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 13:40:56 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 13:40:56 +0200 |
commit | ee261c996b6864ad65f086d97cdb47469c10a651 (patch) | |
tree | f594437503cd2ef4116e9b8c8b6560b970c77541 /src/vehicles/Automobile.cpp | |
parent | CAutoPilot + CCarAI + fixes (diff) | |
parent | SetPosition, final part (diff) | |
download | re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar.gz re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar.bz2 re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar.lz re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar.xz re3-ee261c996b6864ad65f086d97cdb47469c10a651.tar.zst re3-ee261c996b6864ad65f086d97cdb47469c10a651.zip |
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r-- | src/vehicles/Automobile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 58971786..9db60da0 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -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); |