From d785588cf9b72fa0f5762e8ed4cedc5c234f4325 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 22 Mar 2025 18:43:59 -0500
Subject: [PATCH] feat: some updates

---
 .../Armor/components/DissectorSceneComponent.tsx      | 11 ++++++++---
 .../HeroSection/components/TankSandbox/index.tsx      |  3 +--
 packages/website/src/core/blitzkit/jsxTree.tsx        |  4 ++--
 packages/website/src/stores/tankopediaEphemeral.ts    |  2 +-
 src/BlitzKit.CLI/Functions/Mangler.cs                 |  4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/website/src/components/Armor/components/DissectorSceneComponent.tsx b/packages/website/src/components/Armor/components/DissectorSceneComponent.tsx
index c55386ca2..1662de2a0 100644
--- a/packages/website/src/components/Armor/components/DissectorSceneComponent.tsx
+++ b/packages/website/src/components/Armor/components/DissectorSceneComponent.tsx
@@ -16,7 +16,8 @@ interface DissectorSceneComponentProps {
   group: string;
 }
 
-const armorColor = new Color().multiplyScalar(1 / 16);
+const armorColor = new Color().multiplyScalar(2 ** -8);
+const armorOutlineColor = armorColor.clone().multiplyScalar(2 ** 4.5);
 
 const moduleColor: Record<string, Color> = {
   Armor: armorColor,
@@ -38,10 +39,14 @@ const moduleColor: Record<string, Color> = {
   TurretRotator: new Color('blue'),
   Transmission: new Color('cyan'),
 };
-const moduleOutlineColor: Record<string, Color> = {};
+const moduleOutlineColor: Record<string, Color> = {
+  Armor: armorOutlineColor,
+  ArmorScreen: armorOutlineColor,
+};
 
 for (const key in moduleColor) {
-  moduleOutlineColor[key] = moduleColor[key].clone().multiplyScalar(4);
+  if (key in moduleOutlineColor) continue;
+  moduleOutlineColor[key] = moduleColor[key].clone().multiplyScalar(0.5);
 }
 
 export function DissectorSceneComponent({
diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
index ebfc6f23e..afecca245 100644
--- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
+++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
@@ -1,7 +1,6 @@
 import { BLITZKIT_TANK_ICON_SIZE } from '@blitzkit/core';
 import { Canvas } from '@react-three/fiber';
 import { forwardRef, Suspense, useImperativeHandle, useRef } from 'react';
-import { Plane, Vector3 } from 'three';
 import { useOnScreen } from '../../../../../hooks/useOnScreen';
 import { TankopediaEphemeral } from '../../../../../stores/tankopediaEphemeral';
 import { TankopediaPersistent } from '../../../../../stores/tankopediaPersistent';
@@ -160,7 +159,7 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
             : 'never'
         }
         gl={{
-          clippingPlanes: [new Plane(new Vector3(0, 0, 1))],
+          // clippingPlanes: [new Plane(new Vector3(0, 0, 1))],
           localClippingEnabled: true,
           preserveDrawingBuffer: true,
         }}
diff --git a/packages/website/src/core/blitzkit/jsxTree.tsx b/packages/website/src/core/blitzkit/jsxTree.tsx
index dedb35564..80fab8756 100644
--- a/packages/website/src/core/blitzkit/jsxTree.tsx
+++ b/packages/website/src/core/blitzkit/jsxTree.tsx
@@ -20,7 +20,7 @@ export function jsxTree(
       scale: node.scale,
     };
 
-    return mergers?.mesh?.(node, props) ?? <mesh {...props} />;
+    return mergers?.mesh ? mergers.mesh(node, props) : <mesh {...props} />;
   } else if (node instanceof Object3D) {
     const props = {
       key,
@@ -32,7 +32,7 @@ export function jsxTree(
       ),
     };
 
-    return mergers?.group?.(node, props) ?? <group {...props} />;
+    return mergers?.group ? mergers.group(node, props) : <group {...props} />;
   }
 
   return null;
diff --git a/packages/website/src/stores/tankopediaEphemeral.ts b/packages/website/src/stores/tankopediaEphemeral.ts
index 2e9af2b75..671301f0e 100644
--- a/packages/website/src/stores/tankopediaEphemeral.ts
+++ b/packages/website/src/stores/tankopediaEphemeral.ts
@@ -137,7 +137,7 @@ export const TankopediaEphemeral = createContextualStore(
         armor,
         controlsEnabled: true,
         xpMultiplier: 1,
-        display: TankopediaDisplay.Dissector,
+        display: TankopediaDisplay.StaticArmor,
       })),
     );
   },
diff --git a/src/BlitzKit.CLI/Functions/Mangler.cs b/src/BlitzKit.CLI/Functions/Mangler.cs
index e873ffd59..c8dc829ec 100644
--- a/src/BlitzKit.CLI/Functions/Mangler.cs
+++ b/src/BlitzKit.CLI/Functions/Mangler.cs
@@ -227,8 +227,8 @@ namespace BlitzKit.CLI.Functions
       slug = TrailingDashRegex().Replace(slug, "");
 
       await MangleCollision(id, pda);
-      // await MangleIcon(pda);
-      // await MangleArmor(pda);
+      await MangleIcon(pda);
+      await MangleArmor(pda);
 
       Tank tank = new()
       {