@urso/core 0.7.62 → 0.7.63-dev

package/package.json

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

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) {
+    preload(assets, callback, updateCallback = () => { }) {
         const assetsSpace = this.getInstance('Service').sortAssets(assets);
-        this.getInstance('Service').startLoad(assetsSpace, callback);
+        this.getInstance('Service').startLoad(assetsSpace, callback, updateCallback);
     }
 
     /**
@@ -43,8 +43,8 @@ class ModulesAssetsController {
      * @param {String} name
      * @param {Function} callback
      */
-    loadGroup(name, callback) {
-        this.getInstance('Service').loadGroup(null, name, callback);
+    loadGroup(name, callback, updateCallback = () => { }) {
+        this.getInstance('Service').loadGroup(null, name, callback, updateCallback);
     }
 
     /**

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

@@ -58,22 +58,15 @@ class ModulesAssetsService {
      * @param {Object} assetsSpace
      * @param {Function} callback
      */
-    startLoad(assetsSpace, callback) {
+    startLoad(assetsSpace, callback, updateCallback) {
         this.loadGroup(
             assetsSpace,
             this.getInstance('Config').loadingGroups.initial,
-            (() => { callback(); this._startLazyLoad(); }).bind(this)
+            (() => { callback(); this._startLazyLoad(); }).bind(this),
+            updateCallback
         )
     }
 
-    /**
-     * load update handler. Setup to pixi loader
-     * @param {Number} param
-     */
-    loadUpdate(param) {
-        Urso.scenes.loadUpdate(Math.floor(param.progress));
-    }
-
     /**
      * load assets group by name
      * @param {Object} assetsSpace
@@ -81,7 +74,7 @@ class ModulesAssetsService {
      * @param {Function} callback
      * @returns
      */
-    loadGroup(assetsSpace, group, callback = () => { }) {
+    loadGroup(assetsSpace, group, callback = () => { }, updateCallback) {
         if (!assetsSpace) //global space
             assetsSpace = this.assets;
 
@@ -89,7 +82,7 @@ class ModulesAssetsService {
             return Urso.logger.error('ModulesAssetsService group error, no assets:' + group + ' Check ModulesAssetsConfig please');
 
         //we need load and parse atlases at first (!)
-        this._loadGroupAtlases(assetsSpace, group, () => { this._loadGroupRestAssets(assetsSpace, group, callback) });
+        this._loadGroupAtlases(assetsSpace, group, () => { this._loadGroupRestAssets(assetsSpace, group, callback, updateCallback) });
     }
 
     /**
@@ -128,9 +121,10 @@ class ModulesAssetsService {
      * @param {String} group
      * @param {Function} callback
      */
-    _loadGroupRestAssets(assetsSpace, group, callback) {
+    _loadGroupRestAssets(assetsSpace, group, callback, updateCallback) {
         let loader = Urso.getInstance('Lib.Loader');
-        loader.setOnLoadUpdate(this.loadUpdate.bind(this));
+        //load update callback
+        loader.setOnLoadUpdate(() => { updateCallback(Math.floor(param.progress)); });
         const noAtlasSpines = [];
 
         for (let assetModel of assetsSpace[group])

package/src/js/modules/scenes/service.js

@@ -117,7 +117,7 @@ class ModulesScenesService {
         this.getInstance('PixiWrapper').setNewScene(this._sceneModel);
         this.emit(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, name);
 
-        Urso.assets.preload(this._currentSceneTemplate.assets, this._assetsLoadedHandler);
+        Urso.assets.preload(this._currentSceneTemplate.assets, this._assetsLoadedHandler, this.loadUpdate);
     }
 
     loadUpdate(loadProgress) {