@urso/core 0.7.82-dev → 0.7.83-dev

package/build/js/index.js.LICENSE.txt

@@ -36,16 +36,6 @@ object-assign
  * Copyright 2019-2020, Ivan Igorevich Popelyshev <ivan.popelyshev@gmail.com>, All Rights Reserved
  */
 
-/*!
- * @pixi-spine/runtime-3.8 - v3.1.2
- * Compiled Tue, 10 Jan 2023 14:17:32 UTC
- *
- * @pixi-spine/runtime-3.8 is licensed under the MIT License.
- * http://www.opensource.org/licenses/mit-license
- * 
- * Copyright 2019-2020, Ivan Igorevich Popelyshev <ivan.popelyshev@gmail.com>, All Rights Reserved
- */
-
 /*!
  * @pixi/accessibility - v6.5.10
  * Compiled Thu, 06 Jul 2023 15:25:11 UTC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.82-dev",
+  "version": "0.7.83-dev",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/extra/main.js

@@ -9,6 +9,11 @@ PIXI.filters['DropShadowFilter'] = DropShadowFilter;
 
 
 window.PIXI.spine = require("pixi-spine");
+
+import { AtlasAttachmentLoader, SkeletonJson } from "@pixi-spine/runtime-3.8";
+window.PIXI.spine.AtlasAttachmentLoader = AtlasAttachmentLoader;
+window.PIXI.spine.SkeletonJson = SkeletonJson;
+
 require("pixi-projection");
 require("pixi-text-input");
 

package/src/js/lib/loader.js

@@ -75,6 +75,9 @@ class LibLoader {
             case Urso.types.assets.JSON:
                 Urso.cache.addJson(asset.key, resource);
                 break;
+            case Urso.types.assets.JSONATLAS:
+                Urso.cache.addJsonAtlas(asset.key, resource);
+                break;
             case Urso.types.assets.SOUND:
                 Urso.cache.addSound(asset.key, resource);
                 break;
@@ -134,6 +137,7 @@ class LibLoader {
                     params = {};
 
                 params.metadata = { spineAtlas: Urso.cache.getGlobalAtlas() };
+
                 //check for json in JSONATLAS
                 const jsonData = this._getJsonDataFromJsonAtlases(asset.key);
 
@@ -165,9 +169,9 @@ class LibLoader {
     _getJsonDataFromJsonAtlases(key) {
         const jsonAtlases = Urso.cache.getJsonAtlases();
 
-        for (let i = 0; i < jsonAtlases.length; i++) {
-            if (jsonAtlases[i].data.hasOwnProperty(key)) {
-                return jsonAtlases[i].data[key];
+        for (let jsonAtlasKey in jsonAtlases) {
+            if (jsonAtlases[jsonAtlasKey].data.hasOwnProperty(key)) {
+                return jsonAtlases[jsonAtlasKey].data[key];
             }
         }
 
@@ -175,19 +179,12 @@ class LibLoader {
     }
 
     _loadSpineFromExistingResourses(asset, jsonData, params) {
-        const rawSkeletonData = jsonData; //skeleton
-        const rawAtlasData = params.metadata.spineAtlas; //atlas file 
-
-        const spineAtlas = new PIXI.spine.core.TextureAtlas(rawAtlasData, function (line, callback) {
-            // pass the image here.
-            callback(PIXI.BaseTexture.fromImage(line));
-        }); // specify path, image.png will be added automatically
-
-        const spineAtlasLoader = new PIXI.spine.core.AtlasAttachmentLoader(spineAtlas)
-        const spineJsonParser = new PIXI.spine.core.SkeletonJson(spineAtlasLoader);
+        //params.metadata.spineAtlas
 
-        const spineData = spineJsonParser.readSkeletonData(rawSkeletonData);
-        Urso.cache.addSpine(asset.key, spineData);
+        const spineAtlasLoader = new PIXI.spine.AtlasAttachmentLoader(params.metadata.spineAtlas);
+        const spineJsonParser = new PIXI.spine.SkeletonJson(spineAtlasLoader);
+        const spineData = spineJsonParser.readSkeletonData(jsonData);
+        Urso.cache.addSpine(asset.key, {spineData});
     }
 
     _onError(error) {

package/src/js/modules/assets/models/jsonAtlas.js

@@ -4,7 +4,7 @@ class ModulesAssetsModelsJsonAtlas extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 
-        this.type = Urso.types.assets.JSON;
+        this.type = Urso.types.assets.JSONATLAS;
     }
 }
 

package/src/js/modules/assets/service.js

@@ -121,7 +121,7 @@ class ModulesAssetsService {
      * @param {Function} callback
      */
     _loadGroupAtlases(assetsSpace, group, callback) {
-        const atlases = assetsSpace[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
+        const atlases = assetsSpace[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS || assetModel.type === Urso.types.assets.JSONATLAS);
 
         if (!atlases.length)
             return callback();