@urso/core 0.1.95 → 0.2.0-dev

package/src/js/components/loader/template.js

@@ -1,71 +1,71 @@
-class ComponentsLoaderTemplate {
-    constructor() {
-        this.styles = {
-            '.loadingTextStyle': {
-                fill: 0xFFFFFF,
-                fontSize: 32,
-                fontWeight: 'bold'
-            }
-        };
-
-        this.assets = [];
-
-        this.objects = [
-            {
-                type: Urso.types.objects.CONTAINER,
-                name: 'loaderContainer',
-                contents: [
-                    {
-                        type: Urso.types.objects.GRAPHICS,
-                        name: 'bgLoader',
-                        figure: {
-                            rectangle: [0, 20, 500, 20],
-                            fillColor: 0x66f542
-                        }
-                    },
-                    {
-                        type: Urso.types.objects.CONTAINER,
-                        contents: [
-                            {
-                                type: Urso.types.objects.GRAPHICS,
-                                figure: {
-                                    rectangle: [4, 24, 492, 13],
-                                }
-                            },
-                            {
-                                type: Urso.types.objects.GRAPHICS,
-                                name: 'loaderBg',
-                                figure: {
-                                    rectangle: [4, 24, 492, 13],
-                                    fillColor: 0x66f542
-                                }
-                            },
-                            {
-                                type: Urso.types.objects.GRAPHICS,
-                                name: 'loaderBgMask',
-                                figure: {
-                                    rectangle: [4, 24, 492, 13]
-                                }
-                            },
-                            {
-                                type: Urso.types.objects.CONTAINER,
-                                x: 260,
-                                y: 50,
-                                contents: [
-                                    {
-                                        type: Urso.types.objects.TEXT,
-                                        class: 'loadingTextStyle loadAmountText',
-                                        anchorX: 0.5,
-                                        text: '100%'
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ];
-    };
-};
-
+class ComponentsLoaderTemplate {
+    constructor() {
+        this.styles = {
+            '.loadingTextStyle': {
+                fill: 0xFFFFFF,
+                fontSize: 32,
+                fontWeight: 'bold'
+            }
+        };
+
+        this.assets = [];
+
+        this.objects = [
+            {
+                type: Urso.types.objects.CONTAINER,
+                name: 'loaderContainer',
+                contents: [
+                    {
+                        type: Urso.types.objects.GRAPHICS,
+                        name: 'bgLoader',
+                        figure: {
+                            rectangle: [0, 20, 500, 20],
+                            fillColor: 0x66f542
+                        }
+                    },
+                    {
+                        type: Urso.types.objects.CONTAINER,
+                        contents: [
+                            {
+                                type: Urso.types.objects.GRAPHICS,
+                                figure: {
+                                    rectangle: [4, 24, 492, 13],
+                                }
+                            },
+                            {
+                                type: Urso.types.objects.GRAPHICS,
+                                name: 'loaderBg',
+                                figure: {
+                                    rectangle: [4, 24, 492, 13],
+                                    fillColor: 0x66f542
+                                }
+                            },
+                            {
+                                type: Urso.types.objects.GRAPHICS,
+                                name: 'loaderBgMask',
+                                figure: {
+                                    rectangle: [4, 24, 492, 13]
+                                }
+                            },
+                            {
+                                type: Urso.types.objects.CONTAINER,
+                                x: 260,
+                                y: 50,
+                                contents: [
+                                    {
+                                        type: Urso.types.objects.TEXT,
+                                        class: 'loadingTextStyle loadAmountText',
+                                        anchorX: 0.5,
+                                        text: '100%'
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ];
+    };
+};
+
 module.exports = ComponentsLoaderTemplate;

package/src/js/components/soundInitialPopup/_info.js

@@ -1,4 +1,4 @@
-Urso.Core.Components.SoundInitialPopup = {
-    Controller: require('./controller.js'),
-    Template: require('./template.js'),
+Urso.Core.Components.SoundInitialPopup = {
+    Controller: require('./controller.js'),
+    Template: require('./template.js'),
 }

package/src/js/components/soundInitialPopup/controller.js

@@ -1,43 +1,43 @@
-ComponentsBaseController = require('./../base/controller.js');
-
-class ComponentsSoundInitialPopupController extends ComponentsBaseController {
-
-    constructor() {
-        super();
-
-        this.yesButton = null;
-        this.noButton = null;
-    }
-
-    create() {
-        this.yesButton = this.common.findOne('^soundInitialPopupButtonYesGraphics');
-        this.noButton = this.common.findOne('^soundInitialPopupButtonNoGraphics');
-    }
-
-    _tintHandler({ buttonName, pointerOver }) {
-        let button = buttonName === 'yes' ? this.yesButton : this.noButton;
-        button._baseObject.tint = (pointerOver) ? 0xd4be69 : 0xFFFFFF;
-    }
-
-    _buttonPressHandler({ name }) {
-        switch (name) {
-            case 'soundInitialPopupButtonYesHit':
-                this.emit(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, 1);
-                break;
-            case 'soundInitialPopupButtonNoHit':
-                this.emit(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, 0);
-                break;
-            default:
-                return;
-        }
-
-        this.common.object.visible = false;
-    }
-
-    _subscribeOnce() {
-        this.addListener('components.soundInitialPopup.pointerAction.popupButton', this._tintHandler.bind(this));
-        this.addListener(Urso.events.MODULES_OBJECTS_HIT_AREA_PRESS, this._buttonPressHandler.bind(this));
-    }
-}
-
+ComponentsBaseController = require('./../base/controller.js');
+
+class ComponentsSoundInitialPopupController extends ComponentsBaseController {
+
+    constructor() {
+        super();
+
+        this.yesButton = null;
+        this.noButton = null;
+    }
+
+    create() {
+        this.yesButton = this.common.findOne('^soundInitialPopupButtonYesGraphics');
+        this.noButton = this.common.findOne('^soundInitialPopupButtonNoGraphics');
+    }
+
+    _tintHandler({ buttonName, pointerOver }) {
+        let button = buttonName === 'yes' ? this.yesButton : this.noButton;
+        button._baseObject.tint = (pointerOver) ? 0xd4be69 : 0xFFFFFF;
+    }
+
+    _buttonPressHandler({ name }) {
+        switch (name) {
+            case 'soundInitialPopupButtonYesHit':
+                this.emit(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, 1);
+                break;
+            case 'soundInitialPopupButtonNoHit':
+                this.emit(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, 0);
+                break;
+            default:
+                return;
+        }
+
+        this.common.object.visible = false;
+    }
+
+    _subscribeOnce() {
+        this.addListener('components.soundInitialPopup.pointerAction.popupButton', this._tintHandler.bind(this));
+        this.addListener(Urso.events.MODULES_OBJECTS_HIT_AREA_PRESS, this._buttonPressHandler.bind(this));
+    }
+}
+
 module.exports = ComponentsSoundInitialPopupController;

package/src/js/components/soundInitialPopup/template.js

@@ -1,110 +1,110 @@
-class ComponentsSoundInitialPopupTemplate {
-    constructor(){
-
-        this.objects = [
-            { 
-                type: Urso.types.objects.HITAREA,
-                x: -50,
-                y: -50,
-                width: 2000,
-                height: 1200
-            },
-            { 
-                type: Urso.types.objects.GRAPHICS,
-                figure: {
-                    rectangle: [0, 0, 1920, 1080],
-                    fillColor: 'black'
-                }
-            },
-            { 
-                type: Urso.types.objects.TEXT,
-                y: -100,
-                alignX: 'center',
-                alignY: 'center',
-                anchorX: 0.5,
-                anchorY: 0.5,
-                fill: 'gray',
-                fontFamilu: 'Helvetica',
-                fontSize: 72,
-                fontWeight: 800,
-                text: 'Enable sound?'
-            },
-            { 
-                type: Urso.types.objects.CONTAINER,
-                x: 600,
-                y: 650,
-                with: 200,
-                height: 70,
-                contents: [
-                    { 
-                        type: Urso.types.objects.GRAPHICS,
-                        name: 'soundInitialPopupButtonYesGraphics',
-                        figure: {
-                            rectangle: [0, 0, 200, 70],
-                            fillColor: 0xd8ac03
-                        }
-                    },
-                    { 
-                        type: Urso.types.objects.TEXT,
-                        anchorX: 0.5,
-                        anchorY: 0.5,
-                        x: 100,
-                        alignY: 'center',
-                        fill: 'black',
-                        fontFamilu: 'Helvetica',
-                        fontSize: 40,
-                        fontWeight: 800,
-                        text: 'YES'
-                    },
-                    { 
-                        type: Urso.types.objects.HITAREA,
-                        name: 'soundInitialPopupButtonYesHit',
-                        width: 200,
-                        height: 70,
-                        onOverCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'yes', pointerOver: true}),
-                        onOutCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'yes', pointerOver: false}),
-                    },
-                ]
-            },
-            { 
-                type: Urso.types.objects.CONTAINER,
-                x: 1150,
-                y: 650,
-                with: 200,
-                height: 70,
-                contents: [
-                    { 
-                        type: Urso.types.objects.GRAPHICS,
-                        name: 'soundInitialPopupButtonNoGraphics',
-                        figure: {
-                            rectangle: [0, 0, 200, 70],
-                            fillColor: 0xd8ac03
-                        }
-                    },
-                    { 
-                        type: Urso.types.objects.TEXT,
-                        anchorX: 0.5,
-                        anchorY: 0.5,
-                        x: 100,
-                        alignY: 'center',
-                        fill: 'black',
-                        fontFamilu: 'Helvetica',
-                        fontSize: 40,
-                        fontWeight: 800,
-                        text: 'NO'
-                    },
-                    { 
-                        type: Urso.types.objects.HITAREA,
-                        name: 'soundInitialPopupButtonNoHit',
-                        width: 200,
-                        height: 70,
-                        onOverCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'no', pointerOver: true}),
-                        onOutCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'no', pointerOver: false}),
-                    },
-                ]
-            }
-        ]
-    }
-};
-
+class ComponentsSoundInitialPopupTemplate {
+    constructor(){
+
+        this.objects = [
+            { 
+                type: Urso.types.objects.HITAREA,
+                x: -50,
+                y: -50,
+                width: 2000,
+                height: 1200
+            },
+            { 
+                type: Urso.types.objects.GRAPHICS,
+                figure: {
+                    rectangle: [0, 0, 1920, 1080],
+                    fillColor: 'black'
+                }
+            },
+            { 
+                type: Urso.types.objects.TEXT,
+                y: -100,
+                alignX: 'center',
+                alignY: 'center',
+                anchorX: 0.5,
+                anchorY: 0.5,
+                fill: 'gray',
+                fontFamilu: 'Helvetica',
+                fontSize: 72,
+                fontWeight: 800,
+                text: 'Enable sound?'
+            },
+            { 
+                type: Urso.types.objects.CONTAINER,
+                x: 600,
+                y: 650,
+                with: 200,
+                height: 70,
+                contents: [
+                    { 
+                        type: Urso.types.objects.GRAPHICS,
+                        name: 'soundInitialPopupButtonYesGraphics',
+                        figure: {
+                            rectangle: [0, 0, 200, 70],
+                            fillColor: 0xd8ac03
+                        }
+                    },
+                    { 
+                        type: Urso.types.objects.TEXT,
+                        anchorX: 0.5,
+                        anchorY: 0.5,
+                        x: 100,
+                        alignY: 'center',
+                        fill: 'black',
+                        fontFamilu: 'Helvetica',
+                        fontSize: 40,
+                        fontWeight: 800,
+                        text: 'YES'
+                    },
+                    { 
+                        type: Urso.types.objects.HITAREA,
+                        name: 'soundInitialPopupButtonYesHit',
+                        width: 200,
+                        height: 70,
+                        onOverCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'yes', pointerOver: true}),
+                        onOutCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'yes', pointerOver: false}),
+                    },
+                ]
+            },
+            { 
+                type: Urso.types.objects.CONTAINER,
+                x: 1150,
+                y: 650,
+                with: 200,
+                height: 70,
+                contents: [
+                    { 
+                        type: Urso.types.objects.GRAPHICS,
+                        name: 'soundInitialPopupButtonNoGraphics',
+                        figure: {
+                            rectangle: [0, 0, 200, 70],
+                            fillColor: 0xd8ac03
+                        }
+                    },
+                    { 
+                        type: Urso.types.objects.TEXT,
+                        anchorX: 0.5,
+                        anchorY: 0.5,
+                        x: 100,
+                        alignY: 'center',
+                        fill: 'black',
+                        fontFamilu: 'Helvetica',
+                        fontSize: 40,
+                        fontWeight: 800,
+                        text: 'NO'
+                    },
+                    { 
+                        type: Urso.types.objects.HITAREA,
+                        name: 'soundInitialPopupButtonNoHit',
+                        width: 200,
+                        height: 70,
+                        onOverCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'no', pointerOver: true}),
+                        onOutCallback: () => this.emit('components.soundInitialPopup.pointerAction.popupButton', {buttonName: 'no', pointerOver: false}),
+                    },
+                ]
+            }
+        ]
+    }
+};
+
 module.exports = ComponentsSoundInitialPopupTemplate;

package/src/js/components/stateDriven/_info.js

@@ -1,3 +1,4 @@
-Urso.Core.Components.StateDriven = {
-    Controller: require('./controller.js')
-};
+Urso.Core.Components.StateDriven = {
+    ActionConfig: require('./actionConfig.js'),
+    Controller: require('./controller.js')
+};

package/src/js/components/stateDriven/actionConfig.js

@@ -0,0 +1,7 @@
+class ComponentsStateDrivenActionConfig  {
+
+    //TODO run logic and save finish callback and autocall it
+
+}
+
+module.exports = ComponentsStateDrivenActionConfig;

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

@@ -1,52 +1,61 @@
-ComponentsBaseController = require('./../base/controller.js');
-
-class ComponentsStateDrivenController extends ComponentsBaseController {
-//TODO subscribe to N actions
-    constructor(options) {
-        super(options);
-        //todo set guard
-        this.eventBlank = 'components.example';
-
-        this._finished = this._finished.bind(this);
-        this._terminated = this._terminated.bind(this);
-    }
-
-    _setGuard() {
-        Urso.statesManager.setGuard(this.eventBlank, this._guard.bind(this));
-    }
-
-    _subscribeOnce() {
-        this._setGuard();
-        this.addListener(`${this.eventBlank}.onStart`, this._start.bind(this));
-        this.addListener(`${this.eventBlank}.onTerminate`, this._terminate.bind(this));
-    }
-
-    _guard() {
-        return true; //or rewrite
-    }
-
-    _start() {
-        Urso.logger.warn('ComponentsStateDrivenController warning: rewrite _start to make your logic', this);
-        this._finished();
-    }
-
-    _finished() {
-        this.emit(`${this.eventBlank}.completed`);
-    }
-
-    _terminate() {
-        Urso.logger.warn('ComponentsStateDrivenController warning: rewrite _terminate to make your logic', this);
-        this._terminated();
-    }
-
-    _terminated() {
-        this.emit(`${this.eventBlank}.terminated`);
-    }
-
-    destroy() {
-        Urso.statesManager.removeGuard(key, guard)
-    }
-
-}
-
-module.exports = ComponentsStateDrivenController;
+ComponentsBaseController = require('./../base/controller.js');
+
+class ComponentsStateDrivenController extends ComponentsBaseController {
+
+    configStates = {
+        /*IDLE: {
+            guard: () => { log(123, 'IDLE guard'); return true; }
+        }*/
+    };
+
+    configActions = {
+        /*startSpin: {
+            guard: () => { log(123, 'guard'); return true; },
+            run: (finish) => { log(123, 'run'); finish(); },
+            terminate: () => { log(123, 'terminate'); }
+        }*/
+    };
+
+    //TODO subscribe to N actions
+    constructor(options) {
+        super(options);
+
+        this._processStates();
+        this._processActions();
+    }
+
+    _processStates() {
+        for (const stateKey in this.configStates) {
+            Urso.statesManager.setStateGuard(stateKey, this.configStates[stateKey].guard.bind(this));
+        }
+    }
+
+    _processActions() {
+        for (const actionKey in this.configActions) {
+
+            //const actionCfg = this.getInstance('ActionConfig', this.configActions[actionKey]);
+            const actionCfg = this.configActions[actionKey];
+
+            if (actionCfg.run)
+                Urso.statesManager.addActionRun(actionKey, actionCfg.run.bind(this));
+            else {
+                Urso.logger.error('ComponentsStateDrivenController: no run function in config', actionKey, this);
+                continue;
+            }
+
+            if (actionCfg.terminate)
+                Urso.statesManager.addActionTerminate(actionKey, actionCfg.terminate.bind(this));
+
+            if (actionCfg.guard)
+                Urso.statesManager.addActionGuard(actionKey, actionCfg.guard.bind(this));
+        }
+    }
+
+    //todo
+    destroy() {
+        Urso.logger.error('ComponentsStateDrivenController will remove States and Actions by configs');
+    }
+
+}
+
+module.exports = ComponentsStateDrivenController;

package/src/js/config/load.js

@@ -1,5 +1,5 @@
-require('./../components/_info.js');
-require('./../extra/_info.js');
-require('./../lib/_info.js');
-require('./../modules/_info.js');
-require('./../templates/_info.js');
+require('./../components/_info.js');
+require('./../extra/_info.js');
+require('./../lib/_info.js');
+require('./../modules/_info.js');
+require('./../templates/_info.js');

package/src/js/config/main.js

@@ -1,9 +1,9 @@
-let ConfigMain = {
-    title: 'Urso', //game title
-    mode: "development", // development/production/testing
-    extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
-    defaultScene: 'play', //default scene to display
-    useBinPath: false 
-};
-
-module.exports = ConfigMain;
+let ConfigMain = {
+    title: 'Urso', //game title
+    mode: "development", // development/production/testing
+    extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
+    defaultScene: 'play', //default scene to display
+    useBinPath: false 
+};
+
+module.exports = ConfigMain;