@urso/core 0.7.33 → 0.7.35

package/package.json

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

package/src/js/lib/cache.js

@@ -15,45 +15,52 @@ class LibCache {
         this.globalAtlas = new PIXI.spine.TextureAtlas();
     };
 
+    _setDataToAssetsList(assetType, key, data) {
+        if (this.assetsList[assetType][key])
+            console.warn(`LibCache ${assetType}: key alredy exists: `, key, data);
+
+        this.assetsList[assetType][key] = someData;
+    }
+
     addFile(key, someData) {
-        this.assetsList.file[key] = someData;
+        this._setDataToAssetsList('file', key, someData);
     };
 
     addAtlas(key, someData) {
-        this.assetsList.atlas[key] = someData;
+        this._setDataToAssetsList('atlas', key, someData);
     };
 
     addBinary(key, someData) {
-        this.assetsList.binary[key] = someData;
+        this._setDataToAssetsList('binary', key, someData);
     };
 
     addBitmapFont(key, someData) {
-        this.assetsList.bitmapFont[key] = someData;
+        this._setDataToAssetsList('bitmapFont', key, someData);
     };
 
     addContainer(key, someData) {
-        this.assetsList.container[key] = someData;
+        this._setDataToAssetsList('container', key, someData);
     };
 
     addImage(key, someData) {
-        this.assetsList.image[key] = someData;
+        this._setDataToAssetsList('image', key, someData);
     };
 
     addJson(key, someData) {
-        this.assetsList.json[key] = someData;
+        this._setDataToAssetsList('json', key, someData);
     };
 
     addSound(key, someData) {
-        this.assetsList.sound[key] = someData;
+        this._setDataToAssetsList('sound', key, someData);
     };
 
     addTexture(key, someData) {
-        this.assetsList.texture[key] = someData;
+        this._setDataToAssetsList('texture', key, someData);
         this.globalAtlas.addTexture(key, someData);
     };
 
     addSpine(key, someData) {
-        this.assetsList.spine[key] = someData;
+        this._setDataToAssetsList('spine', key, someData);
     };
 
     getFile(key) {

package/src/js/lib/loader.js

@@ -1,8 +1,13 @@
 class LibLoader {
     constructor() {
         this._isRunning = false;
+        this._iterationNumber = 0;
         this._assetsQuery = [];
         this._onLoadUpdate = () => { };
+        this._loader = null;
+        this._completeCallback = () => { };
+
+        this._onError = this._onError.bind(this);
     };
 
     isRunning() {
@@ -98,11 +103,14 @@ class LibLoader {
             return false;
 
         this._isRunning = true;
-        const loader = new PIXI.Loader();
+        this._iterationNumber++;
+        const currentIteration = this._iterationNumber;
+        this._completeCallback = callback;
+        this._loader = new PIXI.Loader();
         const appVersion = Urso.config.appVersion;
 
         if (appVersion) {
-            loader.defaultQueryString = `appVersion=${appVersion}`;
+            this._loader.defaultQueryString = `appVersion=${appVersion}`;
         }
 
         this._assetsQuery.forEach(asset => {
@@ -118,13 +126,17 @@ class LibLoader {
             }
 
             const loadPath = this._getLoadPath(asset);
-            loader.add(asset.key, loadPath, params, (resource) => this._storeAsset(asset, resource))  //TODO set assets resolution instead _processLoadedImage baseTexture resolution
+            this._loader.add(asset.key, loadPath, params, (resource) => this._storeAsset(asset, resource))  //TODO set assets resolution instead _processLoadedImage baseTexture resolution
         });
 
         this._onLoadUpdate({ progress: 0 });
-        loader.onProgress.add(this._onLoadUpdate);
+        this._loader.onProgress.add(this._onLoadUpdate);
+        this._loader.onError.add(this._onError);
+
+        this._loader.load(function (loader, resources) {
+            if (currentIteration !== this._iterationNumber)
+                return;
 
-        loader.load(function (loader, resources) {
             this._onLoadUpdate({ progress: 100 });
             this._assetsQuery = [];
             this._isRunning = false;
@@ -132,6 +144,13 @@ class LibLoader {
         }.bind(this));
     };
 
+
+    _onError(error) {
+        this._loader.reset();
+        this._isRunning = false;
+        this.start(this._completeCallback);
+    }
+
 };
 
 module.exports = LibLoader;

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

@@ -185,18 +185,17 @@ class ModulesAssetsService {
             let imageData = Urso.cache.getAtlas(assetKey);
             const folderPath = imageData.url.split('/').slice(0, -1).join('/');
 
-            for (let i = 0; i < imageData.spritesheet._frames.length; i++) {
-                let frame = imageData.spritesheet._frames[i];
-                let texture = imageData.textures[i];
-                let newFilename = frame.filename;
+            for (const name of Object.keys(imageData.spritesheet._frames)) {
+                let texture = imageData.textures[name];
+                let newFilename = name;
 
-                if (!frame.filename.includes('/'))
-                    newFilename = folderPath + '/' + frame.filename;
+                if (!name.includes('/'))
+                    newFilename = folderPath + '/' + name;
 
                 Urso.cache.addFile(newFilename, texture);
 
-                if(assetModel.cacheTextures) {
-                    const textureKey = newFilename.split('/').pop().split('.')[0];
+                if (assetModel.cacheTextures) {
+                    const textureKey = newFilename.split('.')[0];
                     Urso.cache.addTexture(textureKey, texture);
                 }
             }