mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-22 17:35:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix sin & cos calls

Browse source
This commit is contained in:
Sergeanur 2021-05-27 16:53:50 +03:00
parent 2ad3a75be5
commit a11bf19b93
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/control/CarCtrl.cpp
View file

@ -1330,8 +1330,8 @@ void CCarCtrl::WeaveForOtherCar(CEntity* pOtherEntity, CVehicle* pVehicle, float
forward.NormaliseSafe(); forward.NormaliseSafe();
float forwardAngle = CGeneral::GetATanOfXY(forward.x, forward.y); float forwardAngle = CGeneral::GetATanOfXY(forward.x, forward.y);
float angleDiff = angleBetweenVehicles - forwardAngle; float angleDiff = angleBetweenVehicles - forwardAngle;
float lenProjection = ABS(pOtherCar->GetColModel()->boundingBox.max.y * sin(angleDiff)); float lenProjection = ABS(pOtherCar->GetColModel()->boundingBox.max.y * Sin(angleDiff));
float widthProjection = ABS(pOtherCar->GetColModel()->boundingBox.max.x * cos(angleDiff)); float widthProjection = ABS(pOtherCar->GetColModel()->boundingBox.max.x * Cos(angleDiff));
float lengthToEvade = (2 * (lenProjection + widthProjection) + WIDTH_COEF_TO_WEAVE_SAFELY * 2 * pVehicle->GetColModel()->boundingBox.max.x) / distance; float lengthToEvade = (2 * (lenProjection + widthProjection) + WIDTH_COEF_TO_WEAVE_SAFELY * 2 * pVehicle->GetColModel()->boundingBox.max.x) / distance;
float diffToLeftAngle = LimitRadianAngle(angleBetweenVehicles - *pAngleToWeaveLeft); float diffToLeftAngle = LimitRadianAngle(angleBetweenVehicles - *pAngleToWeaveLeft);
diffToLeftAngle = ABS(diffToLeftAngle); diffToLeftAngle = ABS(diffToLeftAngle);

4
src/control/Script2.cpp
View file

@ -437,8 +437,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
float length = *(float*)&ScriptParams[5]; float length = *(float*)&ScriptParams[5];
float x, y; float x, y;
if (angle != 0.0f){ if (angle != 0.0f){
y = cos(angle) * length; y = Cos(angle) * length;
x = sin(angle) * length; x = Sin(angle) * length;
}else{ }else{
y = length; y = length;
x = 0.0f; x = 0.0f;

8
src/control/Script5.cpp
View file

@ -948,10 +948,10 @@ void CRunningScript::PlayerInAngledAreaCheckCommand(int32 command, uint32* pIp)
initAngle -= TWOPI; initAngle -= TWOPI;
// it looks like the idea is to use a rectangle using the diagonal of the rectangle as // it looks like the idea is to use a rectangle using the diagonal of the rectangle as
// the side of new rectangle, with "length" being the length of second side // the side of new rectangle, with "length" being the length of second side
float rotatedSupX = supX + side2length * sin(initAngle); float rotatedSupX = supX + side2length * Sin(initAngle);
float rotatedSupY = supY - side2length * cos(initAngle); float rotatedSupY = supY - side2length * Cos(initAngle);
float rotatedInfX = infX + side2length * sin(initAngle); float rotatedInfX = infX + side2length * Sin(initAngle);
float rotatedInfY = infY - side2length * cos(initAngle); float rotatedInfY = infY - side2length * Cos(initAngle);
float side1X = supX - infX; float side1X = supX - infX;
float side1Y = supY - infY; float side1Y = supY - infY;
float side1Length = CVector2D(side1X, side1Y).Magnitude(); float side1Length = CVector2D(side1X, side1Y).Magnitude();

18
src/core/Cam.cpp
View file

@ -4933,9 +4933,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
AlphaSpeed = 0.0; AlphaSpeed = 0.0;
Distance = 1000.0; Distance = 1000.0;
Front.x = -(cos(Beta) * cos(Alpha)); Front.x = -(Cos(Beta) * Cos(Alpha));
Front.y = -(sin(Beta) * cos(Alpha)); Front.y = -(Sin(Beta) * Cos(Alpha));
Front.z = sin(Alpha); Front.z = Sin(Alpha);
m_aTargetHistoryPosOne = TargetCoors - nextDistance * Front; m_aTargetHistoryPosOne = TargetCoors - nextDistance * Front;
@ -5210,9 +5210,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
lastBeta = Beta; lastBeta = Beta;
Front.x = -(cos(Beta) * cos(Alpha)); Front.x = -(Cos(Beta) * Cos(Alpha));
Front.y = -(sin(Beta) * cos(Alpha)); Front.y = -(Sin(Beta) * Cos(Alpha));
Front.z = sin(Alpha); Front.z = Sin(Alpha);
GetVectorsReadyForRW(); GetVectorsReadyForRW();
TheCamera.m_bCamDirectlyBehind = false; TheCamera.m_bCamDirectlyBehind = false;
TheCamera.m_bCamDirectlyInFront = false; TheCamera.m_bCamDirectlyInFront = false;
@ -5222,9 +5222,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
m_cvecTargetCoorsForFudgeInter = TargetCoors; m_cvecTargetCoorsForFudgeInter = TargetCoors;
m_aTargetHistoryPosThree = m_aTargetHistoryPosOne; m_aTargetHistoryPosThree = m_aTargetHistoryPosOne;
float nextAlpha = alphaWithSpeedAccounted + zoomModeAlphaOffset; float nextAlpha = alphaWithSpeedAccounted + zoomModeAlphaOffset;
float nextFrontX = -(cos(Beta) * cos(nextAlpha)); float nextFrontX = -(Cos(Beta) * Cos(nextAlpha));
float nextFrontY = -(sin(Beta) * cos(nextAlpha)); float nextFrontY = -(Sin(Beta) * Cos(nextAlpha));
float nextFrontZ = sin(nextAlpha); float nextFrontZ = Sin(nextAlpha);
m_aTargetHistoryPosOne.x = TargetCoors.x - nextFrontX * nextDistance; m_aTargetHistoryPosOne.x = TargetCoors.x - nextFrontX * nextDistance;
m_aTargetHistoryPosOne.y = TargetCoors.y - nextFrontY * nextDistance; m_aTargetHistoryPosOne.y = TargetCoors.y - nextFrontY * nextDistance;