@urso/core 0.3.9 → 0.4.0

package/src/js/lib/tween.js

@@ -1,148 +1,148 @@
-class LibTween {
-    constructor() {
-        this.singleton = true;
-
-        this._tweenIndex = 0;
-        this._tweens = {};
-    }
-
-    removeAll() {
-        for (let k in this._tweens)
-            this._tweens[k].stop();
-
-        this._tweens = {};
-    };
-
-    add(object) {
-        const key = this._keyGenerate();
-
-        const tl = gsap.timeline({
-            repeat: 1,
-            onComplete: () => { this._onCompleteHandler(key) },
-            onUpdate: () => { this._onUpdateHandler(key) }
-        });
-
-        const tween = {
-            id: key,
-            isRunning: false,
-            target: object,
-            to: this._to,
-            start: this._start,
-            pause: this._pause,
-            resume: this._resume,
-            stop: this._stop,
-
-            _timeScale: 1,
-            get timeScale() {
-                return this._timeScale;
-            }, set timeScale(a) {
-                return this._timeScale;
-            },
-            _timeline: tl,
-            _complete: false,
-            _paused: true,
-            _functions: {
-                onStart: [],
-                onUpdate: [],
-                onComplete: []
-            }
-        };
-
-        //need to add some functions
-        tween.onComplete = {
-            add: (f) => {
-                tween._functions.onComplete.push(f);
-                return tween;
-            }
-        };
-
-        tween.onStart = {
-            add: (f) => {
-                tween._functions.onStart.push(f);
-                return tween;
-            }
-        };
-
-        tween.onUpdate = {
-            add: (f) => {
-                tween._functions.onUpdate.push(f);
-                return tween;
-            }
-        };
-
-        this._tweens[key] = tween;
-
-        return tween;
-    };
-
-    _keyGenerate() {
-        this._tweenIndex++;
-        return (new Date()).getTime() + '_' + this._tweenIndex;
-    };
-
-    //todo easing
-    _to(propsTo, duration, easing = undefined, autostart = false, startDelay = 0) {
-        const params = Urso.helper.objectClone(propsTo, 10);
-        params.duration = duration / 1000;
-        params.easing = easing;
-        params.delay = startDelay;
-
-        this._timeline.to(this.target, params);
-        //this.pause();
-
-        if (autostart)
-            this.start();
-
-        return this;
-    };
-
-    _start() {
-        for (let i = 0; i < this._functions.onStart.length; i++)
-            this._functions.onStart[i]();
-
-        this.resume();
-        return this;
-    };
-
-    _pause() {
-        this._paused = true;
-        this.isRunning = false;
-        this._timeline.pause();
-
-        return this;
-    };
-
-    _resume() {
-        this._paused = false;
-        this.isRunning = true;
-        this._timeline.resume();
-
-        return this;
-    };
-
-    _stop() {
-        this.pause();
-        this._timeline.kill();
-        this._complete = true;
-
-        return this;
-    };
-
-    _onUpdateHandler(tweenKey) {
-        const tween = this._tweens[tweenKey];
-        const percentage = ~~(tween._timeline.progress() * 100);
-
-        for (let i = 0; i < tween._functions.onUpdate.length; i++)
-            tween._functions.onUpdate[i](tween, percentage);
-    }
-
-    _onCompleteHandler(tweenKey) {
-        const tween = this._tweens[tweenKey];
-        const onComplete = tween._functions.onComplete;
-
-        for (let i = 0; i < onComplete.length; i++)
-            onComplete[i]();
-    }
-}
-
+class LibTween {
+    constructor() {
+        this.singleton = true;
+
+        this._tweenIndex = 0;
+        this._tweens = {};
+    }
+
+    removeAll() {
+        for (let k in this._tweens)
+            this._tweens[k].stop();
+
+        this._tweens = {};
+    };
+
+    add(object) {
+        const key = this._keyGenerate();
+
+        const tl = gsap.timeline({
+            repeat: 1,
+            onComplete: () => { this._onCompleteHandler(key) },
+            onUpdate: () => { this._onUpdateHandler(key) }
+        });
+
+        const tween = {
+            id: key,
+            isRunning: false,
+            target: object,
+            to: this._to,
+            start: this._start,
+            pause: this._pause,
+            resume: this._resume,
+            stop: this._stop,
+
+            _timeScale: 1,
+            get timeScale() {
+                return this._timeScale;
+            }, set timeScale(a) {
+                return this._timeScale;
+            },
+            _timeline: tl,
+            _complete: false,
+            _paused: true,
+            _functions: {
+                onStart: [],
+                onUpdate: [],
+                onComplete: []
+            }
+        };
+
+        //need to add some functions
+        tween.onComplete = {
+            add: (f) => {
+                tween._functions.onComplete.push(f);
+                return tween;
+            }
+        };
+
+        tween.onStart = {
+            add: (f) => {
+                tween._functions.onStart.push(f);
+                return tween;
+            }
+        };
+
+        tween.onUpdate = {
+            add: (f) => {
+                tween._functions.onUpdate.push(f);
+                return tween;
+            }
+        };
+
+        this._tweens[key] = tween;
+
+        return tween;
+    };
+
+    _keyGenerate() {
+        this._tweenIndex++;
+        return (new Date()).getTime() + '_' + this._tweenIndex;
+    };
+
+    //todo easing
+    _to(propsTo, duration, easing = undefined, autostart = false, startDelay = 0) {
+        const params = Urso.helper.objectClone(propsTo, 10);
+        params.duration = duration / 1000;
+        params.easing = easing;
+        params.delay = startDelay;
+
+        this._timeline.to(this.target, params);
+        //this.pause();
+
+        if (autostart)
+            this.start();
+
+        return this;
+    };
+
+    _start() {
+        for (let i = 0; i < this._functions.onStart.length; i++)
+            this._functions.onStart[i]();
+
+        this.resume();
+        return this;
+    };
+
+    _pause() {
+        this._paused = true;
+        this.isRunning = false;
+        this._timeline.pause();
+
+        return this;
+    };
+
+    _resume() {
+        this._paused = false;
+        this.isRunning = true;
+        this._timeline.resume();
+
+        return this;
+    };
+
+    _stop() {
+        this.pause();
+        this._timeline.kill();
+        this._complete = true;
+
+        return this;
+    };
+
+    _onUpdateHandler(tweenKey) {
+        const tween = this._tweens[tweenKey];
+        const percentage = ~~(tween._timeline.progress() * 100);
+
+        for (let i = 0; i < tween._functions.onUpdate.length; i++)
+            tween._functions.onUpdate[i](tween, percentage);
+    }
+
+    _onCompleteHandler(tweenKey) {
+        const tween = this._tweens[tweenKey];
+        const onComplete = tween._functions.onComplete;
+
+        for (let i = 0; i < onComplete.length; i++)
+            onComplete[i]();
+    }
+}
+
 module.exports = LibTween;

package/src/js/modules/_info.js

@@ -1,11 +1,11 @@
-Urso.Core.Modules = {};
-require('./assets/_info.js');
-require('./instances/_info.js');
-require('./logic/_info.js');
-require('./objects/_info.js');
-require('./observer/_info.js');
-require('./scenes/_info.js');
-require('./soundManager/_info.js');
-require('./statesManager/_info.js');
-require('./template/_info.js');
-require('./transport/_info.js');
+Urso.Core.Modules = {};
+require('./assets/_info.js');
+require('./instances/_info.js');
+require('./logic/_info.js');
+require('./objects/_info.js');
+require('./observer/_info.js');
+require('./scenes/_info.js');
+require('./soundManager/_info.js');
+require('./statesManager/_info.js');
+require('./template/_info.js');
+require('./transport/_info.js');

package/src/js/modules/assets/_info.js

@@ -1,7 +1,7 @@
-Urso.Core.Modules.Assets = {
-    BaseModel: require('./baseModel.js'),
-    Config: require('./config.js'),
-    Controller: require('./controller.js'),
-    Service: require('./service.js')
-};
-require('./models/_info.js');
+Urso.Core.Modules.Assets = {
+    BaseModel: require('./baseModel.js'),
+    Config: require('./config.js'),
+    Controller: require('./controller.js'),
+    Service: require('./service.js')
+};
+require('./models/_info.js');

package/src/js/modules/assets/baseModel.js

@@ -1,19 +1,19 @@
-class ModulesAssetsBaseModel {
-    constructor(params) {
-        this.setupParams(params);
-        this._templatePath = false;
-    }
-
-    setupParams(params) {
-        this.id = Urso.helper.recursiveGet('id', params, false);
-        this.type = Urso.helper.recursiveGet('type', params, null);
-        this.key = Urso.helper.recursiveGet('key', params, false);
-        this.path = Urso.helper.recursiveGet('path', params, false);
-        this.useBinPath = Urso.helper.recursiveGet('useBinPath', params, false) || Urso.config.mode !== 'development'; //or true if we want to use asset from assetsBin
-        //lazy load params
-        this.loadingGroup = Urso.helper.recursiveGet('loadingGroup', params, false); //initial or some extra name
-        this.placeHolder = Urso.helper.recursiveGet('placeHolder', params, false); //placeHolder assets model //TODO
-    }
-}
-
+class ModulesAssetsBaseModel {
+    constructor(params) {
+        this.setupParams(params);
+        this._templatePath = false;
+    }
+
+    setupParams(params) {
+        this.id = Urso.helper.recursiveGet('id', params, false);
+        this.type = Urso.helper.recursiveGet('type', params, null);
+        this.key = Urso.helper.recursiveGet('key', params, false);
+        this.path = Urso.helper.recursiveGet('path', params, false);
+        this.useBinPath = Urso.helper.recursiveGet('useBinPath', params, false) || Urso.config.mode !== 'development'; //or true if we want to use asset from assetsBin
+        //lazy load params
+        this.loadingGroup = Urso.helper.recursiveGet('loadingGroup', params, false); //initial or some extra name
+        this.placeHolder = Urso.helper.recursiveGet('placeHolder', params, false); //placeHolder assets model //TODO
+    }
+}
+
 module.exports = ModulesAssetsBaseModel;

package/src/js/modules/assets/config.js

@@ -1,35 +1,37 @@
-class ModulesAssetsConfig {
-    constructor() {
-        this.singleton = true;
-
-        /**
-         * quality settings for resource loading selection
-         */
-        this.qualityFactors = {
-            medium: 0.5,
-            hd: 0.75,
-            high: 1 
-        };
-
-
-        /**
-         * initial is the default and will load on the preload
-         * also you can call preload manualy by assets.loadGroup('groupName')
-         */
-        this.loadingGroups = {
-            initial: 0 //will load on the preload
-            /*lazyPart1: 'lazyPart1',
-            lazyPart2: 'lazyPart2'*/
-        };
-
-        /**
-         * you can make lazy load groups priority here
-         */
-        this.lazyLoadGroups = [
-            /*this.loadingGroups.lazyPart1,
-            this.loadingGroups.lazyPart2*/
-        ];
-    }
-}
-
-module.exports = ModulesAssetsConfig;
+class ModulesAssetsConfig {
+    constructor() {
+        this.singleton = true;
+
+        this.defaultQualityFactor = 1;
+
+        /**
+         * quality settings for resource loading selection
+         */
+        this.qualityFactors = {
+            medium: 0.5,
+            hd: 0.75,
+            high: 1 
+        };
+
+
+        /**
+         * initial is the default and will load on the preload
+         * also you can call preload manualy by assets.loadGroup('groupName')
+         */
+        this.loadingGroups = {
+            initial: 0 //will load on the preload
+            /*lazyPart1: 'lazyPart1',
+            lazyPart2: 'lazyPart2'*/
+        };
+
+        /**
+         * you can make lazy load groups priority here
+         */
+        this.lazyLoadGroups = [
+            /*this.loadingGroups.lazyPart1,
+            this.loadingGroups.lazyPart2*/
+        ];
+    }
+}
+
+module.exports = ModulesAssetsConfig;

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

@@ -1,39 +1,46 @@
-class ModulesAssetsController {
-    constructor() {
-        this.singleton = true;
-    };
-
-    /**
-     * Update quality
-     */
-    updateQuality() {
-        if (Urso.config.useBinPath) {
-            this.getInstance('Service').updateQuality();
-        }
-
-        console.log('[ASSETS] Quality set to', this.getInstance('Service').getQuality());
-    }
-
-    /**
-     * Current quality getter
-     */
-    getQuality() {
-        this.getInstance('Service').getQuality();
-    }
-
-    /**
-     * instantly load initial assets and start lazy loading process, if needed
-     * @param {Mixed} assets - asset or array of assets
-     * @param {Function} callback 
-     */
-    preload(assets, callback) {
-        this.getInstance('Service').sortAssets(assets);
-        this.getInstance('Service').startLoad(callback);
-    }
-
-    loadGroup(name, callback) {
-        this.getInstance('Service').loadGroup(name, callback);
-    }
-}
-
-module.exports = ModulesAssetsController;
+class ModulesAssetsController {
+    constructor() {
+        this.singleton = true;
+    };
+
+    /**
+     * Update quality
+     */
+    updateQuality() {
+        if (Urso.config.useBinPath) {
+            this.getInstance('Service').updateQuality();
+        }
+
+        console.log('[ASSETS] Quality set to', this.getInstance('Service').getQuality());
+    }
+
+    /**
+     * Current quality getter
+     */
+    getQuality() {
+        return this.getInstance('Service').getQuality();
+    }
+
+    /**
+     * Current asset resolution
+     */
+    getCurrentResolution() {
+        return this.getInstance('Service').getCurrentResolution();
+    }
+
+    /**
+     * instantly load initial assets and start lazy loading process, if needed
+     * @param {Mixed} assets - asset or array of assets
+     * @param {Function} callback 
+     */
+    preload(assets, callback) {
+        this.getInstance('Service').sortAssets(assets);
+        this.getInstance('Service').startLoad(callback);
+    }
+
+    loadGroup(name, callback) {
+        this.getInstance('Service').loadGroup(name, callback);
+    }
+}
+
+module.exports = ModulesAssetsController;

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

@@ -1,11 +1,11 @@
-Urso.Core.Modules.Assets.Models = {
-    Audiosprite: require('./audiosprite.js'),
-    Atlas: require('./atlas.js'),
-    BitmapFont: require('./bitmapFont.js'),
-    Container: require('./container.js'),
-    Image: require('./image.js'),
-    Json: require('./json.js'),
-    Sound: require('./sound.js'),
-    Font: require('./font.js'),
-    Spine: require('./spine.js')
-};
+Urso.Core.Modules.Assets.Models = {
+    Audiosprite: require('./audiosprite.js'),
+    Atlas: require('./atlas.js'),
+    BitmapFont: require('./bitmapFont.js'),
+    Container: require('./container.js'),
+    Image: require('./image.js'),
+    Json: require('./json.js'),
+    Sound: require('./sound.js'),
+    Font: require('./font.js'),
+    Spine: require('./spine.js')
+};

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

@@ -1,9 +1,9 @@
-class ModulesAssetsModelsAtlas extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.ATLAS;
-    }
-}
-
+class ModulesAssetsModelsAtlas extends Urso.Core.Modules.Assets.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.assets.ATLAS;
+    }
+}
+
 module.exports = ModulesAssetsModelsAtlas;

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

@@ -1,28 +1,28 @@
-const { Howler } = require("howler");
-
-class ModulesAssetsModelsAudiosprite extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.AUDIOSPRITE;
-        this.codecs = ['ogg', 'm4a', 'mp3', 'wav'];
-
-        const codec = this.codecs.filter(codec => Howler.codecs(codec))[0];
-
-        this.contents = Urso.helper.recursiveGet('contents', params, [
-            { type: Urso.types.assets.JSON, key: `${this.key}_audiospriteJson`, path: `${this.path}.json` },
-            { type: Urso.types.assets.SOUND, key: `${this.key}_audiospriteSound`, path: `${this.path}.${codec}` }
-        ]);
-
-        this.path = false;
-        this.key = false;
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.path = Urso.helper.recursiveGet('path', params, false);
-    }
-}
-
+const { Howler } = require("howler");
+
+class ModulesAssetsModelsAudiosprite extends Urso.Core.Modules.Assets.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.assets.AUDIOSPRITE;
+        this.codecs = ['ogg', 'm4a', 'mp3', 'wav'];
+
+        const codec = this.codecs.filter(codec => Howler.codecs(codec))[0];
+
+        this.contents = Urso.helper.recursiveGet('contents', params, [
+            { type: Urso.types.assets.JSON, key: `${this.key}_audiospriteJson`, path: `${this.path}.json` },
+            { type: Urso.types.assets.SOUND, key: `${this.key}_audiospriteSound`, path: `${this.path}.${codec}` }
+        ]);
+
+        this.path = false;
+        this.key = false;
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.path = Urso.helper.recursiveGet('path', params, false);
+    }
+}
+
 module.exports = ModulesAssetsModelsAudiosprite;

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

@@ -1,9 +1,9 @@
-class ModulesAssetsModelsBitmapFont extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.BITMAPFONT;
-    }
-}
-
+class ModulesAssetsModelsBitmapFont extends Urso.Core.Modules.Assets.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.assets.BITMAPFONT;
+    }
+}
+
 module.exports = ModulesAssetsModelsBitmapFont;