diff --git a/packages/website-ue/src/core/tankopedia/applyPitchYawLimits.ts b/packages/website-ue/src/core/tankopedia/applyPitchYawLimits.ts index 73c63f70b..aa3b6f6bf 100644 --- a/packages/website-ue/src/core/tankopedia/applyPitchYawLimits.ts +++ b/packages/website-ue/src/core/tankopedia/applyPitchYawLimits.ts @@ -71,10 +71,8 @@ export function applyPitchYawLimits( throw new Error("Pitch limits not found"); } - const spanUp = normalizeAngleDeg(rightLimitUp.angle - leftLimitUp.angle); - const spanDown = normalizeAngleDeg( - rightLimitDown.angle - leftLimitDown.angle - ); + const spanUp = rightLimitUp.angle - leftLimitUp.angle; + const spanDown = rightLimitDown.angle - leftLimitDown.angle; let limitUp: number; let limitDown: number; @@ -82,7 +80,7 @@ export function applyPitchYawLimits( if (spanUp === 0) { limitUp = leftLimitUp.limit; } else { - const delta = normalizeAngleDeg(givenYawDeg - leftLimitUp.angle); + const delta = givenYawDeg - leftLimitUp.angle; const t = delta / spanUp; limitUp = lerp(leftLimitUp.limit, rightLimitUp.limit, t); } @@ -90,12 +88,12 @@ export function applyPitchYawLimits( if (spanDown === 0) { limitDown = leftLimitDown.limit; } else { - const delta = normalizeAngleDeg(givenYawDeg - leftLimitDown.angle); + const delta = givenYawDeg - leftLimitDown.angle; const t = delta / spanDown; limitDown = lerp(leftLimitDown.limit, rightLimitDown.limit, t); } - const pitchDeg = clamp(givenPitchDeg, limitUp, -limitDown); + const pitchDeg = clamp(givenPitchDeg, -limitDown, limitUp); const pitch = degToRad(pitchDeg); return { pitch, yaw }; diff --git a/packages/website-ue/src/core/tankopedia/characteristics.ts b/packages/website-ue/src/core/tankopedia/characteristics.ts index 5866b5d8d..c3795b0fd 100644 --- a/packages/website-ue/src/core/tankopedia/characteristics.ts +++ b/packages/website-ue/src/core/tankopedia/characteristics.ts @@ -215,7 +215,7 @@ export const characteristics = { }, gun_depression({ parameters }) { - return radToDeg( + return -radToDeg( applyPitchYawLimits( -Math.PI / 2, 0,