@urso/core 0.7.81 → 0.7.82-dev

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.81",
+  "version": "0.7.82-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/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

@@ -120,11 +120,27 @@ 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 +162,34 @@ class LibLoader {
         }.bind(this));
     };
 
+    _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];
+            }
+        }
+
+        return null;
+    }
+
+    _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);
+
+        const spineData = spineJsonParser.readSkeletonData(rawSkeletonData);
+        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.JSON;
+    }
+}
+
+module.exports = ModulesAssetsModelsJsonAtlas;

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

@@ -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
             },