Fix multiple materials referencing same file

exogen · Jan 29, 2024 · 497eca6 · 497eca6
1 parent e628bb4
commit 497eca6
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 39 deletions.
diff --git a/config/models.mjs b/config/models.mjs
@@ -238,7 +238,28 @@ export async function getSkinConfig() {
         { label: "Green Light", name: "greenlight", hasDefault: false },
         { label: "Red Light", name: "lite_red", hasDefault: false },
       ],
-      plasmathrower: [{ label: "Weapon", name: "weapon_plasmathrower" }],
+      plasmathrower: [
+        {
+          label: "Rear & Barrel",
+          name: "weapon_plasma10",
+          file: "weapon_plasma1",
+        },
+        {
+          label: "Top & Front",
+          name: "weapon_plasma21",
+          file: "weapon_plasma2",
+        },
+        {
+          name: "weapon_plasma1",
+          file: "weapon_plasma1",
+          selectable: false,
+        },
+        {
+          name: "weapon_plasma2",
+          file: "weapon_plasma2",
+          selectable: false,
+        },
+      ],
       energy: [
         {
           label: "Weapon",

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/_next/static/chunks/pages/index-0934afea379f1152.js b/docs/_next/static/chunks/pages/index-0934afea379f1152.js
diff --git a/docs/_next/static/chunks/pages/index-0934afea379f1152.js.map b/docs/_next/static/chunks/pages/index-0934afea379f1152.js.map
diff --git a/docs/_next/static/chunks/pages/index-617009baca527a4e.js b/docs/_next/static/chunks/pages/index-617009baca527a4e.js
diff --git a/docs/_next/static/chunks/pages/index-617009baca527a4e.js.map b/docs/_next/static/chunks/pages/index-617009baca527a4e.js.map
diff --git a/...c/iPLzqA0VwaVJRi-1yd4Wl/_buildManifest.js → ...c/jutdsOroUmxbv_NU7Tfkx/_buildManifest.js b/...c/iPLzqA0VwaVJRi-1yd4Wl/_buildManifest.js → ...c/jutdsOroUmxbv_NU7Tfkx/_buildManifest.js
diff --git a/...tic/iPLzqA0VwaVJRi-1yd4Wl/_ssgManifest.js → ...tic/jutdsOroUmxbv_NU7Tfkx/_ssgManifest.js b/...tic/iPLzqA0VwaVJRi-1yd4Wl/_ssgManifest.js → ...tic/jutdsOroUmxbv_NU7Tfkx/_ssgManifest.js
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/umhlanga_sunrise_4k.exr b/docs/umhlanga_sunrise_4k.exr
diff --git a/docs/umhlanga_sunrise_4k.hdr b/docs/umhlanga_sunrise_4k.hdr
diff --git a/docs/whipple_creek_regional_park_1k_HDR.jpg b/docs/whipple_creek_regional_park_1k_HDR.jpg
diff --git a/src/ColorCanvas.tsx b/src/ColorCanvas.tsx
@@ -15,8 +15,9 @@ export default function ColorCanvas({
   materialDef: MaterialDefinition;
 }) {
   const { skinImageUrls, defaultSkinImageUrls } = useWarrior();
-  const skinImageUrl = skinImageUrls[materialDef.name];
-  const defaultSkinImageUrl = defaultSkinImageUrls[materialDef.name];
+  const skinImageUrl = skinImageUrls[materialDef.file ?? materialDef.name];
+  const defaultSkinImageUrl =
+    defaultSkinImageUrls[materialDef.file ?? materialDef.name];
   const { setColorImageUrl } = useSkin();
   const { canvasPadding } = useSettings();
   const [noAlphaImageUrl, setNoAlphaImageUrl] = useState<string | null>(null);
@@ -36,7 +37,7 @@ export default function ColorCanvas({
         width: textureSize[0],
         height: textureSize[1],
       });
-      setColorImageUrl(materialDef.name, imageUrl);
+      setColorImageUrl(materialDef.file ?? materialDef.name, imageUrl);
     },
     [textureSize, canvasPadding, setColorImageUrl, materialDef]
   );

diff --git a/src/Material.tsx b/src/Material.tsx
@@ -114,7 +114,7 @@ interface MaterialProps {
 export default function Material({ material, materialDef }: MaterialProps) {
   const { getSkinImages } = useSkin();
   const { colorImageUrl, metallicImageUrl } =
-    getSkinImages(material.name) ?? {};
+    getSkinImages(materialDef?.file ?? material.name) ?? {};
 
   useTexture({
     material,

diff --git a/src/MetallicCanvas.tsx b/src/MetallicCanvas.tsx
@@ -15,8 +15,9 @@ export default function MetallicCanvas({
   materialDef: MaterialDefinition;
 }) {
   const { skinImageUrls, defaultSkinImageUrls } = useWarrior();
-  const skinImageUrl = skinImageUrls[materialDef.name];
-  const defaultSkinImageUrl = defaultSkinImageUrls[materialDef.name];
+  const skinImageUrl = skinImageUrls[materialDef.file ?? materialDef.name];
+  const defaultSkinImageUrl =
+    defaultSkinImageUrls[materialDef.file ?? materialDef.name];
   const { setMetallicImageUrl } = useSkin();
   const { canvasPadding } = useSettings();
   const [alphaImageUrl, setAlphaImageUrl] = useState<string | null>(null);
@@ -50,7 +51,10 @@ export default function MetallicCanvas({
         runningChangeHandlers.current -= 1;
       }
       if (runningChangeHandlers.current === 0) {
-        setMetallicImageUrl(materialDef.name, outputImageUrl);
+        setMetallicImageUrl(
+          materialDef.file ?? materialDef.name,
+          outputImageUrl
+        );
       }
     },
     [

diff --git a/src/SkinProvider.tsx b/src/SkinProvider.tsx
@@ -6,31 +6,31 @@ export default function SkinProvider({ children }: { children: ReactNode }) {
 
   const setters = useMemo(
     () => ({
-      setSkinImages(materialName: string, skinImages: SkinImages) {
+      setSkinImages(materialFile: string, skinImages: SkinImages) {
         setMaterialSkins((materialSkins) => {
           return {
             ...materialSkins,
-            [materialName]: skinImages,
+            [materialFile]: skinImages,
           };
         });
       },
-      setColorImageUrl(materialName: string, colorImageUrl: string) {
+      setColorImageUrl(materialFile: string, colorImageUrl: string) {
         setMaterialSkins((materialSkins) => {
           return {
             ...materialSkins,
-            [materialName]: {
-              ...materialSkins[materialName],
+            [materialFile]: {
+              ...materialSkins[materialFile],
               colorImageUrl,
             },
           };
         });
       },
-      setMetallicImageUrl(materialName: string, metallicImageUrl: string) {
+      setMetallicImageUrl(materialFile: string, metallicImageUrl: string) {
         setMaterialSkins((materialSkins) => {
           return {
             ...materialSkins,
-            [materialName]: {
-              ...materialSkins[materialName],
+            [materialFile]: {
+              ...materialSkins[materialFile],
               metallicImageUrl,
             },
           };
@@ -43,14 +43,14 @@ export default function SkinProvider({ children }: { children: ReactNode }) {
   const context = useMemo(() => {
     return {
       materialSkins,
-      getSkinImages(materialName: string) {
-        return materialSkins[materialName];
+      getSkinImages(materialFile: string) {
+        return materialSkins[materialFile];
       },
-      getColorImageUrl(materialName: string) {
-        return materialSkins[materialName].colorImageUrl;
+      getColorImageUrl(materialFile: string) {
+        return materialSkins[materialFile].colorImageUrl;
       },
-      getMetallicImageUrl(materialName: string) {
-        return materialSkins[materialName].metallicImageUrl;
+      getMetallicImageUrl(materialFile: string) {
+        return materialSkins[materialFile].metallicImageUrl;
       },
       ...setters,
     };

diff --git a/src/WarriorProvider.tsx b/src/WarriorProvider.tsx
@@ -44,14 +44,16 @@ export function getSkinImageUrls({
             switch (selectedSkinType) {
               case "default":
                 if (materialDef.hasDefault !== false) {
-                  skinImageUrls[materialDef.name] = `${basePath}/textures/${
+                  skinImageUrls[
+                    materialDef.file ?? materialDef.name
+                  ] = `${basePath}/textures/${
                     materialDef.file ?? materialDef.name
                   }.png`;
                 }
                 break;
               case "custom":
                 skinImageUrls[
-                  materialDef.name
+                  materialDef.file ?? materialDef.name
                 ] = `${baseSkinPath}/${selectedSkin}/${
                   materialDef.file ?? materialDef.name
                 }.png`;

diff --git a/src/WarriorSelector.tsx b/src/WarriorSelector.tsx
@@ -75,7 +75,7 @@ export default function WarriorSelector() {
             <option value="chaingun">Chaingun</option>
             <option value="grenade_launcher">Grenade Launcher</option>
             <option value="sniper">Laser Rifle</option>
-            {/* <option value="plasmathrower">Plasma Cannon</option> */}
+            <option value="plasmathrower">Plasma Cannon</option>
             <option value="energy">Blaster</option>
             <option value="shocklance">Shocklance</option>
             <option value="elf">ELF Projector</option>
@@ -178,7 +178,9 @@ export default function WarriorSelector() {
                 }
               });
               setSelectedSkin(null);
-              setSkinImageUrls({ [materialDef.name]: imageUrl });
+              setSkinImageUrls({
+                [materialDef.file ?? materialDef.name]: imageUrl,
+              });
             }}
             type="file"
             accept=".png, image/png"

diff --git a/src/useSkin.ts b/src/useSkin.ts
@@ -9,12 +9,12 @@ export type MaterialSkins = Record<string, SkinImages>;
 
 interface SkinContextValue {
   materialSkins: MaterialSkins;
-  getSkinImages: (materialName: string) => SkinImages;
-  setSkinImages: (materialName: string, skinImages: SkinImages) => void;
-  getColorImageUrl: (materialName: string) => string | undefined;
-  setColorImageUrl: (materialName: string, colorImageUrl: string) => void;
-  getMetallicImageUrl: (materialName: string) => string | undefined;
-  setMetallicImageUrl: (materialName: string, colorImageUrl: string) => void;
+  getSkinImages: (materialFile: string) => SkinImages;
+  setSkinImages: (materialFile: string, skinImages: SkinImages) => void;
+  getColorImageUrl: (materialFile: string) => string | undefined;
+  setColorImageUrl: (materialFile: string, colorImageUrl: string) => void;
+  getMetallicImageUrl: (materialFile: string) => string | undefined;
+  setMetallicImageUrl: (materialFile: string, colorImageUrl: string) => void;
 }
 
 const SkinContext = React.createContext<SkinContextValue | null>(null);