@urso/core 0.2.7 → 0.2.8

package/package.json

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

package/src/js/app.js

@@ -44,8 +44,6 @@ class App {
 
         //Modules
         Urso.assets = Urso.getInstance('Modules.Assets.Controller');
-        Urso.buttons = Urso.getInstance('Modules.Buttons.Controller');
-        // TODO: CHECK FOR EVENT TO START COMMUNICATION WITH SERVER
         Urso.transport = Urso.getInstance('Modules.Transport.Controller');
         Urso.logic = Urso.getInstance('Modules.Logic.Controller');
         Urso.objects = Urso.getInstance('Modules.Objects.Controller');
@@ -57,6 +55,9 @@ class App {
         //set title
         document.title = Urso.config.title;
 
+        //device type mode
+        Urso.addInstancesMode(!Urso.helper.mobileAndTabletCheck() ? 'desktop' : 'mobile');
+
         //App.run
         Urso.device.whenReady(() => {
             Urso.assets.updateQuality();

package/src/js/config/main.js

@@ -3,7 +3,8 @@ let ConfigMain = {
     mode: "development", // development/production/testing
     extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
     defaultScene: 'play', //default scene to display
-    useBinPath: false 
+    useBinPath: false, // use assets from bin directory
+    useTransport: false // use transport module for connetcting with server
 };
 
 module.exports = ConfigMain;

package/src/js/lib/helper.js

@@ -123,6 +123,21 @@ class LibHelper {
         return c;
     }
 
+    /**
+     * Swap key with value in object
+     * @param {Object} obj
+     * @returns {Object}
+     */
+    objectFlip(obj) {
+        const ret = {};
+
+        Object.keys(obj).forEach(key => {
+            ret[obj[key]] = key;
+        });
+
+        return ret;
+    }
+
     /**
      * recursive set value to object by key
      * @param {String} key 
@@ -208,8 +223,8 @@ class LibHelper {
      */
     transpose(matrix) {
         return Object.keys(matrix[0])
-        .map(colNumber => matrix
-            .map(rowNumber => rowNumber[colNumber]));
+            .map(colNumber => matrix
+                .map(rowNumber => rowNumber[colNumber]));
     }
 
     /**

package/src/js/modules/assets/controller.js

@@ -6,16 +6,18 @@ class ModulesAssetsController {
     /**
      * Update quality
      */
-    updateQuality(){
-        if(Urso.config.useBinPath){
+    updateQuality() {
+        if (Urso.config.useBinPath) {
             this.getInstance('Service').updateQuality();
         }
+
+        console.log('[ASSETS] Quality set to', this.getInstance('Service').getQuality());
     }
 
     /**
      * Current quality getter
      */
-    getQuality(){
+    getQuality() {
         this.getInstance('Service').getQuality();
     }
 

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

@@ -1,20 +1,20 @@
 class ModulesAssetsService {
     constructor() {
         this.singleton = true;
-        
+
         this.assets = {};
 
         this._currentQuality = 'auto';
         this._addedAssetsCache = [];
     };
 
-    getQuality(){
+    getQuality() {
         return this._currentQuality;
     }
 
-    updateQuality(){
+    updateQuality() {
         this._currentQuality = this._detectQuality();
-        Urso.addInstancesMode(this._currentQuality);
+        Urso.addInstancesMode(this._currentQuality + 'Quality');
     }
 
     sortAssets(assets) {
@@ -74,7 +74,7 @@ class ModulesAssetsService {
 
     _processLoadedAtlases(group) {
         const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
-        
+
         for (let assetModel of atlases) {
             const assetKey = assetModel.key;
             let imageData = Urso.cache.getAtlas(assetKey);
@@ -85,7 +85,7 @@ class ModulesAssetsService {
                 let texture = imageData.textures[i];
                 let newFilename = frame.filename;
 
-                if(frame.filename.indexOf('/') === -1)
+                if (frame.filename.indexOf('/') === -1)
                     newFilename = folderPath + '/' + frame.filename;
 
                 Urso.cache.addFile(newFilename, texture);
@@ -146,7 +146,7 @@ class ModulesAssetsService {
         if (!imageData) {
             //from atlas ?!
             let texture = Urso.cache.getFile(assetModel.path);
-            
+
             if (!texture)
                 return Urso.logger.error('ModulesAssetsService process Loaded Image error: no image ', assetModel);
 
@@ -256,7 +256,7 @@ class ModulesAssetsService {
         this.loadGroup(groupName, () => { this._continueLazyLoad(step + 1); })
     }
 
-    _qualityReducer(qualityFactors, widthFactor){
+    _qualityReducer(qualityFactors, widthFactor) {
         return [(acc, val) => {
             if (acc === null) {
                 return val;
@@ -268,24 +268,24 @@ class ModulesAssetsService {
             const nextQuality = (currentQuality > qualityFactor && qualityFactor >= widthFactor)
                 || (qualityFactor >= widthFactor && widthFactor > currentQuality)
                 || (widthFactor >= qualityFactor && qualityFactor > currentQuality);
-            
+
             return nextQuality ? val : acc;
-                
+
         }, null]
     }
 
-    _detectQuality(){
+    _detectQuality() {
         const { qualityFactors } = this.getInstance('Config');
         const userQuality = Urso.helper.parseGetParams()['quality'];
-        
-        if(userQuality && qualityFactors[userQuality]){
+
+        if (userQuality && qualityFactors[userQuality]) {
             return userQuality;
         }
-        
+
         return this._calculateQuality(qualityFactors);
     }
 
-    _calculateQuality(qualityFactors){
+    _calculateQuality(qualityFactors) {
         const { android, iOS, iPad, macOS } = Urso.device;
         const isMobile = android || iOS || iPad;
 
@@ -293,12 +293,12 @@ class ModulesAssetsService {
             return 'high';
         }
 
-        if(macOS && iPad) {
+        if (macOS && iPad) {
             return 'medium';
         }
 
         const resCfg = Urso.getInstance('Modules.Scenes.ResolutionsConfig').contents[0];
-        
+
         const { devicePixelRatio } = window;
         let { width, height } = screen;
 
@@ -311,7 +311,7 @@ class ModulesAssetsService {
         }
 
         const widthFactor = width / resCfg.width;
-    
+
         return Object
             .keys(qualityFactors)
             .reduce(...this._qualityReducer(qualityFactors, widthFactor));

package/src/js/modules/instances/controller.js

@@ -29,7 +29,7 @@ class ModulesInstancesController {
             return false;
 
         this._modes.push(mode);
-
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
         return true;
     }
 
@@ -40,6 +40,7 @@ class ModulesInstancesController {
             return false;
 
         this._modes.splice(index, 1);
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
         return true;
     }
 

package/src/js/modules/logic/_info.js

@@ -1,5 +1,4 @@
 Urso.Core.Modules.Logic = {
-    Buttons: require('./buttons'),
     Controller: require('./controller.js'),
     Sounds: require('./sounds.js')
 };

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

@@ -1,4 +1,3 @@
 Urso.Core.Modules.Logic.Config = {
-    Buttons: require('./buttons.js'),
     Sounds: require('./sounds.js')
 };

package/src/js/modules/objects/controller.js

@@ -8,6 +8,7 @@ class ModulesObjectsController {
 
         this._newResolutionHandler = this._newResolutionHandler.bind(this);
         this._resetWorld = this._resetWorld.bind(this);
+        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
     };
 
     create(objects, parent, doNotRefreshStylesFlag) { //TODO parse template for assets and objects (groups, components)
@@ -106,9 +107,14 @@ class ModulesObjectsController {
         this.getInstance('Create').resetWorld();
     }
 
+    _applyClassesToWorld() {
+        this.getInstance('Create').applyClassesToWorld();
+    }
+
     _subscribeOnce() {
         this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
         this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
+        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
     }
 }
 

package/src/js/modules/objects/create.js

@@ -4,6 +4,7 @@ class ModulesObjectsCreate {
 
         this._world = null;
         this._counter = 0;
+        this._objectsTypesFlipped;
     }
 
     _checkWorld() {
@@ -23,6 +24,7 @@ class ModulesObjectsCreate {
 
         this.updateWorldBounds({ template: Urso.scenes.getTemplateSize() })
         this.getInstance('Cache').reset();
+        this.applyClassesToWorld();
         this._addToCache(proxy);
     }
 
@@ -34,6 +36,23 @@ class ModulesObjectsCreate {
         Urso.objects._safeSetValueToTarget(this._world, 'height', params.template.height);
     }
 
+    applyClassesToWorld() {
+        if (!this._world) {
+            return; //world do not created yet
+        }
+
+        //remove old classes
+        if (this._world.class) {
+            this._world.class.split(' ').forEach((className) => this._world.removeClass(className, true));
+        }
+
+        //apply new classes
+        Urso.getInstancesModes().forEach((className) => this._world.addClass(className, true));
+
+        //refresh styles
+        Urso.objects.refreshStyles();
+    }
+
     _getUid() {
         this._counter++;
         return 'object_' + this._counter;
@@ -56,71 +75,39 @@ class ModulesObjectsCreate {
             object.contents = []; //clear contents. We will put here just correct models
         }
 
+        if (!this._objectsTypesFlipped)
+            this._objectsTypesFlipped = Urso.helper.objectFlip(Urso.types.objects);
+
         //set uid
         object._uid = this._getUid();
 
         switch (object.type) {
+            //exceptions with camelCase namings
+            case Urso.types.objects.ATLASIMAGE:
+                model = this.getInstance('Models.AtlasImage', object);
+                break;
             case Urso.types.objects.BITMAPTEXT:
                 model = this.getInstance('Models.BitmapText', object);
                 break;
-            case Urso.types.objects.BUTTON:
-                model = this.getInstance('Models.Button', object);
-                break;
-            case Urso.types.objects.COMPONENT:
-                model = this.getInstance('Models.Component', object);
-                break;
-            case Urso.types.objects.CONTAINER:
-                model = this.getInstance('Models.Container', object);
-                break;
             case Urso.types.objects.DRAGONBONES:
                 model = this.getInstance('Models.DragonBones', object);
                 break;
-            case Urso.types.objects.GROUP:
-                model = this.getInstance('Models.Group', object);
-                break;
-            case Urso.types.objects.IMAGE:
-                model = this.getInstance('Models.Image', object);
-                break;
-            case Urso.types.objects.ATLASIMAGE:
-                model = this.getInstance('Models.AtlasImage', object);
-                break;
-            case Urso.types.objects.IMAGES_ANIMATION:
-                model = this.getInstance('Models.ImagesAnimation', object);
-                break;
-            case Urso.types.objects.MASK:
-                model = this.getInstance('Models.Mask', object);
-                break;
-            case Urso.types.objects.SPINE:
-                model = this.getInstance('Models.Spine', object);
-                break;
-            case Urso.types.objects.TEXT:
-                model = this.getInstance('Models.Text', object);
-                break;
-            case Urso.types.objects.GRAPHICS:
-                model = this.getInstance('Models.Graphics', object);
-                break;
             case Urso.types.objects.HITAREA:
                 model = this.getInstance('Models.HitArea', object);
                 break;
-            case Urso.types.objects.EMITTER:
-                model = this.getInstance('Models.Emitter', object);
-                break;
-            case Urso.types.objects.SLIDER:
-                model = this.getInstance('Models.Slider', object);
-                break;
-            case Urso.types.objects.TOGGLE:
-                model = this.getInstance('Models.Toggle', object);
-                break;
-            case Urso.types.objects.CHECKBOX:
-                model = this.getInstance('Models.Checkbox', object);
-                break;
-            case Urso.types.objects.SCROLLBOX:
-                model = this.getInstance('Models.Scrollbox', object);
+            case Urso.types.objects.IMAGES_ANIMATION:
+                model = this.getInstance('Models.ImagesAnimation', object);
                 break;
             case Urso.types.objects.TEXTINPUT:
                 model = this.getInstance('Models.TextInput', object);
                 break;
+
             default:
+                const objectName = Urso.helper.capitaliseFirstLetter(
+                    this._objectsTypesFlipped[object.type].toLowerCase()
+                );
+
+                model = this.getInstance(`Models.${objectName}`, object);
                 break;
         }
 

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',

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/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/transport/service.js

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

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;