@urso/core 0.2.7 → 0.3.2

package/src/js/modules/objects/models/checkbox.js

@@ -22,7 +22,7 @@ class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
         this.contents = [];
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus }) 
+            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
         });
 
         this.lable = Urso.helper.recursiveGet('lable', params, false);

package/src/js/modules/objects/models/slider.js

@@ -188,7 +188,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
             this.currentValueText.text = value;
 
         this._setFillMask();
-        this.emit(Urso.events.MODULES_OBJECTS_SLIDER_SET_NEW_VALUE, { name: this.name, value: value });
+        this.emit(Urso.events.MODULES_OBJECTS_SLIDER_SET_NEW_VALUE, { name: this.name, value: value, class: this.class });
     }
 
     _subscribeOnce() {

package/src/js/modules/objects/models/toggle.js

@@ -18,7 +18,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         super.setupParams(params);
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this._toggleStatus }) 
+            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
         });
 
         this.buttonFrames = {

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

@@ -6,6 +6,7 @@ class ModulesObserverConfig {
             MODULES_ASSETS_GROUP_LOADED: 'modules.assets.group.loaded',
             MODULES_ASSETS_LOAD_PROGRESS: 'modules.assets.load.progress',
             MODULES_ASSETS_LAZYLOAD_FINISHED: 'modules.assets.lazyLoad.finished',
+            MODULES_INSTANCES_MODES_CHANGED: 'modules.instances.modes.changed',
             MODULES_OBJECTS_BUTTON_PRESS: 'modules.objects.button.press',
             MODULES_OBJECTS_HIT_AREA_PRESS: 'modules.objects.hitArea.press',
             MODULES_OBJECTS_SLIDER_SET_NEW_VALUE: 'modules.objects.slider.setNewValue',
@@ -16,6 +17,8 @@ class ModulesObserverConfig {
             MODULES_SOUND_MANAGER_UPDATE_CFG: 'modules.soundManager.updateCfg',
             MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME: 'modules.soundManager.setGlobalVolume',
             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_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/scenes/resolutions.js

@@ -4,6 +4,7 @@ class ModulesScenesResolutions {
         this.singleton = true;
         this._activeResolution = false; //object
         this._templateSize = { orientation: 0, width: 0, height: 0 };
+        this._orientations = { landscape: 'landscape', portrait: 'portrait' }
         this._currentOrientation = null;
 
         this.refreshSceneSize = this.refreshSceneSize.bind(this);
@@ -40,9 +41,15 @@ class ModulesScenesResolutions {
         this._templateSize = this._calculateTemplateSize(currentResolution);
         this._applyResolutionToPixi(currentResolution);
 
+        console.log('[SCENE] New Orientation', orientation);
         console.log('[SCENE] New Resolution', currentResolution, 'windowSize:', windowSize);
         console.log('[SCENE] New Template Size', this._templateSize);
 
+        //update InstancesModes
+        Object.values(this._orientations).forEach((orientationValue) => Urso.removeInstancesMode(orientationValue + 'Orientation'));
+        Urso.addInstancesMode(orientation + 'Orientation');
+
+        //send new resolution event
         this.emit(Urso.events.MODULES_SCENES_NEW_RESOLUTION, { resolution: currentResolution, template: this._templateSize });
 
         if (this._currentOrientation !== this._templateSize.orientation) {
@@ -71,7 +78,7 @@ class ModulesScenesResolutions {
     }
 
     _getOrientation(windowSize) {
-        return windowSize.width > windowSize.height ? 'landscape' : 'portrait';  //todo move to constants
+        return windowSize.width > windowSize.height ? this._orientations.landscape : this._orientations.portrait;  //todo move to constants
     }
 
     _getResolutionConfig(windowSize) {

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

@@ -18,6 +18,8 @@ class ModulesStatesManagerAction {
     run(onFinishCallback) {
         log(`%c action run ---> ${this.name}`, 'color: blue');
 
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_START, this.name);
+
         this.finished = false;
         this._onFinishCallback = onFinishCallback;
 
@@ -47,6 +49,9 @@ class ModulesStatesManagerAction {
 
         this._terminating = false;
         this.finished = true;
+
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_FINISH, this.name);
+        
         log(`%c action finish <--- ${this.name}`, 'color: blue');
         this._onFinishCallback();
     }

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

@@ -36,11 +36,10 @@ class ModulesStatesManagerController {
                 if (this._currentState) {
                     const currentState = this._configStates[this._currentState];
 
-                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
-
+                    if (this.checkStateGuard(this._currentState) && currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
                         for (const stateKey of currentState.nextState) {
                             if (this.checkStateGuard(stateKey)) {
-                                nextIndex = statesArray.indexOf(stateKey);
+                                nextIndex = statesArray.indexOf(stateKey) + 1;
 
                                 if (nextIndex === -1) {
                                     Urso.logger.error('ModulesStatesManagerController: nextState name error', stateKey);

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

@@ -18,10 +18,10 @@ class ModulesStatesManagerRace extends Action {
     //can we start this action?
     guard() {
         for (let action of this._actions)
-            if (!action.guard())
-                return false;
+            if (action.guard())
+                return true;
 
-        return true;
+        return false;
     }
 
     run(onFinishCallback) {

package/src/js/modules/template/types.js

@@ -9,9 +9,8 @@ class ModulesTemplateTypes {
                 SPINE: 5,
                 BITMAPFONT: 6,
                 SOUND: 7,
-                DRAGONBONES: 8,
-                FONT: 9,
-                AUDIOSPRITE: 10
+                FONT: 8,
+                AUDIOSPRITE: 9
             },
 
             objects: {
@@ -31,13 +30,12 @@ class ModulesTemplateTypes {
                 COMPONENT: 14,
                 GROUP: 15,
                 IMAGES_ANIMATION: 16,
-                DRAGONBONES: 17,
-                ATLASIMAGE: 18,
-                SLIDER: 19,
-                TOGGLE: 20,
-                CHECKBOX: 21,
-                SCROLLBOX: 22,
-                TEXTINPUT: 23
+                ATLASIMAGE: 17,
+                SLIDER: 18,
+                TOGGLE: 19,
+                CHECKBOX: 20,
+                SCROLLBOX: 21,
+                TEXTINPUT: 22
             }
         }
     }

package/src/js/modules/transport/service.js

@@ -15,7 +15,9 @@ class ModulesTransportService {
     };
 
     init() {
-        this._createConnection();
+        if(Urso.config.useTransport){
+            this._createConnection();
+        }
     };
 
     send(message) {

package/src/js/modules/assets/models/dragonBones.js

@@ -1,27 +0,0 @@
-class ModulesAssetsModelsDragonBones extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.DRAGONBONES;
-
-        //for manual filenames setup
-        this.contents = Urso.helper.recursiveGet('contents', params, [
-            { type: Urso.types.assets.JSON, key: `${this.key}_skeletonJson`, path: this.skeletonJson },
-            { type: Urso.types.assets.JSON, key: `${this.key}_textureJson`, path: this.textureJson },
-            { type: Urso.types.assets.IMAGE, key: `${this.key}_textureImage`, path: this.textureImage }
-        ]);
-
-        this.path = false;
-        this.key = false;
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.skeletonJson = Urso.helper.recursiveGet('skeletonJson', params, false);
-        this.textureJson = Urso.helper.recursiveGet('textureJson', params, false);
-        this.textureImage = Urso.helper.recursiveGet('textureImage', params, false);
-    }
-}
-
-module.exports = ModulesAssetsModelsDragonBones;

package/src/js/modules/logic/buttons.js

@@ -1,120 +0,0 @@
-class ModulesLogicButtons {
-    constructor() {
-        this.DEFAULT_STATE_NAME = 'default'; //MOVE TO CFG
-        this._buttonsFactors = {};
-        this._cfg = null;
-
-        this._updateCfg();
-
-        if (!this._cfg || Urso.helper.arraysGetUniqElements(Object.keys(this._cfg.eventsCfg), Object.keys(this._cfg.buttonStates)).length > 0)
-            console.error('Modules.Logic.Buttons error: invalid Modules.Logic.Config.Buttons');
-    }
-
-    _updateCfg() {
-        this._cfg = this.getInstance('Config.Buttons');
-    };
-
-    _getButtonState(button, state) {
-        const buttonStates = this._cfg.buttonStates;
-
-        if (!buttonStates[button] || !buttonStates[button][state])
-            return false;
-
-        let states = buttonStates[button],
-            base = false,
-            k,
-            res = {};
-
-        if (state !== 'default') {
-            if (typeof states[state].base !== 'undefined')
-                base = states[state].base;
-            else
-                base = 'default';
-        }
-
-        if (base)
-            res = Urso.helper.objectClone(states[base]);
-
-        for (k in states[state])
-            res[k] = states[state][k];
-
-        return res;
-    };
-
-    _eventHandler(button, event) {
-        //todo _eventHandler?
-        this._addEventsMode(button, event);
-    };
-
-    _addEventsMode(button, event) {
-        if (!this._buttonsFactors[button])
-            this._buttonsFactors[button] = {};
-
-        //check removeEvents
-        if (event.removeEvents && event.removeEvents.length > 0) {
-            let i;
-
-            for (i = 0; i < event.removeEvents.length; i++)
-                if (this._buttonsFactors[button][event.removeEvents[i]])
-                    delete this._buttonsFactors[button][event.removeEvents[i]];
-        }
-
-        //if state -> write
-        if (event.state && !this._buttonsFactors[button][event.id])
-            this._buttonsFactors[button][event.id] = event;
-
-        //calc current state
-        let cur = false;
-
-        if (Object.keys(this._buttonsFactors[button]).length > 0)
-            cur = Object.values(this._buttonsFactors[button]).reduce(function (prev, current) {
-                return (prev.priority > current.priority) ? prev : current;
-            });
-
-        const state = this._getButtonState(button, (cur && cur.state) || this.DEFAULT_STATE_NAME);
-        this._changeButtonState(button, state);
-    };
-
-    beforeUpdateHandler() { };
-    afterUpdateHandler() { };
-
-    _changeButtonState(button, params) {
-        console.log(100, button, params)
-        params.disableFrame = params.frames.disableFrame;
-
-        const buttonsData = {};
-        buttonsData[button] = params;
-
-        this.beforeUpdateHandler(params);
-        this.emit('buttons.changeData', buttonsData);
-        this.emit('button.setFrames', buttonsData);
-        this.afterUpdateHandler(params);
-    };
-
-    _subscribeButtonToEvents(buttonKey, buttonSubscribeCfg) {
-        for (let i = 0; i < buttonSubscribeCfg.length; i++) {
-            const { event } = buttonSubscribeCfg[i];
-            this.addListener(event, () => this._eventHandler(buttonKey, buttonSubscribeCfg[i]), true);
-        }
-    };
-
-    _subscribeButtonsToEvents() {
-        for (let k in this._cfg.eventsCfg) {
-            this._subscribeButtonToEvents(k, this._cfg.eventsCfg[k])
-        }
-    };
-
-    _pressHandler(btn = {}) {
-        const state = this._getButtonState(btn.name, this.DEFAULT_STATE_NAME);
-
-        if (state && state.callback)
-            state.callback();
-    };
-
-    _subscribe() {
-        this._subscribeButtonsToEvents();
-        this.addListener(Urso.events.MODULES_OBJECTS_BUTTON_PRESS, this._pressHandler.bind(this), true);
-    };
-};
-
-module.exports = ModulesLogicButtons;

package/src/js/modules/logic/config/buttons.js

@@ -1,63 +0,0 @@
-class ModulesLogicConfigButtons {
-    constructor(){
-        this.singleton = true;
-        this.buttonStates = this.setButtonStates();
-        this.eventsCfgBlank = this.setEventsCfgBlanks();
-        this.eventsCfg = this.setEventsCfg();
-    }
-
-    setButtonStates(){
-        return {
-            spin: {
-                default: { //base
-                    'title': '',
-                    'callback': function () {
-                        this.emit('slotMachine.spinCommand');
-                    },
-                    'enabled': true,
-                    'visible': true
-                },
-                //default extend 
-                inactive: {
-                    'enabled': false
-                },
-                stop: {
-                    'callback': function () {
-                        this.emit('slotMachine.stopCommand');
-                    }
-                },
-                stopInactive: {
-                    'base': 'stop',
-                    'enabled': false
-                }
-            }
-        };
-    };
-
-    setEventsCfgBlanks(){
-        return {
-            globalUiGroup: [
-                {id: 1, event: 'Transport.close', state: false, priority: 100, removeEvents: [10, 11, 12, 13]},
-                {id: 2, event: 'freespinsStart', state: 'inactive', priority: 10},
-                {id: 3, event: 'freespinsStop', state: false, priority: 10, removeEvents: [1]}
-            ]
-        };
-    };
-
-    setEventsCfg(){
-        return {
-            spin: [
-                {id: 1, event: 'Transport.close', state: false, priority: 100, removeEvents: [10, 11, 12, 13]},
-                {id: 10, event: 'freespinsStart', state: 'inactive', priority: 40},
-                {id: 11, event: 'freespinsStop', state: false, priority: 40, removeEvents: [10]},
-                {id: 12, event: 'SpinStart', state: 'inactive', priority: 20},
-                {id: 13, event: 'SpinResponce', state: 'stop', priority: 20},
-                {id: 14, event: 'StopPress', state: 'stopInactive', priority: 20},
-                {id: 15, event: 'SpinStop', state: false, priority: 20, removeEvents: [12]}
-            ]
-        };
-    };
-
-};
-
-module.exports = ModulesLogicConfigButtons;

package/src/js/modules/objects/models/dragonBones.js

@@ -1,250 +0,0 @@
-const POOL_NAME = 'core.ObjectsModelsDragonBones.pool';
-
-class ModulesObjectsModelsDragonBones extends Urso.Core.Modules.Objects.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this._pool = this._checkPool();
-        this._poolMember = null;
-        this.type = Urso.types.objects.DRAGONBONES;
-
-        this._onStart = null;
-        this._onLoop = null;
-        this._onComplete = null;
-        this._onCompleteOnce = null;
-
-        this.setAnimationConfig({}, true);
-        this._addBaseObject();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
-
-        this.animation = {
-            timeScale: 1,
-            animationName: Urso.helper.recursiveGet('animation.animationName', params, false),
-            armatureName: Urso.helper.recursiveGet('animation.armatureName', params, false),
-            autoplay: Urso.helper.recursiveGet('animation.autoplay', params, false),
-            loop: Urso.helper.recursiveGet('animation.loop', params, false),
-            onStart: Urso.helper.recursiveGet('animation.onStart', params, false),
-            onLoop: Urso.helper.recursiveGet('animation.onLoop', params, false),
-            onComplete: Urso.helper.recursiveGet('animation.onComplete', params, false),
-            onCompleteOnce: Urso.helper.recursiveGet('animation.onCompleteOnce', params, false)
-        };
-    }
-
-    _addBaseObject() {
-        const assets = this._getAssets();
-
-        if (!this.animation.armatureName || !assets) {
-            this._baseObject = new PIXI.Sprite();
-            return;
-        }
-
-        this._createAnimationObject(assets);
-
-        const { animationName, autoplay, loop } = this.animation;
-
-        if (autoplay)
-            this.play(animationName, loop);
-    };
-
-    _getAssets() {
-        const skeletonJson = Urso.cache.getJson(`${this.assetKey}_skeletonJson`);
-        const textureJson = Urso.cache.getJson(`${this.assetKey}_textureJson`);
-        const textureImage = Urso.cache.getImage(`${this.assetKey}_textureImage`);
-
-        if (!skeletonJson || !textureJson || !textureImage) {
-            Urso.logger.error('ModulesObjectsModelsDragonBones assets error: no DragonBones object ' + this.assetKey);
-            return false;
-        }
-
-        return { skeletonJson, textureJson, textureImage };
-    }
-
-    _createAnimationObject(assets) {
-        const { armatureName } = this.animation;
-        this._poolMember = this._pool.getElement(armatureName, assets);
-        this._baseObject = this._poolMember.data;
-        this._setCommonFunctions.bind(this)();
-        this._setCallbacks();
-    }
-
-    _constructorFunction(armatureName, assets) {
-        const { skeletonJson, textureJson, textureImage } = assets;
-
-        const factory = Urso.DragonBones.PixiFactory.factory;
-
-        if (!factory._dragonBonesDataMap[skeletonJson.data.name])
-            factory.parseDragonBonesData(skeletonJson.data);
-
-        factory.parseTextureAtlasData(textureJson.data, textureImage.texture);
-
-        return factory.buildArmatureDisplay(armatureName);
-    }
-
-    _resetAnimationFunction(object) {  //this._baseObject
-        object.removeAllListeners(Urso.DragonBones.EventObject.START);
-        object.removeAllListeners(Urso.DragonBones.EventObject.LOOP_COMPLETE);
-        object.removeAllListeners(Urso.DragonBones.EventObject.COMPLETE);
-        object.filters = [];
-        return object;
-    }
-
-    _removeCallbacks(config) {
-        if (this._onStart && config.onStart) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.START, this._onStart);
-            this._onStart = null;
-        }
-
-        if (this._onLoop && config.onLoop) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
-            this._onLoop = null;
-        }
-
-        if (this._onComplete && config.onComplete) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
-            this._onComplete = null;
-        }
-
-        if (this._onCompleteOnce && config.onCompleteOnce) {
-            this._removeOnCompleteOnce(config);
-        }
-    };
-
-    _removeOnCompleteOnce() {
-        this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
-        this._onCompleteOnce = null;
-    }
-
-    _setCallbacks() {
-        if (this.animation.onStart) {
-            this._onStart = this.animation.onStart.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.START, this._onStart);
-        }
-
-        if (this.animation.onLoop) {
-            this._onLoop = this.animation.onLoop.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
-        }
-
-        if (this.animation.onComplete) {
-            this._onComplete = this.animation.onComplete.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
-        }
-
-        if (this.animation.onCompleteOnce) {
-            const onCompleteOnce = this.animation.onCompleteOnce.bind(this);
-
-            this.animation.onCompleteOnce = null;
-
-            this._onCompleteOnce = () => {
-                this._removeOnCompleteOnce();
-                onCompleteOnce();
-            };
-
-            this._baseObject.once(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
-        }
-    }
-
-    /**
-     *
-     * @param {*} config
-     * @param {boolean} [noObjectCreate] dont use this flag out of core
-     *
-     * config keys:
-     *      animationName
-     *      armatureName
-            autoplay
-            timeScale
-            onStart
-            onLoop
-            onComplete
-            onCompleteOnce
-     */
-    setAnimationConfig(config = {}, noObjectCreate) {
-        if (this.stop)
-            this.stop();
-
-        this.animation = {
-            ...this.animation,
-            ...config
-        };
-
-        if (config.timeScale)
-            this._baseObject.animation.timeScale = config.timeScale;
-
-        if (config.onStart || config.onLoop || config.onComplete || config.onCompleteOnce) {
-            this._removeCallbacks(config);
-            this._setCallbacks();
-        }
-
-        if (noObjectCreate || !config.armatureName)
-            return;
-
-        let parent = null;
-
-        if (this._baseObject) {
-            parent = this._baseObject.parent;
-            this._customDestroy();
-        }
-
-        const assets = this._getAssets();
-
-        if (assets)
-            this._createAnimationObject(assets);
-
-        if (parent) {
-            parent.addChild(this._baseObject);
-            //update common properties after adding to apply model settings
-            Urso.objects._updateCommonProperties(this);
-        }
-    }
-
-    /**
-     * run play animation
-     * @param {number} times 
-     */
-    play(animationName, loopFlag = false) {
-        if (!this._baseObject.animation) {
-            Urso.logger.error(`DragonBones animation not found!`);
-            return;
-        }
-
-        if (this.stop)
-            this.stop();
-
-        const times = (loopFlag) ? -1 : 1;
-
-        this._baseObject.animation.play(animationName, times);
-    }
-
-    _setCommonFunctions() {
-        this.stop = this._baseObject.animation.stop.bind(this._baseObject.animation);
-    }
-
-    _customDestroy() {
-        this._pool.putElement(this._poolMember);
-
-        if (this._baseObject.parent)
-            this._baseObject.parent.removeChild(this._baseObject);
-
-        this._baseObject = null;
-    }
-
-    _checkPool() {
-        const pool = Urso.localData.get(POOL_NAME);
-
-        if (pool)
-            return pool;
-
-        const newPool = new Urso.Game.Lib.ObjectPool(this._constructorFunction.bind(this), this._resetAnimationFunction.bind(this));
-        Urso.localData.set(POOL_NAME, newPool);
-
-        return newPool;
-    }
-}
-
-module.exports = ModulesObjectsModelsDragonBones;