Merge branch 'master' of github.com:gtamodding/re3

This commit is contained in:
aap 2020-04-05 14:31:04 +02:00
commit d039409a61

View File

@ -1464,8 +1464,9 @@ void CGarage::UpdateDoorsHeight()
void CGarage::BuildRotatedDoorMatrix(CEntity * pDoor, float fPosition) void CGarage::BuildRotatedDoorMatrix(CEntity * pDoor, float fPosition)
{ {
float fAngle = -fPosition * HALFPI; float fAngle = -fPosition * HALFPI;
CVector r(-Sin(fAngle) * pDoor->GetForward().x, Sin(fAngle) * pDoor->GetForward().y, Cos(fAngle) * pDoor->GetForward().z); CVector up(-Sin(fAngle) * pDoor->GetForward().y, Sin(fAngle) * pDoor->GetForward().z, Cos(fAngle));
pDoor->GetRight() = CrossProduct(r, pDoor->GetForward()); pDoor->GetRight() = CrossProduct(up, pDoor->GetForward());
pDoor->GetUp() = up;
} }
void CGarage::UpdateCrusherAngle() void CGarage::UpdateCrusherAngle()