@urso/core 0.3.9 → 0.4.0

package/src/js/modules/logic/sounds.js

@@ -1,96 +1,96 @@
-class ModulesLogicSounds {
-    constructor() {
-        this._cfg = null;
-
-        this._setDefaultConfig();
-        this._loadedSounds = {};
-    }
-
-    _setDefaultConfig() {
-        const cfg = this.getInstance('Config.Sounds');
-        this._cfg = cfg.soundsConfig;
-    };
-
-    _parseConfig() {
-        const mappedCfg = {};
-        const configs = Object.keys(this._cfg);
-
-        configs.forEach(configName => {
-            const cfg = this._cfg[configName];
-
-            cfg.forEach(obj => {
-                const params = {
-                    action: obj.action || 'play',
-                    relaunch: obj.relaunch || false,
-                    loop: obj.loop || false,
-                    volume: obj.volume || 1
-                };
-
-                if (!mappedCfg[obj.soundKey])
-                    mappedCfg[obj.soundKey] = {
-                        events: {}
-                    };
-
-                mappedCfg[obj.soundKey].events[obj.event] = params;
-            });
-        });
-
-        return mappedCfg;
-    };
-
-    _getUploadedSounds(audiospriteData) {
-        const newAudiospriteData = {};
-
-        for (const key in audiospriteData) {
-            if (!this._loadedSounds[key]) {
-                this._loadedSounds[key] = audiospriteData[key];
-                newAudiospriteData[key] = audiospriteData[key];
-            }
-        }
-
-        return newAudiospriteData;
-    };
-
-
-    _getLoadedAudiospritesData() {
-        const allAudiosprites = Urso.cache.assetsList.sound;
-        const audiospriteData = {};
-
-        for (let [key, audiosprite] of Object.entries(allAudiosprites)) {
-            const audiospriteKey = key.replace('_audiospriteSound', '');
-            const jsonKey = audiospriteKey + '_audiospriteJson';
-            const json = Urso.cache.assetsList.json[jsonKey];
-
-            if (!json)
-                continue;
-
-            audiospriteData[audiospriteKey] = { json: json.data, audiosprite: audiosprite.data };
-        }
-
-        return audiospriteData;
-    }
-
-    _groupLoadedHandler() {
-        const audiospriteData = this._getLoadedAudiospritesData();
-
-        if (Object.keys(audiospriteData).length === 0)
-            return false;
-
-        const uploadedAudiospriteData = this._getUploadedSounds(audiospriteData);
-
-        if (Object.keys(uploadedAudiospriteData).length === 0)
-            return false;
-
-        const eventsCfg = this._parseConfig();
-        const soundData = { sounds: { ...uploadedAudiospriteData }, eventsCfg };
-
-        this.emit(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, soundData);
-        return true;
-    };
-
-    _subscribe() {
-        this.addListener(Urso.events.MODULES_ASSETS_GROUP_LOADED, this._groupLoadedHandler.bind(this), true);
-    };
-}
-
-module.exports = ModulesLogicSounds;
+class ModulesLogicSounds {
+    constructor() {
+        this._cfg = null;
+
+        this._setDefaultConfig();
+        this._loadedSounds = {};
+    }
+
+    _setDefaultConfig() {
+        const cfg = this.getInstance('Config.Sounds');
+        this._cfg = cfg.soundsConfig;
+    };
+
+    _parseConfig() {
+        const mappedCfg = {};
+        const configs = Object.keys(this._cfg);
+
+        configs.forEach(configName => {
+            const cfg = this._cfg[configName];
+
+            cfg.forEach(obj => {
+                const params = {
+                    action: obj.action || 'play',
+                    relaunch: obj.relaunch || false,
+                    loop: obj.loop || false,
+                    volume: obj.volume || 1
+                };
+
+                if (!mappedCfg[obj.soundKey])
+                    mappedCfg[obj.soundKey] = {
+                        events: {}
+                    };
+
+                mappedCfg[obj.soundKey].events[obj.event] = params;
+            });
+        });
+
+        return mappedCfg;
+    };
+
+    _getUploadedSounds(audiospriteData) {
+        const newAudiospriteData = {};
+
+        for (const key in audiospriteData) {
+            if (!this._loadedSounds[key]) {
+                this._loadedSounds[key] = audiospriteData[key];
+                newAudiospriteData[key] = audiospriteData[key];
+            }
+        }
+
+        return newAudiospriteData;
+    };
+
+
+    _getLoadedAudiospritesData() {
+        const allAudiosprites = Urso.cache.assetsList.sound;
+        const audiospriteData = {};
+
+        for (let [key, audiosprite] of Object.entries(allAudiosprites)) {
+            const audiospriteKey = key.replace('_audiospriteSound', '');
+            const jsonKey = audiospriteKey + '_audiospriteJson';
+            const json = Urso.cache.assetsList.json[jsonKey];
+
+            if (!json)
+                continue;
+
+            audiospriteData[audiospriteKey] = { json: json.data, audiosprite: audiosprite.data };
+        }
+
+        return audiospriteData;
+    }
+
+    _groupLoadedHandler() {
+        const audiospriteData = this._getLoadedAudiospritesData();
+
+        if (Object.keys(audiospriteData).length === 0)
+            return false;
+
+        const uploadedAudiospriteData = this._getUploadedSounds(audiospriteData);
+
+        if (Object.keys(uploadedAudiospriteData).length === 0)
+            return false;
+
+        const eventsCfg = this._parseConfig();
+        const soundData = { sounds: { ...uploadedAudiospriteData }, eventsCfg };
+
+        this.emit(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, soundData);
+        return true;
+    };
+
+    _subscribe() {
+        this.addListener(Urso.events.MODULES_ASSETS_GROUP_LOADED, this._groupLoadedHandler.bind(this), true);
+    };
+}
+
+module.exports = ModulesLogicSounds;

package/src/js/modules/objects/_info.js

@@ -1,11 +1,11 @@
-Urso.Core.Modules.Objects = {
-    BaseModel: require('./baseModel.js'),
-    Cache: require('./cache.js'),
-    Controller: require('./controller.js'),
-    Create: require('./create.js'),
-    Find: require('./find.js'),
-    Proxy: require('./proxy.js'),
-    Styles: require('./styles.js'),
-    PropertyAdapter: require('./propertyAdapter.js')
-};
-require('./models/_info.js');
+Urso.Core.Modules.Objects = {
+    BaseModel: require('./baseModel.js'),
+    Cache: require('./cache.js'),
+    Controller: require('./controller.js'),
+    Create: require('./create.js'),
+    Find: require('./find.js'),
+    Proxy: require('./proxy.js'),
+    Styles: require('./styles.js'),
+    PropertyAdapter: require('./propertyAdapter.js')
+};
+require('./models/_info.js');

package/src/js/modules/objects/baseModel.js

@@ -1,161 +1,171 @@
-class ModulesObjectsBaseModel {
-    constructor(params) {
-        this.setupParams(params);
-
-        this.parent = false;
-        this.destroyed = false;
-
-        //system
-        this._originalModel = params;
-        this._classes = [];
-        this._styles = {};
-        this._baseObject = null; //link to pixi object
-        this._uid = Urso.helper.recursiveGet('_uid', params, false); //will setup on create
-        this._templatePath = false;
-    }
-
-    setupParams(params) {
-        this.type = Urso.helper.recursiveGet('type', params, null);
-
-        this.id = Urso.helper.recursiveGet('id', params, false);
-        this.name = Urso.helper.recursiveGet('name', params, false);
-        this.class = Urso.helper.recursiveGet('class', params, false);
-
-        this.x = Urso.helper.recursiveGet('x', params, 0); //number or persents (40%)
-        this.y = Urso.helper.recursiveGet('y', params, 0); //number or persents (40%)
-        this.z = Urso.helper.recursiveGet('z', params, 0); //number
-        this.anchorX = Urso.helper.recursiveGet('anchorX', params, 0);
-        this.anchorY = Urso.helper.recursiveGet('anchorY', params, 0);
-        this.scaleX = Urso.helper.recursiveGet('scaleX', params, 1);
-        this.scaleY = Urso.helper.recursiveGet('scaleY', params, 1);
-        this.alignX = Urso.helper.recursiveGet('alignX', params, 'left'); //or right or center
-        this.alignY = Urso.helper.recursiveGet('alignY', params, 'top'); //or bottom or center
-        this.width = Urso.helper.recursiveGet('width', params, false); //or 40% or 1456  // highest priority then scale
-        this.height = Urso.helper.recursiveGet('height', params, false); //or 40% or 568  // highest priority then scale
-        this.stretchingType = Urso.helper.recursiveGet('stretchingType', params, false);  //or inscribed or circumscribed //works only if width=height=100%
-        this.angle = Urso.helper.recursiveGet('angle', params, 0);
-        this.visible = Urso.helper.recursiveGet('visible', params, true);
-        this.alpha = Urso.helper.recursiveGet('alpha', params, 1);
-        this.blendMode = Urso.helper.recursiveGet('blendMode', params, 1);
-        this.append = Urso.helper.recursiveGet('append', params, true); //if false - object will not created  //TODO
-        this.custom = Urso.helper.recursiveGet('custom', params, {}); //custom params
-    }
-
-    getAbsoluteSize() {
-        return { width: this._baseObject.width, height: this._baseObject.height };
-    }
-
-    destroy(doNotRefreshStylesFlag) {
-        Urso.objects.destroy(this, doNotRefreshStylesFlag);
-    }
-
-    _customDestroy() { }
-
-    addChild(childObject, doNotRefreshStylesFlag) {
-        Urso.objects.addChild(this, childObject, doNotRefreshStylesFlag);
-    }
-
-    removeChild(childObject, doNotRefreshStylesFlag) {
-        Urso.objects.removeChild(this, childObject, doNotRefreshStylesFlag);
-    }
-
-    setId(id, doNotRefreshStylesFlag) {
-        if (this.id)
-            Urso.objects.removeIdFromCache(this.id, this);
-
-        Urso.objects._safeSetValueToTarget(this, 'id', id);
-
-        if (id)
-            Urso.objects.addIdToCache(id, this);
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshStyles();
-
-        return this;
-    }
-
-    setName(name, doNotRefreshStylesFlag) {
-        if (this.name)
-            Urso.objects.removeNameFromCache(this.name, this);
-
-        Urso.objects._safeSetValueToTarget(this, 'name', name);
-
-        if (name)
-            Urso.objects.addNameToCache(name, this);
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshStyles();
-
-        return this;
-    }
-
-    addClass(className, doNotRefreshStylesFlag) {
-        let currentClass = this.class;
-        let newClassName;
-
-        if (!currentClass)
-            newClassName = className;
-        else {
-            if (currentClass.split(' ').includes(className))
-                return this;
-
-            newClassName = this.class + ' ' + className;
-        }
-
-        Urso.objects._safeSetValueToTarget(this, 'class', newClassName);
-
-        Urso.objects.addClassToCache(className, this);
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshByChangedClassName(className);
-
-        return this;
-    };
-
-    removeClass(className, doNotRefreshStylesFlag) {
-        if (!this.class)
-            return this;
-
-        let classArray = this.class.split(' ');
-        let classIndex = classArray.indexOf(className);
-
-        if (classIndex === -1)
-            return this;
-
-        classArray.splice(classIndex, 1);
-        Urso.objects._safeSetValueToTarget(this, 'class', classArray.join(' '));
-        Urso.objects.removeClassFromCache(className, this);
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshByChangedClassName(className);
-
-        return this;
-    };
-
-    toGlobal() {
-        const world = Urso.objects.getWorld();
-        const worldScale = world._baseObject.scale;
-        const worldPoint = { x: world.x, y: world.y };
-        const globalPoint = this._baseObject.toGlobal(worldPoint);
-
-        const x = Math.floor(globalPoint.x / worldScale.x);
-        const y = Math.floor(globalPoint.y / worldScale.y);
-
-        return { x, y };
-    }
-
-    toLocal(from) {
-        const world = Urso.objects.getWorld();
-        const worldPoint = { x: world.x, y: world.y };
-        const parent = this.parent ? this.parent._baseObject : world._baseObject;
-        const fromObj = from ? from._baseObject : parent;
-        const localPoint = this._baseObject.toLocal(worldPoint, fromObj);
-
-        const x = -~~localPoint.x;
-        const y = -~~localPoint.y;
-
-        return { x, y };
-    }
-}
-
-module.exports = ModulesObjectsBaseModel;
+class ModulesObjectsBaseModel {
+    constructor(params) {
+        this.setupParams(params);
+
+        this.parent = false;
+        this.destroyed = false;
+
+        //system
+        this._originalModel = params;
+        this._classes = [];
+        this._styles = {};
+        this._baseObject = null; //link to pixi object
+        this._uid = Urso.helper.recursiveGet('_uid', params, false); //will setup on create
+        this._templatePath = false;
+        this._parsed = false;
+    }
+
+    setupParams(params) {
+        this.type = Urso.helper.recursiveGet('type', params, null);
+
+        this.id = Urso.helper.recursiveGet('id', params, false);
+        this.name = Urso.helper.recursiveGet('name', params, false);
+        this.class = Urso.helper.recursiveGet('class', params, false);
+
+        this.x = Urso.helper.recursiveGet('x', params, 0); //number or persents (40%)
+        this.y = Urso.helper.recursiveGet('y', params, 0); //number or persents (40%)
+        this.z = Urso.helper.recursiveGet('z', params, 0); //number
+        this.anchorX = Urso.helper.recursiveGet('anchorX', params, 0);
+        this.anchorY = Urso.helper.recursiveGet('anchorY', params, 0);
+        this.scaleX = Urso.helper.recursiveGet('scaleX', params, 1);
+        this.scaleY = Urso.helper.recursiveGet('scaleY', params, 1);
+        this.alignX = Urso.helper.recursiveGet('alignX', params, 'left'); //or right or center
+        this.alignY = Urso.helper.recursiveGet('alignY', params, 'top'); //or bottom or center
+        this.width = Urso.helper.recursiveGet('width', params, false); //or 40% or 1456  // highest priority then scale
+        this.height = Urso.helper.recursiveGet('height', params, false); //or 40% or 568  // highest priority then scale
+        this.stretchingType = Urso.helper.recursiveGet('stretchingType', params, false);  //or inscribed or circumscribed //works only if width=height=100%
+        this.angle = Urso.helper.recursiveGet('angle', params, 0);
+        this.visible = Urso.helper.recursiveGet('visible', params, true);
+        this.alpha = Urso.helper.recursiveGet('alpha', params, 1);
+        this.blendMode = Urso.helper.recursiveGet('blendMode', params, 1);
+        this.append = Urso.helper.recursiveGet('append', params, true); //if false - object will not created  //TODO
+        this.custom = Urso.helper.recursiveGet('custom', params, {}); //custom params
+    }
+
+    getAbsoluteSize() {
+        return { width: this._baseObject.width, height: this._baseObject.height };
+    }
+
+    destroy(doNotRefreshStylesFlag) {
+        Urso.objects.destroy(this, doNotRefreshStylesFlag);
+    }
+
+    _customDestroy() { }
+
+    addChild(childObject, doNotRefreshStylesFlag) {
+        Urso.objects.addChild(this, childObject, doNotRefreshStylesFlag);
+    }
+
+    get transform() {
+        return this._baseObject.transform;
+    }
+
+    addChildAt(childObject, zIndex, doNotRefreshStylesFlag) {
+        //TODO zIndex
+        Urso.objects.addChild(this, childObject, doNotRefreshStylesFlag);
+    }
+
+    removeChild(childObject, doNotRefreshStylesFlag) {
+        Urso.objects.removeChild(this, childObject, doNotRefreshStylesFlag);
+    }
+
+    setId(id, doNotRefreshStylesFlag) {
+        if (this.id)
+            Urso.objects.removeIdFromCache(this.id, this);
+
+        Urso.objects._safeSetValueToTarget(this, 'id', id);
+
+        if (id)
+            Urso.objects.addIdToCache(id, this);
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshStyles();
+
+        return this;
+    }
+
+    setName(name, doNotRefreshStylesFlag) {
+        if (this.name)
+            Urso.objects.removeNameFromCache(this.name, this);
+
+        Urso.objects._safeSetValueToTarget(this, 'name', name);
+
+        if (name)
+            Urso.objects.addNameToCache(name, this);
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshStyles();
+
+        return this;
+    }
+
+    addClass(className, doNotRefreshStylesFlag) {
+        let currentClass = this.class;
+        let newClassName;
+
+        if (!currentClass)
+            newClassName = className;
+        else {
+            if (currentClass.split(' ').includes(className))
+                return this;
+
+            newClassName = this.class + ' ' + className;
+        }
+
+        Urso.objects._safeSetValueToTarget(this, 'class', newClassName);
+
+        Urso.objects.addClassToCache(className, this);
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshByChangedClassName(className);
+
+        return this;
+    };
+
+    removeClass(className, doNotRefreshStylesFlag) {
+        if (!this.class)
+            return this;
+
+        let classArray = this.class.split(' ');
+        let classIndex = classArray.indexOf(className);
+
+        if (classIndex === -1)
+            return this;
+
+        classArray.splice(classIndex, 1);
+        Urso.objects._safeSetValueToTarget(this, 'class', classArray.join(' '));
+        Urso.objects.removeClassFromCache(className, this);
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshByChangedClassName(className);
+
+        return this;
+    };
+
+    toGlobal() {
+        const world = Urso.objects.getWorld();
+        const worldScale = world._baseObject.scale;
+        const worldPoint = { x: world.x, y: world.y };
+        const globalPoint = this._baseObject.toGlobal(worldPoint);
+
+        const x = Math.floor(globalPoint.x / worldScale.x);
+        const y = Math.floor(globalPoint.y / worldScale.y);
+
+        return { x, y };
+    }
+
+    toLocal(from) {
+        const world = Urso.objects.getWorld();
+        const worldPoint = { x: world.x, y: world.y };
+        const parent = this.parent ? this.parent._baseObject : world._baseObject;
+        const fromObj = from ? from._baseObject : parent;
+        const localPoint = this._baseObject.toLocal(worldPoint, fromObj);
+
+        const x = -~~localPoint.x;
+        const y = -~~localPoint.y;
+
+        return { x, y };
+    }
+}
+
+module.exports = ModulesObjectsBaseModel;