Release 1.14.1 - fix PMA regression

gritsenko · Sep 16, 2020 · 6da9e4c · 6da9e4c
1 parent b3bd877
commit 6da9e4c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/dist/Spine-v1.14.1.c3addon b/dist/Spine-v1.14.1.c3addon
diff --git a/src/addon.json b/src/addon.json
@@ -3,7 +3,7 @@
   "type": "plugin",
   "name": "Spine",
   "id": "Gritsenko_Spine",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "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
@@ -126,7 +126,6 @@
                     this._sdkType._assetPaths[assetPaths[i]] = this.pngURI;
                     this.assetManager.loadTexture(this.DEMO_NAME, textureLoader, this.pngURI);
                 }
-                console.log('[SpineInit] paths',this._sdkType._assetPaths)
 
                 this.assetManager.loadText(this.DEMO_NAME, this.atlasURI);
             }
@@ -156,6 +155,7 @@
             // console.log("Loading skeleton");
 
             this.skeletonInfo = this.loadSkeleton(this.skeletonName, this.animationName);
+            this.skeletonInfo.premultipliedAlpha = this.premultipliedAlpha;
 
             const skins = this.skeletonInfo.skeleton.data.skins;
             this.skinNames = skins.map(x => x.name);
@@ -182,7 +182,7 @@
                 this._sdkType._skeletonData.notInitialized = false;
                 const atlasURI = assetManager.get(this.DEMO_NAME, this.atlasURI);
                 this._sdkType._atlas = new spine.TextureAtlas(atlasURI, function(path) {
-                    // console.log(`Loading png atlas ${path} replaced with ${self.pngURI}`);
+                    // console.log(`Loading png atlas ${path} replaced with ${self._sdkType._assetPaths[path]}`);
                     return assetManager.get(self.DEMO_NAME, self._sdkType._assetPaths[path]);
                 });
                 this._sdkType._atlasLoader = new spine.AtlasAttachmentLoader(this._sdkType._atlas);
@@ -409,10 +409,6 @@
 
         Draw(renderer) {
 
-            // if (!this.loggedRenderer) {
-            //     this.loggedRenderer = true;
-            //     console.log(renderer);
-            // }
             var  gl  =  renderer._gl
 
             if (this._elementId == "" || !this.isSkeletonLoaded) return; // elementID not set, can't draw the element

diff --git a/src/c3runtime/spine-draw.js b/src/c3runtime/spine-draw.js
@@ -171,6 +171,8 @@ class SpineBatch {
             if (skeletonInstance.initialized)
             {
                 const bounds = skeletonInstance.skeletonInfo.bounds;
+                const premultipliedAlpha = skeletonInstance.skeletonInfo.premultipliedAlpha;
+
                 // Render to our targetTexture by binding the framebuffer to the SpineFB texture
                 gl.bindFramebuffer(gl.FRAMEBUFFER, skeletonInstance.spineFB);
 
@@ -202,7 +204,7 @@ class SpineBatch {
                 gl.clear(gl.COLOR_BUFFER_BIT);
 
                 // Render
-                this.renderer.premultipliedAlpha = this.premultipliedAlpha;
+                this.renderer.premultipliedAlpha = premultipliedAlpha;
                 this.renderer.draw(this.batcher, skeletonInstance.skeletonInfo.skeleton);
                 this.batcher.end();
                 this.shader.unbind();

diff --git a/src/plugin.js b/src/plugin.js
@@ -2,7 +2,7 @@
 {
 
     const PLUGIN_ID = "Gritsenko_Spine";
-    const PLUGIN_VERSION = "1.14.0";
+    const PLUGIN_VERSION = "1.14.1";
     const PLUGIN_CATEGORY = "general";
 
     const PLUGIN_CLASS = SDK.Plugins.Gritsenko_Spine = class SpinePlugin extends SDK.IPluginBase {