From 1944745902a27d74a5888176c90679d258bc6871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:48:14 -0500
Subject: [PATCH] feat: better outluiens

---
 .../tools/tankopedia/[id]/components/Prompts.tsx    |  6 +++---
 .../Armor/components/StaticArmorSceneComponent.tsx  | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Prompts.tsx b/src/app/tools/tankopedia/[id]/components/Prompts.tsx
index 118a83594..60226948d 100644
--- a/src/app/tools/tankopedia/[id]/components/Prompts.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Prompts.tsx
@@ -59,9 +59,9 @@ export function Prompts() {
 
                   const input = event.currentTarget.valueAsNumber;
 
-                  if (!isNaN(input)) {
-                    armor.thickness[index] = input;
-                  }
+                  if (isNaN(input) || input < 0) return;
+
+                  armor.thickness[index] = input;
                 });
               } else if (event.key === 'Escape') {
                 input.current?.blur();
diff --git a/src/components/Armor/components/StaticArmorSceneComponent.tsx b/src/components/Armor/components/StaticArmorSceneComponent.tsx
index c9ab21fb7..2615b73d8 100644
--- a/src/components/Armor/components/StaticArmorSceneComponent.tsx
+++ b/src/components/Armor/components/StaticArmorSceneComponent.tsx
@@ -14,7 +14,6 @@ import {
   Quaternion,
 } from 'three';
 import { jsxTree } from '../../../core/blitzkit/jsxTree';
-import * as Duel from '../../../stores/duel';
 import * as TankopediaEphemeral from '../../../stores/tankopediaEphemeral';
 import { ThicknessRange } from '../../StaticArmor';
 import { ArmorType } from './SpacedArmorScene';
@@ -52,10 +51,10 @@ export function StaticArmorSceneComponent({
 }: StaticArmorSceneComponentProps) {
   const mutateTankopediaEphemeralStore = TankopediaEphemeral.useMutation();
   const tankopediaEphemeralStore = TankopediaEphemeral.useStore();
-  const duelStore = Duel.useStore();
   const camera = useThree((state) => state.camera);
 
   const x = thickness / thicknessRange.value;
+  const xClamped = clamp(x, 0, 1);
   let color: Color;
   let opacity: number;
   let depthWrite = true;
@@ -63,7 +62,7 @@ export function StaticArmorSceneComponent({
   switch (props.type) {
     case ArmorType.Primary:
       if (x > 1) {
-        color = new Color(Math.max(2 - x, 0.5), 0, 0);
+        color = new Color(clamp(2 - x, 0.5, 1), 0, 0);
       } else {
         color = new Color(-((1 - x) ** 2) + 1, -(x ** 2) + 1, 0);
       }
@@ -72,9 +71,9 @@ export function StaticArmorSceneComponent({
 
     case ArmorType.Spaced:
       color = new Color(
-        clamp(1 - (7 / 8) * x, 0, 1),
+        clamp(1 - (7 / 8) * xClamped, 0, 1),
         0,
-        clamp(1 - (1 / 8) * x, 0, 1),
+        clamp(1 - (1 / 8) * xClamped, 0, 1),
       );
       opacity = clamp(x + 1 / 2, 0, 1);
       break;
@@ -102,7 +101,9 @@ export function StaticArmorSceneComponent({
   const outlineMaterial = useMemo(
     () =>
       new LineBasicMaterial({
-        color: color.clone().multiplyScalar(2 ** 2),
+        color: color
+          .clone()
+          .multiplyScalar(props.type === ArmorType.Spaced ? 2 ** 2 : 2 ** -2),
       }),
     [thickness],
   );