@urso/core 0.8.19 → 0.8.21

package/package.json

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

package/src/js/lib/loader.js

@@ -7,6 +7,8 @@ class LibLoader {
         this._onLoadUpdate = () => { };
         this._loader = null;
         this._completeCallback = () => { };
+        this._errorCallback = () => { };
+        this._reloadOnError = true;
 
         this._onError = this._onError.bind(this);
     };
@@ -102,7 +104,7 @@ class LibLoader {
      * start loading assets from assets query
      * @param {Function} callback 
      */
-    start(callback) {
+    start(callback, errorCallback = () => { }, reloadOnError = true) {
         if (this._isRunning)
             return false;
 
@@ -111,6 +113,8 @@ class LibLoader {
         this._iterationNumber++;
         const currentIteration = this._iterationNumber;
         this._completeCallback = callback;
+        this._errorCallback = errorCallback;
+        this._reloadOnError = reloadOnError;
         this._loader = new PIXI.Loader();
         const appVersion = Urso.config.appVersion;
 
@@ -201,9 +205,12 @@ class LibLoader {
         this._loader.reset();
         this._isRunning = false;
         this._lastLoadFailed = true;
+        this._errorCallback(error);
 
-        Urso.logger.warn('LibLoader all assets RELOAD...');
-        this._resizeTimeoutId = Urso.setTimeout(() => this.start(this._completeCallback), this.RELOAD_DELAY);
+        if (this._reloadOnError) {
+            Urso.logger.warn('LibLoader all assets RELOAD...');
+            Urso.setTimeout(() => this.start(this._completeCallback), this.RELOAD_DELAY);
+        }
     }
 
 };

package/src/js/modules/assets/controller.js

@@ -33,9 +33,9 @@ class ModulesAssetsController {
      * @param {Mixed} assets - asset or array of assets
      * @param {Function} callback
      */
-    preload(assets, callback, updateCallback = () => { }) {
+    preload(assets, callback, updateCallback = () => { }, errorCallback = () => { }, reloadOnError = true) {
         const assetsSpace = this.getInstance('Service').sortAssets(assets);
-        this.getInstance('Service').startLoad(assetsSpace, callback, updateCallback);
+        this.getInstance('Service').startLoad(assetsSpace, callback, updateCallback, errorCallback, reloadOnError);
     }
 
     /**
@@ -43,8 +43,8 @@ class ModulesAssetsController {
      * @param {String} name
      * @param {Function} callback
      */
-    loadGroup(name, callback, updateCallback = () => { }) {
-        this.getInstance('Service').loadGroup(null, name, callback, updateCallback);
+    loadGroup(name, callback, updateCallback = () => { }, errorCallback = () => { }, reloadOnError = true) {
+        this.getInstance('Service').loadGroup(null, name, callback, updateCallback, errorCallback, reloadOnError);
     }
 
     /**

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

@@ -58,12 +58,14 @@ class ModulesAssetsService {
      * @param {Object} assetsSpace
      * @param {Function} callback
      */
-    startLoad(assetsSpace, callback, updateCallback) {
+    startLoad(assetsSpace, callback, updateCallback, errorCallback, reloadOnError) {
         this.loadGroup(
             assetsSpace,
             this.getInstance('Config').loadingGroups.initial,
-            (() => { callback(); this._startLazyLoad(); }).bind(this),
-            updateCallback
+            (() => { callback(); this._startLazyLoad(errorCallback, reloadOnError); }).bind(this),
+            updateCallback,
+            errorCallback,
+            reloadOnError
         )
     }
 
@@ -74,7 +76,7 @@ class ModulesAssetsService {
      * @param {Function} callback
      * @returns
      */
-    loadGroup(assetsSpace, group, callback = () => { }, updateCallback = () => { }) {
+    loadGroup(assetsSpace, group, callback, updateCallback, errorCallback, reloadOnError) {
         if (!assetsSpace) //global space
             assetsSpace = this.assets;
 
@@ -82,13 +84,13 @@ class ModulesAssetsService {
             return Urso.logger.error('ModulesAssetsService group error, no assets:' + group + ' Check ModulesAssetsConfig please');
 
         //we need load and parse atlases at first (!)
-        const loadRestAssetsCallback = () => { this._loadGroupRestAssets(assetsSpace, group, callback, updateCallback) };
+        const loadRestAssetsCallback = () => { this._loadGroupRestAssets(assetsSpace, group, callback, updateCallback, errorCallback, reloadOnError) };
 
         const loadAtlasesCallback = () => {
-            this._loadGroupAtlases(assetsSpace, group, loadRestAssetsCallback, Urso.types.assets.ATLAS);
+            this._loadGroupAtlases(assetsSpace, group, loadRestAssetsCallback, errorCallback, reloadOnError, Urso.types.assets.ATLAS);
         }
 
-        this._loadGroupAtlases(assetsSpace, group, loadAtlasesCallback, Urso.types.assets.JSONATLAS);
+        this._loadGroupAtlases(assetsSpace, group, loadAtlasesCallback, errorCallback, reloadOnError, Urso.types.assets.JSONATLAS);
     }
 
     preloadAllImagesInGPU() {
@@ -126,7 +128,7 @@ class ModulesAssetsService {
      * @param {String} group
      * @param {Function} callback
      */
-    _loadGroupAtlases(assetsSpace, group, callback, atlasType) {
+    _loadGroupAtlases(assetsSpace, group, callback, errorCallback, reloadOnError, atlasType) {
         const atlases = assetsSpace[group].filter(assetModel => assetModel.type === atlasType);
 
         if (!atlases.length)
@@ -137,12 +139,16 @@ class ModulesAssetsService {
         for (let assetModel of atlases)
             this._addAssetToLoader(assetModel, loader);
 
-        loader.start(() => {
-            if (atlasType === Urso.types.assets.ATLAS)
-                this._processLoadedAtlases(assetsSpace, group);
+        loader.start(
+            () => {
+                if (atlasType === Urso.types.assets.ATLAS)
+                    this._processLoadedAtlases(assetsSpace, group);
 
-            callback();
-        });
+                callback();
+            },
+            errorCallback,
+            reloadOnError
+        );
     }
 
     /**
@@ -151,7 +157,7 @@ class ModulesAssetsService {
      * @param {String} group
      * @param {Function} callback
      */
-    _loadGroupRestAssets(assetsSpace, group, callback, updateCallback) {
+    _loadGroupRestAssets(assetsSpace, group, callback, updateCallback, errorCallback, reloadOnError) {
         let loader = Urso.getInstance('Lib.Loader');
         //load update callback
         loader.setOnLoadUpdate((params) => { updateCallback(Math.floor(params.progress)); });
@@ -170,11 +176,18 @@ class ModulesAssetsService {
         loader.start(
             () => {
                 this._processLoadedAssets(assetsSpace, group);
-                this._loadNoAtlasSpines(noAtlasSpines, () => {
-                    this.emit(Urso.events.MODULES_ASSETS_GROUP_LOADED, group);
-                    callback();
-                });
-            }
+                this._loadNoAtlasSpines(
+                    noAtlasSpines,
+                    () => {
+                        this.emit(Urso.events.MODULES_ASSETS_GROUP_LOADED, group);
+                        callback();
+                    },
+                    errorCallback,
+                    reloadOnError
+                );
+            },
+            errorCallback,
+            reloadOnError
         );
     }
 
@@ -184,7 +197,7 @@ class ModulesAssetsService {
      * @param {Function} callback
      * @returns
      */
-    _loadNoAtlasSpines(noAtlasSpines, callback) {
+    _loadNoAtlasSpines(noAtlasSpines, callback, errorCallback, reloadOnError) {
         if (!noAtlasSpines.length)
             return callback();
 
@@ -193,7 +206,7 @@ class ModulesAssetsService {
         for (let assetModel of noAtlasSpines)
             this._addAssetToLoader(assetModel, loader);
 
-        loader.start(callback);
+        loader.start(callback, errorCallback, reloadOnError);
     }
 
     /**
@@ -417,22 +430,19 @@ class ModulesAssetsService {
     /**
      * start lazy load process
      */
-    _startLazyLoad() {
+    _startLazyLoad(errorCallback, reloadOnError) {
         if (this.lazyLoadProcessStarted)
             return;
 
         this.lazyLoadProcessStarted = true;
-        this._continueLazyLoad();
+        this._continueLazyLoad(errorCallback, reloadOnError);
     }
 
     /**
      * continue lazy load process (with current step)
      * @param {Number} step
      */
-    _continueLazyLoad(step) {
-        if (!step)
-            step = 0;
-
+    _continueLazyLoad(errorCallback, reloadOnError, step = 0) {
         const lazyLoadGroups = this.getInstance('Config').lazyLoadGroups;
 
         if (step >= lazyLoadGroups.length) {
@@ -445,7 +455,9 @@ class ModulesAssetsService {
         if (!groupName)
             Urso.logger.error('ModulesAssetsService lazy loading groupName error');
 
-        this.loadGroup(null, groupName, () => { this._continueLazyLoad(step + 1); })
+        const callback = () => { this._continueLazyLoad(errorCallback, reloadOnError, step + 1); }
+        const updateCallback = () => { };
+        this.loadGroup(null, groupName, callback, updateCallback, errorCallback, reloadOnError);
     }
 
     /**