@urso/core 0.7.54 → 0.7.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.54",
+  "version": "0.7.56",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -49,4 +49,4 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"
   }
-}
+}

package/src/js/components/stateDriven/controller.js

@@ -98,6 +98,7 @@ class ComponentsStateDrivenController extends ComponentsBaseController {
         //do not forget use super._subscribeOnce() , if you will use _subscribeOnce in the component
         this._processStates();
         this._processActions();
+        this.addListener(Urso.events.MODULES_STATES_MANAGER_STOP, this._onStatesManagerStop.bind(this), true);
     }
 
     destroy() {
@@ -113,6 +114,10 @@ class ComponentsStateDrivenController extends ComponentsBaseController {
         }
     }
 
+    _onStatesManagerStop() {
+        this._finishCallbacks = {};
+    }
+
 }
 
 module.exports = ComponentsStateDrivenController;

package/src/js/modules/observer/events.js

@@ -38,6 +38,7 @@ class ModulesObserverConfig {
         MODULES_STATES_MANAGER_STATE_CHANGE: 'modules.statesManager.stateChange',
         MODULES_STATES_MANAGER_ACTION_START: 'modules.statesManager.actionStart',
         MODULES_STATES_MANAGER_ACTION_FINISH: 'modules.statesManager.actionFinish',
+        MODULES_STATES_MANAGER_STOP: 'modules.statesManager.stop',
         MODULES_SCENES_ORIENTATION_CHANGE: 'modules.scenes.orientation.change',
         MODULES_SCENES_NEW_RESOLUTION: 'modules.scenes.newResolution',
         MODULES_SCENES_NEW_SCENE_INIT: 'modules.scenes.newSceneInit',

package/src/js/modules/soundManager/soundSprite.js

@@ -115,7 +115,10 @@ class SoundSprite {
 
     setAllVolume(volume) {
         this._totalVolume = volume;
-        this._player._volume = volume;
+
+        if (this._player) {
+            this._player._volume = volume;
+        }
 
         if (this.canPlayCheck()) {
             this._updateVolume();

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

@@ -46,6 +46,9 @@ class ModulesStatesManagerAction {
     }
 
     terminate() {
+        if(this._forceDestroying)
+            return;
+
         if (!this._running) {
             Urso.logger.warn('ModulesStatesManagerAction: action run from terminating', this.name);
             this.run(() => { });
@@ -62,6 +65,9 @@ class ModulesStatesManagerAction {
     }
 
     _onFinish() {
+        if(this._forceDestroying)
+            return;
+        
         if (this.finished) {
             Urso.logger.error('ModulesStatesManagerAction: action alredy finished', this.name);
             return;
@@ -77,6 +83,15 @@ class ModulesStatesManagerAction {
         log(`%c action finish <--- ${this.name} (${elapsedTime}ms)`, 'color: blue');
         this._onFinishCallback();
     }
+
+    // Interrupts currently active actions on states manager stop
+    forceDestroy() {
+        if(this._forceDestroying || !this._running)
+            return;
+        
+        this._forceDestroying = true;
+        log(`%c action forceDestroyed <--- ${this.name}`, 'color: #F39986');
+    }
 }
 
 module.exports = ModulesStatesManagerAction;

package/src/js/modules/statesManager/controller.js

@@ -5,6 +5,7 @@ class ModulesStatesManagerController {
 
         this._configStates;
         this._currentState;
+        this._currentAction;
         this._forceNextStateKey = null;
         this._started = false;
         this._paused = false;
@@ -32,6 +33,21 @@ class ModulesStatesManagerController {
         this._nextState();
     }
 
+    restart() {
+        this.stop();
+
+        this._started = false;
+        this._paused = false;
+        
+        this.start();
+    }
+
+    stop() {
+        this._currentAction && this._currentAction.forceDestroy();
+        this._currentAction = null;
+        this.emit(Urso.events.MODULES_STATES_MANAGER_STOP);
+    }
+
     pause() {
         this._paused = true;
     }
@@ -56,7 +72,6 @@ class ModulesStatesManagerController {
     _iteratorConstructor() {
         let nextIndex = 0;
 
-
         const getNextStateByOrder = () => {
             let statesArray = Object.keys(this._configStates);
 
@@ -132,7 +147,8 @@ class ModulesStatesManagerController {
         //actions instances guard
         if (!classInstance.guard())
             return this._nextState();
-
+    
+        this._currentAction = classInstance;
         classInstance.run(this._nextState);
     }
 

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

@@ -54,7 +54,7 @@ class ModulesStatesManagerRace extends Action {
     }
 
     terminate() {
-        if (this._terminating)
+        if (this._terminating || this._forceDestroying)
             return;
 
         log(`%c action terminate X ${this.name}`, 'color: orange');
@@ -67,11 +67,25 @@ class ModulesStatesManagerRace extends Action {
     }
 
     _onFinish() {
+        if(this._forceDestroying)
+            return;
+
         this.finished = true;
         const elapsedTime = Urso.time.get() - this._startTime;
         log(`%c action finish <--- ${this.name}  (${elapsedTime}ms)`, 'color: orange');
         this._onFinishCallback();
     }
+
+    // Interrupts currently active actions on states manager stop
+    forceDestroy() {
+        this._forceDestroying = true;
+
+        for (let action of this._actions)
+            if (!action.finished)
+                action.forceDestroy();
+
+        log(`%c action forceDestroyed <--- ${this.name}`, 'color: #F39986');
+    }
 }
 
 module.exports = ModulesStatesManagerRace;

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

@@ -32,7 +32,7 @@ class ModulesStatesManagerSequence extends All {
     }
 
     terminate() {
-        if (this._terminating)
+        if (this._terminating || this._forceDestroying)
             return;
 
         log(`%c action terminate X ${this.name}`, 'color: orange');