@urso/core 0.2.6 → 0.2.7

package/src/js/modules/objects/models/dragonBones.js

@@ -1,250 +1,250 @@
-const POOL_NAME = 'core.ObjectsModelsDragonBones.pool';
-
-class ModulesObjectsModelsDragonBones extends Urso.Core.Modules.Objects.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this._pool = this._checkPool();
-        this._poolMember = null;
-        this.type = Urso.types.objects.DRAGONBONES;
-
-        this._onStart = null;
-        this._onLoop = null;
-        this._onComplete = null;
-        this._onCompleteOnce = null;
-
-        this.setAnimationConfig({}, true);
-        this._addBaseObject();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
-
-        this.animation = {
-            timeScale: 1,
-            animationName: Urso.helper.recursiveGet('animation.animationName', params, false),
-            armatureName: Urso.helper.recursiveGet('animation.armatureName', params, false),
-            autoplay: Urso.helper.recursiveGet('animation.autoplay', params, false),
-            loop: Urso.helper.recursiveGet('animation.loop', params, false),
-            onStart: Urso.helper.recursiveGet('animation.onStart', params, false),
-            onLoop: Urso.helper.recursiveGet('animation.onLoop', params, false),
-            onComplete: Urso.helper.recursiveGet('animation.onComplete', params, false),
-            onCompleteOnce: Urso.helper.recursiveGet('animation.onCompleteOnce', params, false)
-        };
-    }
-
-    _addBaseObject() {
-        const assets = this._getAssets();
-
-        if (!this.animation.armatureName || !assets) {
-            this._baseObject = new PIXI.Sprite();
-            return;
-        }
-
-        this._createAnimationObject(assets);
-
-        const { animationName, autoplay, loop } = this.animation;
-
-        if (autoplay)
-            this.play(animationName, loop);
-    };
-
-    _getAssets() {
-        const skeletonJson = Urso.cache.getJson(`${this.assetKey}_skeletonJson`);
-        const textureJson = Urso.cache.getJson(`${this.assetKey}_textureJson`);
-        const textureImage = Urso.cache.getImage(`${this.assetKey}_textureImage`);
-
-        if (!skeletonJson || !textureJson || !textureImage) {
-            Urso.logger.error('ModulesObjectsModelsDragonBones assets error: no DragonBones object ' + this.assetKey);
-            return false;
-        }
-
-        return { skeletonJson, textureJson, textureImage };
-    }
-
-    _createAnimationObject(assets) {
-        const { armatureName } = this.animation;
-        this._poolMember = this._pool.getElement(armatureName, assets);
-        this._baseObject = this._poolMember.data;
-        this._setCommonFunctions.bind(this)();
-        this._setCallbacks();
-    }
-
-    _constructorFunction(armatureName, assets) {
-        const { skeletonJson, textureJson, textureImage } = assets;
-
-        const factory = Urso.DragonBones.PixiFactory.factory;
-
-        if (!factory._dragonBonesDataMap[skeletonJson.data.name])
-            factory.parseDragonBonesData(skeletonJson.data);
-
-        factory.parseTextureAtlasData(textureJson.data, textureImage.texture);
-
-        return factory.buildArmatureDisplay(armatureName);
-    }
-
-    _resetAnimationFunction(object) {  //this._baseObject
-        object.removeAllListeners(Urso.DragonBones.EventObject.START);
-        object.removeAllListeners(Urso.DragonBones.EventObject.LOOP_COMPLETE);
-        object.removeAllListeners(Urso.DragonBones.EventObject.COMPLETE);
-        object.filters = [];
-        return object;
-    }
-
-    _removeCallbacks(config) {
-        if (this._onStart && config.onStart) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.START, this._onStart);
-            this._onStart = null;
-        }
-
-        if (this._onLoop && config.onLoop) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
-            this._onLoop = null;
-        }
-
-        if (this._onComplete && config.onComplete) {
-            this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
-            this._onComplete = null;
-        }
-
-        if (this._onCompleteOnce && config.onCompleteOnce) {
-            this._removeOnCompleteOnce(config);
-        }
-    };
-
-    _removeOnCompleteOnce() {
-        this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
-        this._onCompleteOnce = null;
-    }
-
-    _setCallbacks() {
-        if (this.animation.onStart) {
-            this._onStart = this.animation.onStart.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.START, this._onStart);
-        }
-
-        if (this.animation.onLoop) {
-            this._onLoop = this.animation.onLoop.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
-        }
-
-        if (this.animation.onComplete) {
-            this._onComplete = this.animation.onComplete.bind(this);
-            this._baseObject.addListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
-        }
-
-        if (this.animation.onCompleteOnce) {
-            const onCompleteOnce = this.animation.onCompleteOnce.bind(this);
-
-            this.animation.onCompleteOnce = null;
-
-            this._onCompleteOnce = () => {
-                this._removeOnCompleteOnce();
-                onCompleteOnce();
-            };
-
-            this._baseObject.once(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
-        }
-    }
-
-    /**
-     *
-     * @param {*} config
-     * @param {boolean} [noObjectCreate] dont use this flag out of core
-     *
-     * config keys:
-     *      animationName
-     *      armatureName
-            autoplay
-            timeScale
-            onStart
-            onLoop
-            onComplete
-            onCompleteOnce
-     */
-    setAnimationConfig(config = {}, noObjectCreate) {
-        if (this.stop)
-            this.stop();
-
-        this.animation = {
-            ...this.animation,
-            ...config
-        };
-
-        if (config.timeScale)
-            this._baseObject.animation.timeScale = config.timeScale;
-
-        if (config.onStart || config.onLoop || config.onComplete || config.onCompleteOnce) {
-            this._removeCallbacks(config);
-            this._setCallbacks();
-        }
-
-        if (noObjectCreate || !config.armatureName)
-            return;
-
-        let parent = null;
-
-        if (this._baseObject) {
-            parent = this._baseObject.parent;
-            this._customDestroy();
-        }
-
-        const assets = this._getAssets();
-
-        if (assets)
-            this._createAnimationObject(assets);
-
-        if (parent) {
-            parent.addChild(this._baseObject);
-            //update common properties after adding to apply model settings
-            Urso.objects._updateCommonProperties(this);
-        }
-    }
-
-    /**
-     * run play animation
-     * @param {number} times 
-     */
-    play(animationName, loopFlag = false) {
-        if (!this._baseObject.animation) {
-            Urso.logger.error(`DragonBones animation not found!`);
-            return;
-        }
-
-        if (this.stop)
-            this.stop();
-
-        const times = (loopFlag) ? -1 : 1;
-
-        this._baseObject.animation.play(animationName, times);
-    }
-
-    _setCommonFunctions() {
-        this.stop = this._baseObject.animation.stop.bind(this._baseObject.animation);
-    }
-
-    _customDestroy() {
-        this._pool.putElement(this._poolMember);
-
-        if (this._baseObject.parent)
-            this._baseObject.parent.removeChild(this._baseObject);
-
-        this._baseObject = null;
-    }
-
-    _checkPool() {
-        const pool = Urso.localData.get(POOL_NAME);
-
-        if (pool)
-            return pool;
-
-        const newPool = new Urso.Game.Lib.ObjectPool(this._constructorFunction.bind(this), this._resetAnimationFunction.bind(this));
-        Urso.localData.set(POOL_NAME, newPool);
-
-        return newPool;
-    }
-}
-
-module.exports = ModulesObjectsModelsDragonBones;
+const POOL_NAME = 'core.ObjectsModelsDragonBones.pool';
+
+class ModulesObjectsModelsDragonBones extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this._pool = this._checkPool();
+        this._poolMember = null;
+        this.type = Urso.types.objects.DRAGONBONES;
+
+        this._onStart = null;
+        this._onLoop = null;
+        this._onComplete = null;
+        this._onCompleteOnce = null;
+
+        this.setAnimationConfig({}, true);
+        this._addBaseObject();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
+
+        this.animation = {
+            timeScale: 1,
+            animationName: Urso.helper.recursiveGet('animation.animationName', params, false),
+            armatureName: Urso.helper.recursiveGet('animation.armatureName', params, false),
+            autoplay: Urso.helper.recursiveGet('animation.autoplay', params, false),
+            loop: Urso.helper.recursiveGet('animation.loop', params, false),
+            onStart: Urso.helper.recursiveGet('animation.onStart', params, false),
+            onLoop: Urso.helper.recursiveGet('animation.onLoop', params, false),
+            onComplete: Urso.helper.recursiveGet('animation.onComplete', params, false),
+            onCompleteOnce: Urso.helper.recursiveGet('animation.onCompleteOnce', params, false)
+        };
+    }
+
+    _addBaseObject() {
+        const assets = this._getAssets();
+
+        if (!this.animation.armatureName || !assets) {
+            this._baseObject = new PIXI.Sprite();
+            return;
+        }
+
+        this._createAnimationObject(assets);
+
+        const { animationName, autoplay, loop } = this.animation;
+
+        if (autoplay)
+            this.play(animationName, loop);
+    };
+
+    _getAssets() {
+        const skeletonJson = Urso.cache.getJson(`${this.assetKey}_skeletonJson`);
+        const textureJson = Urso.cache.getJson(`${this.assetKey}_textureJson`);
+        const textureImage = Urso.cache.getImage(`${this.assetKey}_textureImage`);
+
+        if (!skeletonJson || !textureJson || !textureImage) {
+            Urso.logger.error('ModulesObjectsModelsDragonBones assets error: no DragonBones object ' + this.assetKey);
+            return false;
+        }
+
+        return { skeletonJson, textureJson, textureImage };
+    }
+
+    _createAnimationObject(assets) {
+        const { armatureName } = this.animation;
+        this._poolMember = this._pool.getElement(armatureName, assets);
+        this._baseObject = this._poolMember.data;
+        this._setCommonFunctions.bind(this)();
+        this._setCallbacks();
+    }
+
+    _constructorFunction(armatureName, assets) {
+        const { skeletonJson, textureJson, textureImage } = assets;
+
+        const factory = Urso.DragonBones.PixiFactory.factory;
+
+        if (!factory._dragonBonesDataMap[skeletonJson.data.name])
+            factory.parseDragonBonesData(skeletonJson.data);
+
+        factory.parseTextureAtlasData(textureJson.data, textureImage.texture);
+
+        return factory.buildArmatureDisplay(armatureName);
+    }
+
+    _resetAnimationFunction(object) {  //this._baseObject
+        object.removeAllListeners(Urso.DragonBones.EventObject.START);
+        object.removeAllListeners(Urso.DragonBones.EventObject.LOOP_COMPLETE);
+        object.removeAllListeners(Urso.DragonBones.EventObject.COMPLETE);
+        object.filters = [];
+        return object;
+    }
+
+    _removeCallbacks(config) {
+        if (this._onStart && config.onStart) {
+            this._baseObject.removeListener(Urso.DragonBones.EventObject.START, this._onStart);
+            this._onStart = null;
+        }
+
+        if (this._onLoop && config.onLoop) {
+            this._baseObject.removeListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
+            this._onLoop = null;
+        }
+
+        if (this._onComplete && config.onComplete) {
+            this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
+            this._onComplete = null;
+        }
+
+        if (this._onCompleteOnce && config.onCompleteOnce) {
+            this._removeOnCompleteOnce(config);
+        }
+    };
+
+    _removeOnCompleteOnce() {
+        this._baseObject.removeListener(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
+        this._onCompleteOnce = null;
+    }
+
+    _setCallbacks() {
+        if (this.animation.onStart) {
+            this._onStart = this.animation.onStart.bind(this);
+            this._baseObject.addListener(Urso.DragonBones.EventObject.START, this._onStart);
+        }
+
+        if (this.animation.onLoop) {
+            this._onLoop = this.animation.onLoop.bind(this);
+            this._baseObject.addListener(Urso.DragonBones.EventObject.LOOP_COMPLETE, this._onLoop);
+        }
+
+        if (this.animation.onComplete) {
+            this._onComplete = this.animation.onComplete.bind(this);
+            this._baseObject.addListener(Urso.DragonBones.EventObject.COMPLETE, this._onComplete);
+        }
+
+        if (this.animation.onCompleteOnce) {
+            const onCompleteOnce = this.animation.onCompleteOnce.bind(this);
+
+            this.animation.onCompleteOnce = null;
+
+            this._onCompleteOnce = () => {
+                this._removeOnCompleteOnce();
+                onCompleteOnce();
+            };
+
+            this._baseObject.once(Urso.DragonBones.EventObject.COMPLETE, this._onCompleteOnce);
+        }
+    }
+
+    /**
+     *
+     * @param {*} config
+     * @param {boolean} [noObjectCreate] dont use this flag out of core
+     *
+     * config keys:
+     *      animationName
+     *      armatureName
+            autoplay
+            timeScale
+            onStart
+            onLoop
+            onComplete
+            onCompleteOnce
+     */
+    setAnimationConfig(config = {}, noObjectCreate) {
+        if (this.stop)
+            this.stop();
+
+        this.animation = {
+            ...this.animation,
+            ...config
+        };
+
+        if (config.timeScale)
+            this._baseObject.animation.timeScale = config.timeScale;
+
+        if (config.onStart || config.onLoop || config.onComplete || config.onCompleteOnce) {
+            this._removeCallbacks(config);
+            this._setCallbacks();
+        }
+
+        if (noObjectCreate || !config.armatureName)
+            return;
+
+        let parent = null;
+
+        if (this._baseObject) {
+            parent = this._baseObject.parent;
+            this._customDestroy();
+        }
+
+        const assets = this._getAssets();
+
+        if (assets)
+            this._createAnimationObject(assets);
+
+        if (parent) {
+            parent.addChild(this._baseObject);
+            //update common properties after adding to apply model settings
+            Urso.objects._updateCommonProperties(this);
+        }
+    }
+
+    /**
+     * run play animation
+     * @param {number} times 
+     */
+    play(animationName, loopFlag = false) {
+        if (!this._baseObject.animation) {
+            Urso.logger.error(`DragonBones animation not found!`);
+            return;
+        }
+
+        if (this.stop)
+            this.stop();
+
+        const times = (loopFlag) ? -1 : 1;
+
+        this._baseObject.animation.play(animationName, times);
+    }
+
+    _setCommonFunctions() {
+        this.stop = this._baseObject.animation.stop.bind(this._baseObject.animation);
+    }
+
+    _customDestroy() {
+        this._pool.putElement(this._poolMember);
+
+        if (this._baseObject.parent)
+            this._baseObject.parent.removeChild(this._baseObject);
+
+        this._baseObject = null;
+    }
+
+    _checkPool() {
+        const pool = Urso.localData.get(POOL_NAME);
+
+        if (pool)
+            return pool;
+
+        const newPool = new Urso.Game.Lib.ObjectPool(this._constructorFunction.bind(this), this._resetAnimationFunction.bind(this));
+        Urso.localData.set(POOL_NAME, newPool);
+
+        return newPool;
+    }
+}
+
+module.exports = ModulesObjectsModelsDragonBones;

package/src/js/modules/objects/models/emitter.js

@@ -1,54 +1,54 @@
-class ModulesObjectsModelsEmitter extends Urso.Core.Modules.Objects.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.objects.EMITTER;
-
-        this.emitter = null;
-
-        this._addBaseObject();
-        this._addEmitter();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.autostart = Urso.helper.recursiveGet('autostart', params, false);
-        this.cfg = Urso.helper.recursiveGet('cfg', params, false); // json asset key with emitter config
-        this.textures = Urso.helper.recursiveGet('textures', params, []); // array of image asset keys
-    }
-
-    _addBaseObject() {
-        this._baseObject = new PIXI.ParticleContainer();
-        this._baseObject.setProperties({
-            scale: true,
-            position: true,
-            rotation: true,
-            uvs: true,
-            alpha: true,
-        });
-    };
-
-    _addEmitter() {
-        const cfg = Urso.cache.getJson(this.cfg);
-        const textures = [];
-
-        if (!cfg || !cfg.data)
-            throw new SyntaxError(`Config error in ${this.name} emitter`);
-
-        for (const textureName of this.textures) {
-            const texture = Urso.cache.getTexture(textureName);
-            if (texture)
-                textures.push(texture);
-        }
-        this.emitter = new PIXI.particles.Emitter(this._baseObject, textures, cfg.data);
-        this.emitter.emit = this.autostart;
-        this.emitter.autoUpdate = true;
-    }
-
-    play() {
-        this.emitter.emit = true;
-    }
-}
-
-module.exports = ModulesObjectsModelsEmitter;
+class ModulesObjectsModelsEmitter extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.EMITTER;
+
+        this.emitter = null;
+
+        this._addBaseObject();
+        this._addEmitter();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.autostart = Urso.helper.recursiveGet('autostart', params, false);
+        this.cfg = Urso.helper.recursiveGet('cfg', params, false); // json asset key with emitter config
+        this.textures = Urso.helper.recursiveGet('textures', params, []); // array of image asset keys
+    }
+
+    _addBaseObject() {
+        this._baseObject = new PIXI.ParticleContainer();
+        this._baseObject.setProperties({
+            scale: true,
+            position: true,
+            rotation: true,
+            uvs: true,
+            alpha: true,
+        });
+    };
+
+    _addEmitter() {
+        const cfg = Urso.cache.getJson(this.cfg);
+        const textures = [];
+
+        if (!cfg || !cfg.data)
+            throw new SyntaxError(`Config error in ${this.name} emitter`);
+
+        for (const textureName of this.textures) {
+            const texture = Urso.cache.getTexture(textureName);
+            if (texture)
+                textures.push(texture);
+        }
+        this.emitter = new PIXI.particles.Emitter(this._baseObject, textures, cfg.data);
+        this.emitter.emit = this.autostart;
+        this.emitter.autoUpdate = true;
+    }
+
+    play() {
+        this.emitter.emit = true;
+    }
+}
+
+module.exports = ModulesObjectsModelsEmitter;