@urso/core 0.7.40 → 0.7.42

package/package.json

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

package/src/js/modules/statesManager/action.js

@@ -7,6 +7,7 @@ class ModulesStatesManagerAction {
         this._terminating = false;
         this.finished = false;
         this._onFinishCallback = false;
+        this._startTime = 0;
 
         this._onFinish = this._onFinish.bind(this);
     }
@@ -18,6 +19,7 @@ class ModulesStatesManagerAction {
 
     run(onFinishCallback) {
         this._running = true;
+        this._startTime = Urso.time.get();
         log(`%c action run ---> ${this.name}`, 'color: blue');
 
         this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_START, this.name);
@@ -57,10 +59,11 @@ class ModulesStatesManagerAction {
         this._running = false;
         this._terminating = false;
         this.finished = true;
+        const elapsedTime = Urso.time.get() - this._startTime;
 
         this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_FINISH, this.name);
 
-        log(`%c action finish <--- ${this.name}`, 'color: blue');
+        log(`%c action finish <--- ${this.name} (${elapsedTime}ms)`, 'color: blue');
         this._onFinishCallback();
     }
 }

package/src/js/modules/statesManager/race.js

@@ -28,6 +28,7 @@ class ModulesStatesManagerRace extends Action {
         log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
 
         this.finished = false;
+        this._startTime = Urso.time.get();
         this._onFinishCallback = onFinishCallback;
 
         for (let action of this._actions)
@@ -67,7 +68,8 @@ class ModulesStatesManagerRace extends Action {
 
     _onFinish() {
         this.finished = true;
-        log(`%c action finish <--- ${this.name}`, 'color: orange');
+        const elapsedTime = Urso.time.get() - this._startTime;
+        log(`%c action finish <--- ${this.name}  (${elapsedTime}ms)`, 'color: orange');
         this._onFinishCallback();
     }
 }

package/src/js/modules/statesManager/sequence.js

@@ -10,6 +10,7 @@ class ModulesStatesManagerSequence extends All {
         log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
 
         this.finished = false;
+        this._startTime = Urso.time.get();
         this._onFinishCallback = onFinishCallback;
 
         this._checkFinish();

package/src/js/modules/template/service.js

@@ -3,11 +3,11 @@ class ModulesTemplateService {
         this.singleton = true;
 
         this._currentTemplate = this.getInstance('Model');
-        this._actualTemplate;
+        this._actualFullTemplate = this.getInstance('Model');
     };
 
     getTemplate() {
-        return this._actualTemplate;
+        return this._actualFullTemplate;
     }
 
     getSceneOrGroup(name, namespace) {
@@ -25,12 +25,12 @@ class ModulesTemplateService {
         this._parseObjects(this._currentTemplate.objects, template._templatePath);
 
         if (additionalTemplateFlag) {
-            this._actualTemplate.assets = Urso.helper.mergeArrays(this._actualTemplate.assets, this._currentTemplate.assets);
-            this._actualTemplate.components = Urso.helper.mergeArrays(this._actualTemplate.components, this._currentTemplate.components);
-            this._actualTemplate.objects = Urso.helper.mergeArrays(this._actualTemplate.objects, this._currentTemplate.objects);
-            Urso.helper.mergeObjectsRecursive(this._actualTemplate.styles, this._currentTemplate.styles);
+            this._actualFullTemplate.assets = Urso.helper.mergeArrays(this._actualFullTemplate.assets, this._currentTemplate.assets);
+            this._actualFullTemplate.components = Urso.helper.mergeArrays(this._actualFullTemplate.components, this._currentTemplate.components);
+            this._actualFullTemplate.objects = Urso.helper.mergeArrays(this._actualFullTemplate.objects, this._currentTemplate.objects);
+            Urso.helper.mergeObjectsRecursive(this._actualFullTemplate.styles, this._currentTemplate.styles);
         } else {
-            this._actualTemplate = this._currentTemplate;
+            this._actualFullTemplate = this._currentTemplate;
         }
 
         return this._currentTemplate;