@urso/core 0.2.8 → 0.3.0

package/build/js/index.js.LICENSE.txt

@@ -27,125 +27,129 @@ object-assign
  */
 
 /*!
- * @pixi/constants - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi-spine/loader-base - v3.0.13
+ * Compiled Mon, 13 Sep 2021 16:46:34 UTC
+ *
+ * @pixi-spine/loader-base is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ * 
+ * Copyright 2019-2020, Ivan Igorevich Popelyshev <ivan.popelyshev@gmail.com>, All Rights Reserved
+ */
+
+/*!
+ * @pixi-spine/runtime-3.8 - v3.0.13
+ * Compiled Mon, 13 Sep 2021 16:46:34 UTC
+ *
+ * @pixi-spine/runtime-3.8 is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ * 
+ * Copyright 2019-2020, Ivan Igorevich Popelyshev <ivan.popelyshev@gmail.com>, All Rights Reserved
+ */
+
+/*!
+ * @pixi/constants - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/constants is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/core - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/core - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/core is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/display - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/display - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/display is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/extract - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/extract - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/extract is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/filter-displacement - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/filter-displacement - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/filter-displacement is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/loaders - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/loaders - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/loaders is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/math - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/math - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/math is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/mesh-extras - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
- *
- * @pixi/mesh-extras is licensed under the MIT License.
- * http://www.opensource.org/licenses/mit-license
- */
-
-/*!
- * @pixi/mixin-get-child-by-name - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/mixin-get-child-by-name - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/mixin-get-child-by-name is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/mixin-get-global-position - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/mixin-get-global-position - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/mixin-get-global-position is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/polyfill - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/polyfill - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/polyfill is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/prepare - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/prepare - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/prepare is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/runner - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/runner - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/runner is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/ticker - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
+ * @pixi/ticker - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
  * @pixi/ticker is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
-/*!
- * @pixi/utils - v5.3.11
- * Compiled Mon, 01 Nov 2021 16:10:12 UTC
- *
- * @pixi/utils is licensed under the MIT License.
- * http://www.opensource.org/licenses/mit-license
- */
-
 /*!
  * GSAP 3.8.0
  * https://greensock.com
@@ -164,6 +168,16 @@ object-assign
  * http://www.opensource.org/licenses/mit-license
  */
 
+/*!
+ * pixi-spine - v3.0.13
+ * Compiled Mon, 13 Sep 2021 16:46:43 UTC
+ *
+ * pixi-spine is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ * 
+ * Copyright 2019-2020, Ivan Igorevich Popelyshev <ivan.popelyshev@gmail.com>, All Rights Reserved
+ */
+
 /*!
  * pixi-viewport - v4.34.3
  * Compiled Wed, 01 Dec 2021 19:28:04 UTC
@@ -175,14 +189,28 @@ object-assign
  */
 
 /*!
- * resource-loader - v3.0.1
- * https://github.com/pixijs/pixi-sound
- * Compiled Tue, 02 Jul 2019 14:06:18 UTC
+ * pixi.js - v6.2.0
+ * Compiled Mon, 01 Nov 2021 16:52:10 UTC
  *
- * resource-loader is licensed under the MIT license.
+ * pixi.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -27,9 +27,8 @@
     "howler": "^2.2.1",
     "pixi-particles": "^4.3.0",
     "pixi-projection": "0.3.15",
-    "pixi-spine": "^2.1.11",
-    "pixi.js": "^5.1.3",
-    "pixi5-dragonbones": "5.7.0-2",
+    "pixi-spine": "^3.0.13",
+    "pixi.js": "^6.2.0",
     "pixi-scrollbox": "^2.3.1",
     "pixi-viewport": "^4.34.0",
     "pixi-text-input": "^1.0.6"

package/src/js/extra/_info.js

@@ -6,12 +6,10 @@ import { DropShadowFilter } from '@pixi/filter-drop-shadow';
 PIXI.filters['DropShadowFilter'] = DropShadowFilter;
 
 
-require("pixi-spine");
+window.PIXI.spine = require("pixi-spine");
 require("pixi-projection");
 require("pixi-text-input");
 
-Urso.DragonBones = require("pixi5-dragonbones");
-
 import { gsap } from 'gsap';
 window.gsap = gsap;
 

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

@@ -3,7 +3,6 @@ Urso.Core.Modules.Assets.Models = {
     Atlas: require('./atlas.js'),
     BitmapFont: require('./bitmapFont.js'),
     Container: require('./container.js'),
-    DragonBones: require('./dragonBones.js'),
     Image: require('./image.js'),
     Json: require('./json.js'),
     Sound: require('./sound.js'),

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

@@ -189,9 +189,6 @@ class ModulesAssetsService {
             case Urso.types.assets.CONTAINER:
                 model = this.getInstance('Models.Container', asset)
                 break;
-            case Urso.types.assets.DRAGONBONES:
-                model = this.getInstance('Models.DragonBones', asset)
-                break;
             case Urso.types.assets.ATLAS:
                 model = this.getInstance('Models.Atlas', asset)
                 break;
@@ -221,7 +218,7 @@ class ModulesAssetsService {
         //set loadingGroup
         model.loadingGroup = loadingGroup || model.loadingGroup || this.getInstance('Config').loadingGroups.initial;
 
-        //check if container or dragonbones
+        //check if container
         if (model.contents) {
             for (let content of model.contents) {
                 this._addAsset(content, model.loadingGroup);

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

@@ -89,9 +89,6 @@ class ModulesObjectsCreate {
             case Urso.types.objects.BITMAPTEXT:
                 model = this.getInstance('Models.BitmapText', object);
                 break;
-            case Urso.types.objects.DRAGONBONES:
-                model = this.getInstance('Models.DragonBones', object);
-                break;
             case Urso.types.objects.HITAREA:
                 model = this.getInstance('Models.HitArea', object);
                 break;

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

@@ -6,7 +6,6 @@ Urso.Core.Modules.Objects.Models = {
     Collection: require('./collection.js'),
     Component: require('./component.js'),
     Container: require('./container.js'),
-    DragonBones: require('./dragonBones.js'),
     Emitter: require('./emitter.js'),
     Graphics: require('./graphics.js'),
     Group: require('./group.js'),

package/src/js/modules/template/types.js

@@ -9,9 +9,8 @@ class ModulesTemplateTypes {
                 SPINE: 5,
                 BITMAPFONT: 6,
                 SOUND: 7,
-                DRAGONBONES: 8,
-                FONT: 9,
-                AUDIOSPRITE: 10
+                FONT: 8,
+                AUDIOSPRITE: 9
             },
 
             objects: {
@@ -31,13 +30,12 @@ class ModulesTemplateTypes {
                 COMPONENT: 14,
                 GROUP: 15,
                 IMAGES_ANIMATION: 16,
-                DRAGONBONES: 17,
-                ATLASIMAGE: 18,
-                SLIDER: 19,
-                TOGGLE: 20,
-                CHECKBOX: 21,
-                SCROLLBOX: 22,
-                TEXTINPUT: 23
+                ATLASIMAGE: 17,
+                SLIDER: 18,
+                TOGGLE: 19,
+                CHECKBOX: 20,
+                SCROLLBOX: 21,
+                TEXTINPUT: 22
             }
         }
     }

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

@@ -1,27 +0,0 @@
-class ModulesAssetsModelsDragonBones extends Urso.Core.Modules.Assets.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.assets.DRAGONBONES;
-
-        //for manual filenames setup
-        this.contents = Urso.helper.recursiveGet('contents', params, [
-            { type: Urso.types.assets.JSON, key: `${this.key}_skeletonJson`, path: this.skeletonJson },
-            { type: Urso.types.assets.JSON, key: `${this.key}_textureJson`, path: this.textureJson },
-            { type: Urso.types.assets.IMAGE, key: `${this.key}_textureImage`, path: this.textureImage }
-        ]);
-
-        this.path = false;
-        this.key = false;
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.skeletonJson = Urso.helper.recursiveGet('skeletonJson', params, false);
-        this.textureJson = Urso.helper.recursiveGet('textureJson', params, false);
-        this.textureImage = Urso.helper.recursiveGet('textureImage', params, false);
-    }
-}
-
-module.exports = ModulesAssetsModelsDragonBones;

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

@@ -1,250 +0,0 @@
-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;