From bf6991ce0605dcb322bc8a28fea60080f1891048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 29 Feb 2024 10:30:48 -0600
Subject: [PATCH] feat: proper ricochet visuals

---
 .../Armor/components/ShotDisplay.tsx          | 93 ++++++++++++-------
 .../SpacedArmorSceneComponent/index.tsx       | 14 +--
 2 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/src/components/Armor/components/ShotDisplay.tsx b/src/components/Armor/components/ShotDisplay.tsx
index 2009a7288..172279a7e 100644
--- a/src/components/Armor/components/ShotDisplay.tsx
+++ b/src/components/Armor/components/ShotDisplay.tsx
@@ -1,4 +1,4 @@
-import { Text } from '@radix-ui/themes';
+import { Card, Inset, Text } from '@radix-ui/themes';
 import { Html } from '@react-three/drei';
 import { Euler, Quaternion, Vector3 } from 'three';
 import { J_HAT } from '../../../constants/axis';
@@ -22,9 +22,13 @@ import {
 // const THICKNESS = 0.05;
 // const LENGTH = 4;
 
+const LENGTH_INFINITY = 4;
+
 export function ShotDisplay() {
   const shot = useTankopediaTemporary((state) => state.shot);
 
+  console.log(shot);
+
   return (
     <>
       {shot?.map((layer, index) => {
@@ -44,39 +48,36 @@ export function ShotDisplay() {
               position={layer.point}
               rotation={shellRotation}
             >
-              {shot.length > 1 && (
-                <Html center>
-                  <div
-                    style={{
-                      width: 12,
-                      height: 12,
-                      borderRadius: '100%',
-                      position: 'relative',
-                      backgroundColor:
-                        layer.status === 'penetration'
-                          ? '#00ff00'
-                          : layer.status === 'blocked'
-                            ? '#ff0000'
-                            : '#ffff00',
-                    }}
-                  >
-                    <Text
-                      style={{
-                        position: 'absolute',
-                        left: '100%',
-                        top: '50%',
-                        transform: 'translateY(-50%)',
-                        marginLeft: 8,
-                      }}
-                    >
-                      {layer.index + 1}
-                    </Text>
-                  </div>
-                </Html>
-              )}
+              <Html center>
+                <Card
+                  style={{
+                    backgroundColor:
+                      layer.status === 'penetration'
+                        ? '#00ff0080'
+                        : layer.status === 'blocked'
+                          ? '#ff000080'
+                          : '#ffff0080',
+                    border: 'none',
+                  }}
+                >
+                  <Inset>
+                    {shot.length > 1 && (
+                      <Text
+                        style={{
+                          width: '100%',
+                          display: 'block',
+                          textAlign: 'center',
+                        }}
+                      >
+                        {layer.index + 1}
+                      </Text>
+                    )}
+                  </Inset>
+                </Card>
+              </Html>
 
               {(() => {
-                let length = 4;
+                let length = LENGTH_INFINITY;
 
                 if (layer.index !== 0) {
                   const gap = shot[index - 1] as ShotLayerGap;
@@ -91,6 +92,34 @@ export function ShotDisplay() {
                 );
               })()}
             </group>
+
+            {(() => {
+              if (layer.status !== 'ricochet' || index !== shot.length - 1)
+                return null;
+              const ricochetShellNormal = layer.shellNormal
+                .clone()
+                .reflect(layer.surfaceNormal)
+                .multiplyScalar(-1);
+              const ricochetShellRotation = new Euler().setFromQuaternion(
+                new Quaternion().setFromAxisAngle(
+                  new Vector3()
+                    .crossVectors(J_HAT, ricochetShellNormal)
+                    .normalize(),
+                  J_HAT.angleTo(ricochetShellNormal),
+                ),
+              );
+
+              return (
+                <group position={layer.point} rotation={ricochetShellRotation}>
+                  <mesh position={[0, LENGTH_INFINITY / 2, 0]}>
+                    <cylinderGeometry
+                      args={[1 / 64, 1 / 64, LENGTH_INFINITY]}
+                    />
+                    <meshBasicMaterial color={0xffffff} depthTest={false} />
+                  </mesh>
+                </group>
+              );
+            })()}
           </>
         );
       })}
diff --git a/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
index 5ac920e80..a5d036cc3 100644
--- a/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
+++ b/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
@@ -170,14 +170,6 @@ export function SpacedArmorSceneComponent({
                 });
               }
 
-              console.log(
-                JSON.stringify(
-                  intersections.map((i) => i.object.userData),
-                  null,
-                  2,
-                ),
-              );
-
               return intersections;
             }
 
@@ -190,7 +182,7 @@ export function SpacedArmorSceneComponent({
               let layerIndex = startingIndex;
               let loopIndex = 0;
 
-              if (layerIndex !== 0) {
+              if (layerIndex !== 0 && intersections.length > 0) {
                 shot.push({
                   type: null,
                   distance: (shot.at(-1) as ShotLayerBase).point.distanceTo(
@@ -260,6 +252,8 @@ export function SpacedArmorSceneComponent({
                       status: 'ricochet',
                     });
 
+                    remainingPenetration *= 0.75;
+
                     const raycaster = new Raycaster();
                     const newShellNormal = shellNormal
                       .clone()
@@ -300,6 +294,8 @@ export function SpacedArmorSceneComponent({
               }
             }
 
+            console.log('setting', shot);
+
             useTankopediaTemporary.setState({ shot });
           },
         })}