@urso/core 0.7.81 → 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.81",
+  "version": "0.7.83-dev",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/config/load.js

@@ -78,6 +78,7 @@ window.Urso = {
                     Html: require('../modules/assets/models/html'),
                     Image: require('../modules/assets/models/image'),
                     Json: require('../modules/assets/models/json'),
+                    JsonAtlas: require('../modules/assets/models/jsonAtlas'),
                     Sound: require('../modules/assets/models/sound'),
                     Spine: require('../modules/assets/models/spine')
                 }

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/cache.js

@@ -1,15 +1,16 @@
 class LibCache {
     constructor() {
         this.assetsList = {
-            image: {},
             atlas: {},
-            json: {},
             binary: {},
-            spine: {},
             bitmapFont: {},
+            file: {},
+            image: {},
+            json: {},
+            jsonAtlas: {},
             sound: {},
-            texture: {},
-            file: {}
+            spine: {},
+            texture: {}
         };
 
         this.globalAtlas = new PIXI.spine.TextureAtlas();
@@ -50,6 +51,10 @@ class LibCache {
         this._setDataToAssetsList('json', key, someData);
     };
 
+    addJsonAtlas(key, someData) {
+        this._setDataToAssetsList('jsonAtlas', key, someData);
+    };
+
     addSound(key, someData) {
         this._setDataToAssetsList('sound', key, someData);
     };
@@ -91,6 +96,14 @@ class LibCache {
         return this.assetsList.json[key];
     };
 
+    getJsonAtlas(key) {
+        return this.assetsList.jsonAtlas[key];
+    };
+
+    getJsonAtlases() {
+        return this.assetsList.jsonAtlas;
+    };
+
     getSound(key) {
         return this.assetsList.sound[key];
     };

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;
@@ -120,11 +123,28 @@ class LibLoader {
 
             let params = asset.params || false; // TODO: Set params field in base mode
 
-            if (asset.type === Urso.types.assets.SPINE && asset.noAtlas) {
+            if (asset.type === Urso.types.assets.JSON) { // check json in JSONATLAS
+                const jsonData = this._getJsonDataFromJsonAtlases(asset.key);
+
+                if (jsonData) {
+                    Urso.cache.addJson(asset.key, { data: jsonData });
+                    return;
+                }
+            }
+
+            if (asset.type === Urso.types.assets.SPINE && asset.noAtlas) { // check SPINE in JSONATLAS
                 if (!params)
                     params = {};
 
                 params.metadata = { spineAtlas: Urso.cache.getGlobalAtlas() };
+
+                //check for json in JSONATLAS
+                const jsonData = this._getJsonDataFromJsonAtlases(asset.key);
+
+                if (jsonData) {
+                    this._loadSpineFromExistingResourses(asset, jsonData, params);
+                    return;
+                }
             }
 
             const loadPath = this._getLoadPath(asset);
@@ -146,6 +166,27 @@ class LibLoader {
         }.bind(this));
     };
 
+    _getJsonDataFromJsonAtlases(key) {
+        const jsonAtlases = Urso.cache.getJsonAtlases();
+
+        for (let jsonAtlasKey in jsonAtlases) {
+            if (jsonAtlases[jsonAtlasKey].data.hasOwnProperty(key)) {
+                return jsonAtlases[jsonAtlasKey].data[key];
+            }
+        }
+
+        return null;
+    }
+
+    _loadSpineFromExistingResourses(asset, jsonData, params) {
+        //params.metadata.spineAtlas
+
+        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) {
         Urso.logger.warn('LibLoader file load error: ', error);
 

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

@@ -0,0 +1,11 @@
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsJsonAtlas extends ModulesAssetsBaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.assets.JSONATLAS;
+    }
+}
+
+module.exports = ModulesAssetsModelsJsonAtlas;

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();
@@ -366,6 +366,9 @@ class ModulesAssetsService {
             case Urso.types.assets.JSON:
                 model = this.getInstance('Models.Json', asset)
                 break;
+            case Urso.types.assets.JSONATLAS:
+                model = this.getInstance('Models.JsonAtlas', asset)
+                break;
             case Urso.types.assets.SOUND:
                 model = this.getInstance('Models.Sound', asset)
                 break;

package/src/js/modules/template/types.js

@@ -9,8 +9,9 @@ class ModulesTemplateTypes {
                 FONT: 5,
                 IMAGE: 6,
                 JSON: 7,
-                SOUND: 8,
-                SPINE: 9,
+                JSONATLAS: 8,
+                SOUND: 9,
+                SPINE: 10,
                 HTML: 100
             },