From 03d819a6c13ad5f61b986a848814fc799c801a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:08:47 -0500
Subject: [PATCH] feat: dog

---
 packages/i18n/strings/en.json                 |  1 +
 .../components/FlexibilityCanvas.tsx          |  4 +-
 .../components/FlexibilityCard.tsx            | 47 +++++++++++++++++--
 .../GunFlexibilityVisualizer/index.tsx        | 10 +++-
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index ca1d3301c..3098a0222 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -917,6 +917,7 @@
 
           "flexibility": {
             "yaw": "Yaw",
+            "pitch": "Pitch",
             "depression": "Depression",
             "elevation": "Elevation"
           }
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCanvas.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCanvas.tsx
index 984919dbf..e62bc8523 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCanvas.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCanvas.tsx
@@ -6,11 +6,11 @@ export const zoom = 60;
 export function FlexibilityCanvas() {
   return (
     <Canvas
-      // frameloop="demand"
+      frameloop="demand"
       orthographic
       camera={{
         zoom,
-        position: [10, 0, -2],
+        position: [10, 0, -1.5],
         rotation: [0, Math.PI / 2, 0],
       }}
     >
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCard.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCard.tsx
index 843ba4375..39ba56a28 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCard.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/FlexibilityCard.tsx
@@ -1,7 +1,7 @@
 import { literals } from '@blitzkit/i18n';
 import { Box } from '@radix-ui/themes';
 import { useRef, useState } from 'react';
-import { radToDeg } from 'three/src/math/MathUtils.js';
+import { clamp, degToRad, radToDeg } from 'three/src/math/MathUtils.js';
 import { awaitableModelDefinitions } from '../../../../../../../../core/awaitables/modelDefinitions';
 import {
   DEFAULT_PITCH_TRANSITION,
@@ -20,7 +20,11 @@ const ANGLE_COEFFICIENT = 1 / 10;
 const modelDefinition = await awaitableModelDefinitions;
 
 function mag(x: number) {
-  return ((2 / Math.PI) * Math.atan(ANGLE_COEFFICIENT * x) + 1) / 2;
+  return (1 / Math.PI) * Math.atan(ANGLE_COEFFICIENT * x) + 1 / 2;
+}
+
+function magInverse(y: number): number {
+  return (1 / ANGLE_COEFFICIENT) * Math.tan(Math.PI * y - Math.PI / 2);
 }
 
 function c(thetaDeg: number, m = 1) {
@@ -32,6 +36,7 @@ export function FlexibilityCard() {
   const { strings } = useLocale();
 
   const [yaw, setYaw] = useState(0);
+  const [pitch, setPitch] = useState(0);
   const [minPitch, setMinPitch] = useState(0);
   const [maxPitch, setMaxPitch] = useState(0);
 
@@ -146,6 +151,10 @@ export function FlexibilityCard() {
 
   d += `Z`;
 
+  const r = mag(radToDeg(-pitch));
+  const dotX = r * Math.sin(yaw);
+  const dotY = r * Math.cos(yaw);
+
   return (
     <VisualizerCard
       ref={container}
@@ -191,8 +200,12 @@ export function FlexibilityCard() {
         );
 
         yaw = min[1];
-        const pitch = min[0];
+        let t = 2 * Math.sqrt((u / rect.width) ** 2 + (v / rect.height) ** 2);
+        t = clamp(t, 0, 1);
+        let pitch = degToRad(magInverse(-t));
+        pitch = clamp(pitch, min[0], max[0]);
 
+        setPitch(pitch);
         setYaw(yaw);
         setMinPitch(min[0]);
         setMaxPitch(max[0]);
@@ -248,7 +261,12 @@ export function FlexibilityCard() {
           strokeWidth="1px"
           strokeDasharray="0.5rem 0.5rem"
           vectorEffect="non-scaling-stroke"
-          d="M 0.5 0 A 0.5 0.5 0 1 1 -0.5 0 A 0.5 0.5 0 1 1 0.5 0 Z"
+          d={`
+            M 0.5 0
+            A 0.5 0.5 0 1 1 -0.5 0
+            A 0.5 0.5 0 1 1 0.5 0
+            Z
+          `}
         />
       </svg>
 
@@ -274,6 +292,19 @@ export function FlexibilityCard() {
         />
       </Box>
 
+      <Box
+        position="absolute"
+        left={`${50 * (dotX + 1)}%`}
+        bottom={`${50 * (dotY + 1)}%`}
+        width="0.25rem"
+        height="0.25rem"
+        style={{
+          borderRadius: '50%',
+          backgroundColor: Var('gray-12'),
+          transform: 'translate(-50%, 50%)',
+        }}
+      />
+
       <VisualizerCornerStat
         label={
           strings.website.tools.tankopedia.visualizers.flexibility.elevation
@@ -294,10 +325,16 @@ export function FlexibilityCard() {
         side="top-right"
       />
 
+      <VisualizerCornerStat
+        label={strings.website.tools.tankopedia.visualizers.flexibility.pitch}
+        value={literals(strings.common.units.deg, [radToDeg(pitch).toFixed(0)])}
+        side="bottom-left"
+      />
+
       <VisualizerCornerStat
         label={strings.website.tools.tankopedia.visualizers.flexibility.yaw}
         value={literals(strings.common.units.deg, [radToDeg(yaw).toFixed(0)])}
-        side="bottom-left"
+        side="bottom-right"
       />
     </VisualizerCard>
   );
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx
index b5fd2a3ee..1aeb9d51a 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx
@@ -1,4 +1,5 @@
 import { Box, Card, Flex } from '@radix-ui/themes';
+import { Var } from '../../../../../../../core/radix/var';
 import type { MaybeSkeletonComponentProps } from '../../../../../../../types/maybeSkeletonComponentProps';
 import { FlexibilityCanvas } from './components/FlexibilityCanvas';
 import { FlexibilityCard } from './components/FlexibilityCard';
@@ -10,7 +11,14 @@ export function GunFlexibilityVisualizer({
     <Flex direction="column-reverse" gap="0">
       <Box mt="-4" px="2">
         <Card variant="classic" style={{ height: '10rem' }}>
-          <Box position="absolute" width="100%" height="100%" top="0" left="0">
+          <Box
+            style={{ backgroundColor: Var('gray-1') }}
+            position="absolute"
+            width="100%"
+            height="100%"
+            top="0"
+            left="0"
+          >
             {!skeleton && <FlexibilityCanvas />}
           </Box>
         </Card>