spine4.1 plugin about createSkeleton perf issue (also optimize spine plugin spineFileCallback func)

plugins/spine/src/SpinePlugin.js

@@ -653,12 +653,14 @@ var SpinePlugin = new Class({
      * @param {boolean} [preMultipliedAlpha=false] - Do the texture files include pre-multiplied alpha or not?
      * @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the Spine json file. Used in replacement of the Loaders default XHR Settings.
      * @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the Spine atlas file. Used in replacement of the Loaders default XHR Settings.
+     * @param {object} [settings] - An external Settings configuration object { prefix: '' }
      * 
      * @return {Phaser.Loader.LoaderPlugin} The Loader instance.
      */
-    spineFileCallback: function (key, jsonURL, atlasURL, preMultipliedAlpha, jsonXhrSettings, atlasXhrSettings)
+    spineFileCallback: function (key, jsonURL, atlasURL, preMultipliedAlpha, jsonXhrSettings, atlasXhrSettings, settings)
     {
         var multifile;
+        settings = settings || {};
 
         if (Array.isArray(key))
         {
@@ -666,6 +668,9 @@ var SpinePlugin = new Class({
             {
                 multifile = new SpineFile(this, key[i]);
 
+                // Support prefix key
+                multifile.prefix = multifile.prefix || settings.prefix || '';
+
                 this.addFile(multifile.files);
             }
         }
@@ -673,6 +678,9 @@ var SpinePlugin = new Class({
         {
             multifile = new SpineFile(this, key, jsonURL, atlasURL, preMultipliedAlpha, jsonXhrSettings, atlasXhrSettings);
 
+            // Support prefix key
+            multifile.prefix = multifile.prefix || settings.prefix || '';
+
             this.addFile(multifile.files);
         }
 

plugins/spine4.1/dist/SpineCanvasPlugin.js

@@ -24620,6 +24620,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -24644,11 +24646,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/dist/SpineCanvasPluginDebug.js

@@ -37208,6 +37208,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -37232,11 +37234,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/dist/SpinePlugin.js

@@ -15141,6 +15141,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -15165,11 +15167,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/dist/SpinePluginDebug.js

@@ -37443,6 +37443,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -37467,11 +37469,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/dist/SpineWebGLPlugin.js

@@ -27178,6 +27178,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -27202,11 +27204,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/dist/SpineWebGLPluginDebug.js

@@ -37328,6 +37328,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -37352,11 +37354,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;

plugins/spine4.1/src/SpinePlugin.js

@@ -638,6 +638,7 @@ var SpinePlugin = new Class({
      * @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the Spine json file. Used in replacement of the Loaders default XHR Settings.
      * @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the Spine atlas file. Used in replacement of the Loaders default XHR Settings.
      * @param {object} [settings] - An external Settings configuration object { prefix: '' }
+     * 
      * @return {Phaser.Loader.LoaderPlugin} The Loader instance.
      */
     spineFileCallback: function (key, jsonURL, atlasURL, preMultipliedAlpha, jsonXhrSettings, atlasXhrSettings, settings)
@@ -971,6 +972,8 @@ var SpinePlugin = new Class({
             return null;
         }
 
+        if (!this.spineTextures.has(atlasKey))
+        {
             var gl = this.gl;
             var i;
             var atlasPage;
@@ -995,11 +998,7 @@ var SpinePlugin = new Class({
                 }
             }
         
-        var spineTextureKey = atlasData.prefix ? atlasData.prefix + atlasKey : atlasKey;
-
-        if (!this.spineTextures.has(spineTextureKey))
-        {
-            this.spineTextures.add(spineTextureKey, atlas);
+            this.spineTextures.add(atlasKey, atlas);
         }
 
         var preMultipliedAlpha = atlasData.preMultipliedAlpha;