From fe0fdc0964e4f923fb985510eea5d4fd6c99f5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:31:45 -0600
Subject: [PATCH] feat: opaque he

---
 .../tankopedia/[id]/components/VersusBar.tsx  |  2 +-
 .../ArmorMesh/shaders/fragmentOpaque.glsl     | 26 ++++++++++++++-----
 src/components/ModuleButton.tsx               |  8 ++----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/VersusBar.tsx b/src/app/tools/tankopedia/[id]/components/VersusBar.tsx
index 62ee62f49..55b509725 100644
--- a/src/app/tools/tankopedia/[id]/components/VersusBar.tsx
+++ b/src/app/tools/tankopedia/[id]/components/VersusBar.tsx
@@ -261,7 +261,7 @@ export function VersusBar() {
               <ModuleButton
                 selected={antagonist.shell.id === shell.id}
                 type="shell"
-                shell={shell.type}
+                shell={shell.icon}
                 rowChild
                 first={index === 0}
                 key={shell.id}
diff --git a/src/components/ArmorMesh/shaders/fragmentOpaque.glsl b/src/components/ArmorMesh/shaders/fragmentOpaque.glsl
index de4431da4..894a4386d 100644
--- a/src/components/ArmorMesh/shaders/fragmentOpaque.glsl
+++ b/src/components/ArmorMesh/shaders/fragmentOpaque.glsl
@@ -7,6 +7,7 @@ uniform float ricochet;
 uniform float caliber;
 uniform float normalization;
 uniform bool canRichochet;
+uniform bool canSplash;
 
 void main() {
   vec3 normalizedNormal = normalize(vNormal);
@@ -39,12 +40,23 @@ void main() {
     }
   }
 
-  float h = penetrationChance / PI;
-  float s = 1.0;
-  float v = 1.0;
-  vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-  vec3 p = abs(fract(h + K.xyz) * 6.0 - K.www);
-  vec3 rgb = v * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), s);
+  if (canSplash) {
+    float h = mix(20.0 / 360.0, 1.0 / PI, penetrationChance);
+    float s = 1.0;
+    float v = 1.0;
+    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+    vec3 p = abs(fract(h + K.xyz) * 6.0 - K.www);
+    vec3 rgb = v * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), s);
 
-  csm_DiffuseColor = vec4(rgb, 1.0);
+    csm_DiffuseColor = vec4(rgb, 1.0);
+  } else {
+    float h = mix(0.0, 1.0 / PI, penetrationChance);
+    float s = 1.0;
+    float v = 1.0;
+    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+    vec3 p = abs(fract(h + K.xyz) * 6.0 - K.www);
+    vec3 rgb = v * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), s);
+
+    csm_DiffuseColor = vec4(rgb, 1.0);
+  }
 }
\ No newline at end of file
diff --git a/src/components/ModuleButton.tsx b/src/components/ModuleButton.tsx
index 125f4a593..0014953c8 100644
--- a/src/components/ModuleButton.tsx
+++ b/src/components/ModuleButton.tsx
@@ -1,11 +1,7 @@
 import { Button, Text } from '@radix-ui/themes';
 import { ComponentProps } from 'react';
 import { asset } from '../core/blitzkrieg/asset';
-import {
-  ShellType,
-  TIER_ROMAN_NUMERALS,
-  Tier,
-} from '../core/blitzkrieg/tankDefinitions';
+import { TIER_ROMAN_NUMERALS, Tier } from '../core/blitzkrieg/tankDefinitions';
 
 type ModuleButtonProps = Omit<ComponentProps<typeof Button>, 'type'> & {
   selected?: boolean;
@@ -20,7 +16,7 @@ type ModuleButtonProps = Omit<ComponentProps<typeof Button>, 'type'> & {
       }
     | {
         type: 'shell';
-        shell: ShellType;
+        shell: string;
       }
   );