@urso/core 0.7.1 → 0.7.3

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

@@ -27,8 +27,8 @@ object-assign
  */
 
 /*!
- * @pixi-spine/loader-base - v3.0.13
- * Compiled Mon, 13 Sep 2021 16:46:34 UTC
+ * @pixi-spine/loader-base - v3.1.0
+ * Compiled Wed, 03 Aug 2022 16:58:28 UTC
  *
  * @pixi-spine/loader-base is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -37,8 +37,8 @@ object-assign
  */
 
 /*!
- * @pixi-spine/runtime-3.8 - v3.0.13
- * Compiled Mon, 13 Sep 2021 16:46:34 UTC
+ * @pixi-spine/runtime-3.8 - v3.1.0
+ * Compiled Wed, 03 Aug 2022 16:58:28 UTC
  *
  * @pixi-spine/runtime-3.8 is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -47,114 +47,298 @@ object-assign
  */
 
 /*!
- * @pixi/constants - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/accessibility - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/accessibility is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/app - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/app is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/compressed-textures - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/compressed-textures is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/constants - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/constants is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/core - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/core - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/core is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/display - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/display - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/display is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/extract - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/extensions - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/extensions is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/extract - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/extract is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/filter-displacement - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/filter-alpha - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/filter-alpha is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/filter-blur - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/filter-blur is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/filter-color-matrix - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/filter-color-matrix is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/filter-displacement - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/filter-displacement is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/loaders - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/filter-fxaa - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/filter-fxaa is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/filter-noise - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/filter-noise is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/graphics - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/graphics is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/interaction - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/interaction is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/loaders - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/loaders is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/math - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/math - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/math is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/mixin-get-child-by-name - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/mesh - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/mesh is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/mesh-extras - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/mesh-extras is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/mixin-cache-as-bitmap - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/mixin-cache-as-bitmap is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/mixin-get-child-by-name - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 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 - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/mixin-get-global-position - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/mixin-get-global-position is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/polyfill - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/particle-container - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/particle-container is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/polyfill - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/polyfill is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/prepare - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/prepare - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/prepare is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/runner - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/runner - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/runner is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/ticker - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * @pixi/settings - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/settings is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/sprite - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/sprite is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/sprite-animated - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/sprite-animated is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/sprite-tiling - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/sprite-tiling is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/spritesheet - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/spritesheet is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/text - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/text is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/text-bitmap - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/text-bitmap is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * @pixi/ticker - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * @pixi/ticker is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * GSAP 3.7.1
+ * @pixi/utils - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
+ *
+ * @pixi/utils is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+/*!
+ * GSAP 3.11.3
  * https://greensock.com
  *
- * @license Copyright 2008-2021, GreenSock. All rights reserved.
+ * @license Copyright 2008-2022, GreenSock. All rights reserved.
  * Subject to the terms at https://greensock.com/standard-license or for
  * Club GreenSock members, the agreement issued with that membership.
  * @author: Jack Doyle, jack@greensock.com
@@ -169,8 +353,8 @@ object-assign
  */
 
 /*!
- * pixi-spine - v3.0.13
- * Compiled Mon, 13 Sep 2021 16:46:43 UTC
+ * pixi-spine - v3.1.0
+ * Compiled Wed, 03 Aug 2022 17:00:10 UTC
  *
  * pixi-spine is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -179,8 +363,8 @@ object-assign
  */
 
 /*!
- * pixi-viewport - v4.34.3
- * Compiled Wed, 01 Dec 2021 19:28:04 UTC
+ * pixi-viewport - v4.37.0
+ * Compiled Sun, 23 Oct 2022 14:02:15 UTC
  *
  * pixi-viewport is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -189,8 +373,8 @@ object-assign
  */
 
 /*!
- * pixi.js - v6.2.1
- * Compiled Tue, 21 Dec 2021 19:56:15 UTC
+ * pixi.js - v6.5.8
+ * Compiled Sun, 23 Oct 2022 23:01:45 UTC
  *
  * pixi.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -29,7 +29,7 @@
     "pixi-particles": "^4.3.0",
     "pixi-projection": "0.3.15",
     "pixi-scrollbox": "^2.3.1",
-    "pixi-spine": "^3.0.13",
+    "pixi-spine": "^3.1.2",
     "pixi-text-input": "^1.0.6",
     "pixi-viewport": "^4.34.0",
     "pixi.js": "^6.2.0"

package/src/js/lib/objectPool.js

@@ -16,22 +16,25 @@ class ObjectPoolMember {
 
 /**
  * @param {Function} constructorFunction - function to constract element
- * @param {Function} constructorFunction - function to reset element when put back to pool
+ * @param {Function} resetFunction - function to reset element when put back to pool
  * @param {Number} [initialSize] - initial pool size. Use only if you not using keys when constract
  * @param {Number} [maxSize] - max pool size. Old elements will be removed from pool
+ * @param {Function} removeFunction - function to remove element from pool. Happens, when max size is reached
  */
 class LibObjectPool {
 
     _pool = {};
-    resetFunction = () => { };
     constructorFunction = () => { };
+    resetFunction = () => { };
+    removeFunction = () => { };
     _maxSize = 0;
 
     _lastBranchKeys = {};
     _putTimeCache = {};
 
-    constructor(constructorFunction, resetFunction = (obj) => obj, initialSize = 0, maxSize = 0) {
+    constructor(constructorFunction, resetFunction = (obj) => obj, initialSize = 0, maxSize = 0, removeFunction = (obj) => obj) {
         this.resetFunction = resetFunction;
+        this.removeFunction = removeFunction;
         this.constructorFunction = constructorFunction;
         this._maxSize = maxSize;
 
@@ -112,6 +115,7 @@ class LibObjectPool {
         delete this._pool[element.key][element.branchKey];
 
         //reset element
+        this.removeFunction(element.data);
         element.free = false;
         element.putCacheTimeKey = 0;
         element.key = null;

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

@@ -125,7 +125,7 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
             .filter((container) => container._baseObject.worldVisible)
             .filter((container) => !container._needBlock)
             .filter((container) => {
-                let height = container.getAbsoluteSize().height;
+                const height = container.getAbsoluteSize().height;
                 return container.height - height < 0;
             })
             .sort((firstContainer, secondContainer) => secondContainer.dragIndex - firstContainer.dragIndex);
@@ -184,30 +184,17 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
      * @returns { Array }
      */
     _getObjectPoints(container) {
-        if (Urso.device.desktop) {
-            const { x, y } = this._getScaleAndPositionRecursive(this);
-            const { width, height } = container._mask;
-            const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
-
-            return [
-                { x, y },
-                { x: x + width * scaleX, y },
-                { x: x + width * scaleX, y: y + height * scaleY },
-                { x, y: y + height * scaleY }
-            ];
-
-        } else {
-            const { x, y } = container._mask.toGlobal(new PIXI.Point(0, 0));
-            const { width, height } = container._mask;
-            const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
-            return [
-                { x, y },
-                { x: x + width * scaleX, y },
-                { x: x + width * scaleX, y: y + height * scaleY },
-                { x, y: y + height * scaleY }
-            ];
-        }
+        const { x, y } = container._mask.toGlobal(new PIXI.Point(0, 0));
+
+        const { width, height } = container._mask;
+        const { scaleX, scaleY } = this._getScaleAndPositionRecursive(this);
 
+        return [
+            { x, y },
+            { x: x + width * scaleX, y },
+            { x: x + width * scaleX, y: y + height * scaleY },
+            { x, y: y + height * scaleY }
+        ];
     }
 
     /**
@@ -495,19 +482,13 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
      * Drags container on pointer move.
      * @param { Object } event 
      */
-    _onPointerMove(event) {
+     _onPointerMove(event) {
         let { data: { global: { x, y } } } = event;
 
-        if (Urso.device.desktop) {
-            x = Urso.scenes.getMouseCoords().x;
-            y = Urso.scenes.getMouseCoords().y;
-        }
-
         if (!this._startPosition) {
             this._startPosition = { x, y };
         }
 
-
         if (!this._isActive({ x, y })) {
             this._moveInProgress = false;
             return;
@@ -633,6 +614,7 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
                 this._moveStartedY = event.changedTouches[0].offsetY || event.changedTouches[0].clientY;
                 this._documentPointerStart(event);
                 break;
+            case 'mousemove':
             case 'touchmove':
                 this._documentPointerMove(event);
                 break;
@@ -643,9 +625,6 @@ class ModulesObjectsModelsDragContainer extends ModulesObjectsModelsContainer {
             case 'wheel':
                 this._documentWheelScroll(event);
                 break;
-            case 'pointermove':
-                this._onPointerMove(event);
-                break;
             default:
                 break;
         }

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

@@ -23,6 +23,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         };
 
         params.animation = this.animation; //we redefine original property here
+        this.contents = Urso.helper.recursiveGet('contents', params, []);
     }
 
     /**
@@ -35,6 +36,25 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         this._baseObject.state.setAnimation(track, animationName, loopFlag);
     }
 
+    /**
+     * set up the mixes between animations
+     * @param {String} from - animation name
+     * @param {String} to - animation name
+     * @param {Number} duration - time in seconds
+     * @example setMix("walk", "jump", 0.2)
+     */
+    setMix(from, to, duration) {
+        this._baseObject.stateData.setMix(from, to, duration);
+    }
+
+    /**
+     * Clears all listeners and resubscribes to spine events
+     */
+    clearListeners() {
+        this._baseObject.state.clearListeners();
+        this._baseObject.state.addListener({ event: this._eventHandler.bind(this) });
+    }
+
     /**
      * set skin by name
      * @param {String} skinName 
@@ -226,6 +246,9 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         if (!spineAsset)
             Urso.logger.error('ModulesObjectsModelsSpine assets error: no spine object ' + this.assetKey);
 
+        if (!spineAsset.spineData)
+            Urso.logger.error('ModulesObjectsModelsSpine assets error: no spine correct object (no spineData) for key ' + this.assetKey);
+
         this._baseObject = new PIXI.spine.Spine(spineAsset.spineData);
         //this._baseObject.state.timeScale = this.animation.timeScale;
         Object.defineProperty(this._baseObject.state, 'timeScale', { get: this.getTimeScale.bind(this) });
@@ -256,7 +279,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
             if (replaceSlotContents)
                 currentSlot.removeChildren(); //todo check if its proxy and reset parent
 
-            object.parent = this; //todo make removeChild for addedToSlotObjects
+            this.addChild(object); //todo make removeChild for addedToSlotObjects
             currentSlot.addChild(object._baseObject);
             Urso.objects.refreshStyles();
         } else {
@@ -273,4 +296,4 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
     }
 }
 
-module.exports = ModulesObjectsModelsSpine;
+module.exports = ModulesObjectsModelsSpine;

package/src/js/modules/objects/propertyAdapter.js

@@ -46,6 +46,7 @@ class PropertyAdapter {
             Urso.types.objects.GROUP,
             Urso.types.objects.SCROLLBOX,
             Urso.types.objects.SLIDER,
+            Urso.types.objects.SPINE,
             Urso.types.objects.WORLD
         ];
 
@@ -203,7 +204,7 @@ class PropertyAdapter {
         if (typeof object.anchorX !== 'number' || object.anchorX < 0 || object.anchorX > 1)
             Urso.logger.error('AnchorX value is not valid!', object);
 
-        if (this._canBeParent(object)) { //parent types
+        if (this._canBeParent(object) && !this._typesWithoutAnchor.includes(object.type)) { //parent types
             if (object.anchorX === 0)
                 return 0;
 
@@ -231,7 +232,7 @@ class PropertyAdapter {
         if (typeof object.anchorY !== 'number' || object.anchorY < 0 || object.anchorY > 1)
             Urso.logger.error('AnchorY value is not valid!', object);
 
-        if (this._canBeParent(object)) { //parent types
+        if (this._canBeParent(object) && !this._typesWithoutAnchor.includes(object.type)) { //parent types
             if (object.anchorY === 0)
                 return 0;