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

Merge branch 'master' into garages_dev

Browse Source
This commit is contained in:
Nikolay Korolev
2020-04-05 12:47:27 +03:00
parent 057b28e39b 5cbcaa57d7
commit 9436b5a8a5
13 changed files with 808 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/control/Garages.cpp
View File

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