feat (outfit) add custom skin outfit skin tone support

MikalDev · Nov 18, 2021 · 63132cb · 63132cb
1 parent be1c779
commit 63132cb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/dist/Spine-v1.55.0.c3addon b/dist/Spine-v1.55.0.c3addon
diff --git a/src/addon.json b/src/addon.json
@@ -3,7 +3,7 @@
   "type": "plugin",
   "name": "Spine",
   "id": "Gritsenko_Spine",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "author": "Mikal and Igor Gritsenko",
   "website": "https://gritsenko.github.io/c3_spine_plugin",
   "documentation": "https://gritsenko.github.io/c3_spine_plugin",

diff --git a/src/c3runtime/instance.js b/src/c3runtime/instance.js
@@ -983,9 +983,8 @@
             this.SetRenderOnce(1.0, true, this.uid);
         }
 
-        _addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor)
+        _addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor, dependentSlotsSkinColor)
         {
-            console.log('[Spine], dependentSlotsColor', dependentSlotsColor)
             const spine = globalThis.spine;
             if (!this.skeletonInfo || !this.skeletonInfo.skeleton)
             {
@@ -1044,6 +1043,17 @@
                             spine.Color.rgba8888ToColor(slotRef.darkColor, addOutfit[slotName].tintDarkColor);
                         }          
                     }
+                    // Dependent slots skin color
+                    if (dependentSlotsSkinColor[slotName])
+                    {
+                        for(const dependentSlot of dependentSlotsSkinColor[slotName])
+                        {
+                            if (addOutfit[dependentSlot] && addOutfit[dependentSlot].skinName !== '0') continue;
+                            const slotRef = skeleton.findSlot(dependentSlot)
+                            spine.Color.rgba8888ToColor(slotRef.color, addOutfit[slotName].tintColor);
+                            spine.Color.rgba8888ToColor(slotRef.darkColor, addOutfit[slotName].tintDarkColor);
+                        }          
+                    }                    
                 } else
                 {
                     if (this.debug) console.warn('[Spine] AddCustomSkin, add skin does not exist',skinName,addSkinName, this.uid, this.runtime.GetTickCount());
@@ -1063,7 +1073,6 @@
         _hexToC3RGBAColorValue(s) {
             if (s.length == 7) s = s + 'ff'
             const result = this._swap32(parseInt(s.substr(1), 16))
-            console.log(s,result)
             return result;
         }
 
@@ -1264,9 +1273,9 @@
             map.get(this)._deleteAnimation(trackIndex, mixDuration);
         }
 
-        addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor)
+        addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor, dependentSlotsSkinColor)
         {
-            map.get(this)._addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor);
+            map.get(this)._addCustomSkinOutfit(skinName, addOutfit, slots, dependentSlotsSkin, dependentSlotsColor, dependentSlotsSkinColor);
         }
 
         applySlotColors()

diff --git a/src/c3runtime/spine-draw.js b/src/c3runtime/spine-draw.js
@@ -346,7 +346,7 @@ class SpineBatch {
 // @ts-ignore
 if (!globalThis.spineBatcher)
 {
-    console.log('[Spine] SpineBatcher init, 1.54.0');
+    console.log('[Spine] SpineBatcher init, 1.55.0');
     // @ts-ignore
     globalThis.spineBatcher = new SpineBatch();
 }
diff --git a/src/plugin.js b/src/plugin.js
@@ -3,7 +3,7 @@
     const C3 = self.C3;
 
     const PLUGIN_ID = "Gritsenko_Spine";
-    const PLUGIN_VERSION = "1.54.0";
+    const PLUGIN_VERSION = "1.55.0";
     const PLUGIN_CATEGORY = "general";
 
     const PLUGIN_CLASS = SDK.Plugins.Gritsenko_Spine = class SpinePlugin extends SDK.IPluginBase {