1.41.2 Fix PMA palette bug and more.

1.41.2 Fix PMA palette bug, update palette _after_ use, less dependent. Add EntryPalette string expression.
MikalDev · Mar 23, 2021 · d77a55e · d77a55e
1 parent d8d0f1e
commit d77a55e
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 3 deletions.
diff --git a/dist/Spine-v1.41.2.c3addon b/dist/Spine-v1.41.2.c3addon
diff --git a/src/aces.json b/src/aces.json
@@ -1062,6 +1062,19 @@
         "returnType": "string",
         "params": [
         ]
+      },
+      {
+        "id": "entry-palette-color-string",
+        "expressionName": "EntryPaletteColorString",
+        "scriptName": "EntryPaletteColorString",
+        "highlight": false,
+        "returnType": "string",
+        "params": [
+          {
+            "id": "palette-number",
+            "type": "number"
+          }
+        ]
       }
     ]
   }

diff --git a/src/addon.json b/src/addon.json
@@ -3,7 +3,7 @@
   "type": "plugin",
   "name": "Spine",
   "id": "Gritsenko_Spine",
-  "version": "1.41.1",
+  "version": "1.41.2",
   "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/expressions.js b/src/c3runtime/expressions.js
@@ -294,6 +294,17 @@
             }
             return hexString;
         },
+        EntryPaletteColorString(paletteNumber){
+            if (!this.palette) return "";
+            let hexString = ""
+            let paletteEntryOffset = this.palette.indexSize*paletteNumber*4;
+            for(let i=0;i<this.palette.paletteNumber;i++)
+            {
+                const hexValueString = this.palette.palette[paletteEntryOffset+i].toString(16).padStart(2, '0');
+                hexString = hexString + hexValueString;
+            }
+            return hexString;
+        },
         GetValue(pathString){
             if(pathString === '') return '';
             let path = pathString.split('.');

diff --git a/src/c3runtime/spine-draw.js b/src/c3runtime/spine-draw.js
@@ -197,11 +197,13 @@ class SpineBatch {
             const skeletonInstance = skeletonInstances[uid];
             const palette = skeletonInstance.palette;
 
+            /*
             if (skeletonInstance.initialized && palette.uploadNeeded)
             {
                 palette.uploadNeeded = false;
                 palette.upload(gl.TEXTURE1, gl);
             }
+            */
 
             if (skeletonInstance.initialized 
                 && (tickCount%this._renderRate == index%this._renderRate)
@@ -256,6 +258,13 @@ class SpineBatch {
                 this.batcher.end();
                 this.shader.unbind();
             }
+
+            if (skeletonInstance.initialized && palette.uploadNeeded)
+            {
+                palette.uploadNeeded = false;
+                palette.upload(gl.TEXTURE1, gl);
+            }
+
             index++;
         }
 
@@ -334,6 +343,6 @@ class SpineBatch {
 
 if (!globalThis.spineBatcher)
 {
-    console.log('[Spine] SpineBatcher init, 1.41.1');
+    console.log('[Spine] SpineBatcher init, 1.41.2');
     globalThis.spineBatcher = new SpineBatch();
 }
diff --git a/src/c3runtime/spine-palette.js b/src/c3runtime/spine-palette.js
@@ -124,6 +124,7 @@ class SpinePalette {
         let oldActive = gl.getParameter(gl.ACTIVE_TEXTURE);            
         let oldTex = gl.getParameter(gl.TEXTURE_BINDING_2D);  
         gl.activeTexture(textureUnit);
+        gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
         gl.bindTexture(gl.TEXTURE_2D, this._paletteTexture);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, this.indexSize, this.paletteNumber, 0, gl.RGBA, gl.UNSIGNED_BYTE, this._palette);
         gl.activeTexture(oldActive);

diff --git a/src/lang/en-US.json b/src/lang/en-US.json
@@ -994,6 +994,16 @@
             "params": {
             }
           },
+          "entry-palette-color-string": {
+            "description": "Entry palette color string",
+            "translated-name": "EntryPaletteColorString",
+            "params": {
+              "palette-number": {
+                "name": "Palette number",
+                "desc": "Palette number"
+              }
+            }
+          },
           "get-value": {
             "description": "Get value at path",
             "translated-name": "GetValue",

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.41.1";
+    const PLUGIN_VERSION = "1.41.2";
     const PLUGIN_CATEGORY = "general";
 
     const PLUGIN_CLASS = SDK.Plugins.Gritsenko_Spine = class SpinePlugin extends SDK.IPluginBase {