@urso/core 0.7.90 → 0.7.91

package/src/js/modules/scenes/service.js

@@ -1,146 +1,146 @@
-class ModulesScenesService {
-    constructor() {
-        this.singleton = true;
-
-        this._displayInProgress = false;
-        this._currentSceneName = false;
-        this._currentSceneTemplate = false;
-        this._sceneModel;
-
-        this.timeScale = 1;
-
-        this._pixiWrapper;
-
-        this.init();
-
-        this._assetsLoadedHandler = this._assetsLoadedHandler.bind(this);
-        this.loadUpdate = this.loadUpdate.bind(this);
-    }
-
-    init() {
-        this._pixiWrapper = this.getInstance('PixiWrapper');
-        this._pixiWrapper.init();
-    }
-
-    /**
-     * pause scene
-     */
-    pause() {
-        this.getInstance('PixiWrapper').pause();
-        this.emit(Urso.events.MODULES_SCENES_PAUSE);
-    }
-
-    /**
-     * resume scene
-     */
-    resume() {
-        this.getInstance('PixiWrapper').resume();
-        this.emit(Urso.events.MODULES_SCENES_RESUME);
-    }
-
-    /**
-     * global timeScale getter
-     */
-    getTimeScale() {
-        const loopPaused = this.getInstance('PixiWrapper').isPaused();
-        return loopPaused ? 0 : this.timeScale;
-    }
-
-    /**
-     * global timeScale setter
-     */
-    setTimeScale(value) {
-        this.timeScale = value;
-        gsap.globalTimeline.timeScale(this.timeScale);
-    }
-
-    addObject(objects, parent, doNotRefreshStylesFlag) {
-        const newTemplatePart = Urso.template.parse({ objects: [objects] }, true);
-
-        if (newTemplatePart.assets.length) {
-            Urso.assets.preload(newTemplatePart.assets, () => this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag));
-            return null; //objects will be created soon. Maybe we can return a promice //todo
-        } else
-            return this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag);
-    }
-
-    _newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag) {
-        const objectToCreate = newTemplatePart.objects[0];
-        const result = Urso.objects.create(objectToCreate, parent, doNotRefreshStylesFlag);
-
-        //components create
-        if (newTemplatePart.components && newTemplatePart.components.length > 0) {
-            newTemplatePart.components.forEach(component => component.create());
-            this._currentSceneTemplate.components = Urso.helper.mergeArrays(this._currentSceneTemplate.components, newTemplatePart.components);
-        }
-
-        return result;
-    }
-
-    display(name) {
-        if (this._displayInProgress) {
-            console.warn("Scenes.display is busy ", this._currentSceneName);
-            return false;
-        }
-
-        let template = Urso.template.scene(name);
-
-        if (!template) {
-            console.error('Scenes.display error: no template for scene', name);
-            return false;
-        }
-
-        console.log('[SCENE] display:', name);
-        this._displayInProgress = true;
-        this.emit(Urso.events.MODULES_SCENES_DISPLAY_START, name);
-
-        //destroy all components, if _sceneModel exists. Not exists only in first call
-        if (this._sceneModel)
-            this._sceneModel.destroy();
-
-        this._currentSceneName = name;
-        Urso.observer.clearAllLocal();
-        Urso.observer.setPrefix(name);
-
-        //parse template
-        this._currentSceneTemplate = Urso.template.parse(template);
-
-        console.log('[SCENE] current template:', this._currentSceneTemplate)
-        this._sceneModel = this.getInstance('Model');
-
-        //write model by template (functions)  //todo set in model (this.getInstance('Model', params);)
-        this._sceneModel.loadUpdate = (loadProgress) => { this._currentSceneTemplate.components.forEach(component => component.loadUpdate(loadProgress)); }
-        this._sceneModel.create = () => { this._currentSceneTemplate.components.forEach(component => component.create()); }
-        this._sceneModel.update = (deltaTime) => { this._currentSceneTemplate.components.forEach(component => component.update(deltaTime)); }
-        this._sceneModel.destroy = () => { this._currentSceneTemplate.components.forEach(component => component.destroy()); }
-
-        //start new scene by wrapper
-        this.getInstance('PixiWrapper').setNewScene(this._sceneModel);
-        this.emit(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, name);
-
-        Urso.assets.preload(this._currentSceneTemplate.assets, this._assetsLoadedHandler, this.loadUpdate);
-    }
-
-    loadUpdate(loadProgress) {
-        if (!this._sceneModel)
-            return;
-
-        this._sceneModel.loadUpdate(loadProgress);
-        this.emit(Urso.events.MODULES_ASSETS_LOAD_PROGRESS, loadProgress);
-    }
-
-    _assetsLoadedHandler() {
-        Urso.objects.create(this._currentSceneTemplate.objects);
-
-        //call all components create
-        this._sceneModel.create();
-
-        //reset display flag
-        this._displayInProgress = false;
-
-        //emit end of display event
-        this.emit(Urso.events.MODULES_SCENES_DISPLAY_FINISHED);
-    }
-}
-
-module.exports = ModulesScenesService;
+class ModulesScenesService {
+    constructor() {
+        this.singleton = true;
+
+        this._displayInProgress = false;
+        this._currentSceneName = false;
+        this._currentSceneTemplate = false;
+        this._sceneModel;
+
+        this.timeScale = 1;
+
+        this._pixiWrapper;
+
+        this.init();
+
+        this._assetsLoadedHandler = this._assetsLoadedHandler.bind(this);
+        this.loadUpdate = this.loadUpdate.bind(this);
+    }
+
+    init() {
+        this._pixiWrapper = this.getInstance('PixiWrapper');
+        this._pixiWrapper.init();
+    }
+
+    /**
+     * pause scene
+     */
+    pause() {
+        this.getInstance('PixiWrapper').pause();
+        this.emit(Urso.events.MODULES_SCENES_PAUSE);
+    }
+
+    /**
+     * resume scene
+     */
+    resume() {
+        this.getInstance('PixiWrapper').resume();
+        this.emit(Urso.events.MODULES_SCENES_RESUME);
+    }
+
+    /**
+     * global timeScale getter
+     */
+    getTimeScale() {
+        const loopPaused = this.getInstance('PixiWrapper').isPaused();
+        return loopPaused ? 0 : this.timeScale;
+    }
+
+    /**
+     * global timeScale setter
+     */
+    setTimeScale(value) {
+        this.timeScale = value;
+        gsap.globalTimeline.timeScale(this.timeScale);
+    }
+
+    addObject(objects, parent, doNotRefreshStylesFlag) {
+        const newTemplatePart = Urso.template.parse({ objects: [objects] }, true);
+
+        if (newTemplatePart.assets.length) {
+            Urso.assets.preload(newTemplatePart.assets, () => this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag));
+            return null; //objects will be created soon. Maybe we can return a promice //todo
+        } else
+            return this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag);
+    }
+
+    _newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag) {
+        const objectToCreate = newTemplatePart.objects[0];
+        const result = Urso.objects.create(objectToCreate, parent, doNotRefreshStylesFlag);
+
+        //components create
+        if (newTemplatePart.components && newTemplatePart.components.length > 0) {
+            newTemplatePart.components.forEach(component => component.create());
+            this._currentSceneTemplate.components = Urso.helper.mergeArrays(this._currentSceneTemplate.components, newTemplatePart.components);
+        }
+
+        return result;
+    }
+
+    display(name) {
+        if (this._displayInProgress) {
+            console.warn("Scenes.display is busy ", this._currentSceneName);
+            return false;
+        }
+
+        let template = Urso.template.scene(name);
+
+        if (!template) {
+            console.error('Scenes.display error: no template for scene', name);
+            return false;
+        }
+
+        console.log('[SCENE] display:', name);
+        this._displayInProgress = true;
+        this.emit(Urso.events.MODULES_SCENES_DISPLAY_START, name);
+
+        //destroy all components, if _sceneModel exists. Not exists only in first call
+        if (this._sceneModel)
+            this._sceneModel.destroy();
+
+        this._currentSceneName = name;
+        Urso.observer.clearAllLocal();
+        Urso.observer.setPrefix(name);
+
+        //parse template
+        this._currentSceneTemplate = Urso.template.parse(template);
+
+        console.log('[SCENE] current template:', this._currentSceneTemplate)
+        this._sceneModel = this.getInstance('Model');
+
+        //write model by template (functions)  //todo set in model (this.getInstance('Model', params);)
+        this._sceneModel.loadUpdate = (loadProgress) => { this._currentSceneTemplate.components.forEach(component => component.loadUpdate(loadProgress)); }
+        this._sceneModel.create = () => { this._currentSceneTemplate.components.forEach(component => component.create()); }
+        this._sceneModel.update = (deltaTime) => { this._currentSceneTemplate.components.forEach(component => component.update(deltaTime)); }
+        this._sceneModel.destroy = () => { this._currentSceneTemplate.components.forEach(component => component.destroy()); }
+
+        //start new scene by wrapper
+        this.getInstance('PixiWrapper').setNewScene(this._sceneModel);
+        this.emit(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, name);
+
+        Urso.assets.preload(this._currentSceneTemplate.assets, this._assetsLoadedHandler, this.loadUpdate);
+    }
+
+    loadUpdate(loadProgress) {
+        if (!this._sceneModel)
+            return;
+
+        this._sceneModel.loadUpdate(loadProgress);
+        this.emit(Urso.events.MODULES_ASSETS_LOAD_PROGRESS, loadProgress);
+    }
+
+    _assetsLoadedHandler() {
+        Urso.objects.create(this._currentSceneTemplate.objects);
+
+        //call all components create
+        this._sceneModel.create();
+
+        //reset display flag
+        this._displayInProgress = false;
+
+        //emit end of display event
+        this.emit(Urso.events.MODULES_SCENES_DISPLAY_FINISHED);
+    }
+}
+
+module.exports = ModulesScenesService;

package/src/js/modules/soundManager/controller.js

@@ -1,103 +1,103 @@
-class SoundManagerController {
-    constructor() {
-        this._systemVolume = 1;
-        this._globalVolume = 0;
-
-        this._howler = null;
-        this._codecsToCheck = ['ogg', 'm4a', 'mp3', 'wav'];
-        this._selectedCodec = null;
-        this._sounds = {};
-
-        this._setCodec();
-
-        this._updateSoundsCfgHandler = this._updateSoundsCfgHandler.bind(this);
-        this._doHandler = this._doHandler.bind(this);
-    }
-
-    _setCodec() {
-        for (const codec of this._codecsToCheck) {
-            if (Howler.Howler.codecs(codec)) {
-                this._selectedCodec = codec;
-                return;
-            }
-        }
-    };
-
-    _createSounds(soundData) {
-        const { eventsCfg, sounds } = soundData;
-
-        for (const soundKey in sounds) {
-
-            if (this._sounds[soundKey])
-                continue;
-
-            const { audiosprite, json } = sounds[soundKey];
-
-            const soundSptite = this.getInstance('SoundSprite', {
-                sprite: json.sprite,
-                name: soundKey,
-                audiosprite
-            });
-
-            this._sounds[soundKey] = soundSptite;
-
-            soundSptite.updateEvents(eventsCfg);
-        }
-    };
-
-    _setEventsHandler() {
-        const soundsCfg = Urso.localData.get('sounds.cfg') || {};
-
-        for (const key in this._sounds)
-            if (soundsCfg[key])
-                this._sounds[key].updateEvents(soundsCfg[key]);
-    };
-
-    _checkSoundExists(name) {
-        if (this._sounds[name])
-            return true;
-
-        Urso.logger.error(`Sound with key ${name} wasn't found!`);
-    };
-
-    _updateSoundsCfgHandler(soundsCfg) {
-        this._createSounds(soundsCfg);
-    };
-
-    _doHandler({ action, name, behavior }) {
-        if (this._checkSoundExists(name))
-            this._sounds[name][action](behavior);
-    };
-
-    /**
-     * 
-     * @param {Number} volume (0-1)
-     */
-    _globalVolumeChange(volume) {
-        this._globalVolume = Urso.math.intMakeBetween(volume, 0, 1);
-        this._updateSoundVolume();
-    }
-
-    _visibilityChange(state) {
-        this._systemVolume = ~~(state === 'visible');
-        this._updateSoundVolume();
-        
-        for (const key in this._sounds)
-            this._sounds[key].playDummy();
-    }
-
-    _updateSoundVolume() {
-        const totalVolume = this._globalVolume * this._systemVolume;
-        for (const key in this._sounds)
-            this._sounds[key].setAllVolume(totalVolume);
-    }
-
-    _subscribe() {
-        this.addListener(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, this._updateSoundsCfgHandler, true);
-        this.addListener(Urso.events.MODULES_LOGIC_SOUNDS_DO, this._doHandler, true);
-        this.addListener(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, this._globalVolumeChange.bind(this), true);
-        this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_VISIBILITYCHANGE, this._visibilityChange.bind(this), true);
-    };
-};
-
-module.exports = SoundManagerController;
+class SoundManagerController {
+    constructor() {
+        this._systemVolume = 1;
+        this._globalVolume = 0;
+
+        this._howler = null;
+        this._codecsToCheck = ['ogg', 'm4a', 'mp3', 'wav'];
+        this._selectedCodec = null;
+        this._sounds = {};
+
+        this._setCodec();
+
+        this._updateSoundsCfgHandler = this._updateSoundsCfgHandler.bind(this);
+        this._doHandler = this._doHandler.bind(this);
+    }
+
+    _setCodec() {
+        for (const codec of this._codecsToCheck) {
+            if (Howler.Howler.codecs(codec)) {
+                this._selectedCodec = codec;
+                return;
+            }
+        }
+    };
+
+    _createSounds(soundData) {
+        const { eventsCfg, sounds } = soundData;
+
+        for (const soundKey in sounds) {
+
+            if (this._sounds[soundKey])
+                continue;
+
+            const { audiosprite, json } = sounds[soundKey];
+
+            const soundSptite = this.getInstance('SoundSprite', {
+                sprite: json.sprite,
+                name: soundKey,
+                audiosprite
+            });
+
+            this._sounds[soundKey] = soundSptite;
+
+            soundSptite.updateEvents(eventsCfg);
+        }
+    };
+
+    _setEventsHandler() {
+        const soundsCfg = Urso.localData.get('sounds.cfg') || {};
+
+        for (const key in this._sounds)
+            if (soundsCfg[key])
+                this._sounds[key].updateEvents(soundsCfg[key]);
+    };
+
+    _checkSoundExists(name) {
+        if (this._sounds[name])
+            return true;
+
+        Urso.logger.error(`Sound with key ${name} wasn't found!`);
+    };
+
+    _updateSoundsCfgHandler(soundsCfg) {
+        this._createSounds(soundsCfg);
+    };
+
+    _doHandler({ action, name, behavior }) {
+        if (this._checkSoundExists(name))
+            this._sounds[name][action](behavior);
+    };
+
+    /**
+     * 
+     * @param {Number} volume (0-1)
+     */
+    _globalVolumeChange(volume) {
+        this._globalVolume = Urso.math.intMakeBetween(volume, 0, 1);
+        this._updateSoundVolume();
+    }
+
+    _visibilityChange(state) {
+        this._systemVolume = ~~(state === 'visible');
+        this._updateSoundVolume();
+        
+        for (const key in this._sounds)
+            this._sounds[key].playDummy();
+    }
+
+    _updateSoundVolume() {
+        const totalVolume = this._globalVolume * this._systemVolume;
+        for (const key in this._sounds)
+            this._sounds[key].setAllVolume(totalVolume);
+    }
+
+    _subscribe() {
+        this.addListener(Urso.events.MODULES_SOUND_MANAGER_UPDATE_CFG, this._updateSoundsCfgHandler, true);
+        this.addListener(Urso.events.MODULES_LOGIC_SOUNDS_DO, this._doHandler, true);
+        this.addListener(Urso.events.MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME, this._globalVolumeChange.bind(this), true);
+        this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_VISIBILITYCHANGE, this._visibilityChange.bind(this), true);
+    };
+};
+
+module.exports = SoundManagerController;