@urso/core 0.7.96-dev → 0.7.97

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

@@ -149,12 +149,11 @@ object-assign
  */
 
 /*!
- * GSAP 3.12.5
+ * GSAP 3.14.2
  * https://gsap.com
  *
- * @license Copyright 2008-2024, GreenSock. All rights reserved.
- * Subject to the terms at https://gsap.com/standard-license or for
- * Club GSAP members, the agreement issued with that membership.
+ * @license Copyright 2008-2025, GreenSock. All rights reserved.
+ * Subject to the terms at https://gsap.com/standard-license
  * @author: Jack Doyle, jack@greensock.com
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.96-dev",
+  "version": "0.7.97",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -30,7 +30,8 @@
     "pixi-scrollbox": "^2.3.1",
     "pixi-spine": "^3.1.2",
     "pixi-viewport": "^4.34.0",
-    "pixi.js": "^6.2.0"
+    "pixi.js": "^6.2.0",
+    "pixi-text-input": "^1.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",

package/src/js/config/main.js

@@ -11,7 +11,8 @@ let ConfigMain = {
     fps: {
         limit: 60, //max fps limit
         optimizeLowPerformance: false //down to 30 fps if lower 60
-    }
+    },
+    domParentSelector: false //or '#app-container' - div selector, to append canvas
 };
 
 module.exports = ConfigMain;

package/src/js/extra/main.js

@@ -1,10 +1,12 @@
 import * as PIXI from 'pixi.js';
+import TextInput from 'pixi-text-input';
 window.PIXI = PIXI;
 window.PIXI.particles = require('pixi-particles');
 
 window.PIXI.particlesFx = require('@urso/revolt-fx');
 
 window.PIXI.spine = require("pixi-spine");
+window.PIXI.TextInput = TextInput;
 
 import { AtlasAttachmentLoader, SkeletonJson } from "@pixi-spine/runtime-3.8";
 window.PIXI.spine.AtlasAttachmentLoader = AtlasAttachmentLoader;

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

@@ -1,9 +1,11 @@
 const ModulesObjectsBaseModel = require('./../baseModel');
 
 class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
+
     constructor(params) {
         super(params);
         this._isDisabled = false;
+        this._isDown = false;
 
         this.type = Urso.types.objects.HITAREA;
 
@@ -24,6 +26,17 @@ class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
         this.onOverCallback = Urso.helper.recursiveGet('onOverCallback', params, false);
         this.onOutCallback = Urso.helper.recursiveGet('onOutCallback', params, false);
         this.onTouchMoveCallback = Urso.helper.recursiveGet('onTouchMoveCallback', params, false);
+
+        /**
+         * customInteractionArea object ex:
+         * Circle: { "type": "circle", "params": [0, 0, 100] }
+         * Rectangle: { "type": "rectangle", "params": [0, 0, 100, 100] }
+         * Polygon: {
+         *   "type": "polygon",
+         *   "params":  [ 0, 0, 100, 0, 100, 100, 50, 150, 0, 100 ];
+         * }
+         * */
+        this.customInteractionArea = Urso.helper.recursiveGet('customInteractionArea', params, null);
     }
 
     enable() {
@@ -56,11 +69,14 @@ class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
         this._baseObject
             .on('pointerdown', this._onPressDown.bind(this))
             .on('pointerup', this._onPressUp.bind(this))
-            .on('pointerupoutside', this._onPressUp.bind(this))
+            .on('pointerupoutside', this._onPressUpOutside.bind(this))
             .on('pointerover', this._onOver.bind(this))
             .on('pointerout', this._onOut.bind(this))
             .on('touchmove', this._onTouchmove.bind(this));
-    };
+
+        if (this.customInteractionArea)
+            this._baseObject.hitArea = this._getHitAreaObject(this.customInteractionArea);
+    }
 
     _onTouchmove(event) {
         const position = this._getEventLocalPosition(event);
@@ -73,6 +89,11 @@ class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
         if (this._isDisabled)
             return false;
 
+        if (this._isDown)
+            return false;
+
+        this._isDown = true;
+
         if (this.keyDownAction) {
             const position = this._getEventLocalPosition(event);
             this.keyDownAction(position);
@@ -83,12 +104,24 @@ class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
         if (this._isDisabled)
             return false;
 
+        if (!this._isDown)
+            return false;
+
+        this._isDown = false;
+
         if (this.action) {
             const position = this._getEventLocalPosition(event);
             this.action(position);
         }
     }
 
+    _onPressUpOutside() {
+        if (this._isDisabled)
+            return false;
+
+        this._isDown = false;
+    }
+
     _onOver() {
         if (this._isDisabled)
             return false;
@@ -114,6 +147,24 @@ class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
 
         return { x, y };
     }
+
+    _getHitAreaObject({ type, params }) {
+        if (!type) {
+            return null;
+        }
+
+        const objects = {
+            'rectangle': PIXI.Rectangle,
+            'circle': PIXI.Circle,
+            'polygon': PIXI.Polygon
+        }
+
+        if (!objects[type]) {
+            return null;
+        }
+
+        return new objects[type](...params);
+    }
 }
 
 module.exports = ModulesObjectsModelsHitArea;

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

@@ -86,9 +86,10 @@ class ModulesObjectsModelsSpine extends ModulesObjectsBaseModel {
      * play spine animation and execute function after animation completes
      * @param {String} animation - name of the animation to be played
      * @param {Function} func - function to be executed
+     * @param {Number} [track] - you can define track number for current animation
      */
-    playAndThen(animation, func) {
-        this.playInSequenceAndThen([animation], func);
+    playAndThen(animation, func, track) {
+        this.playInSequenceAndThen([animation], func, track);
     }
 
     /**
@@ -103,17 +104,19 @@ class ModulesObjectsModelsSpine extends ModulesObjectsBaseModel {
      * play spine animations in sequence and execute function after last animation completes
      * @param {String[]} animations - names of the animations to be played
      * @param {Function} func - function to be executed
+     * @param {Number} [track] - you can define track number for current animation
      */
-    playInSequenceAndThen(animations, func) {
-        this._playInSequenceAndThen(animations, func);
+    playInSequenceAndThen(animations, func, track) {
+        this._playInSequenceAndThen(animations, func, track);
     }
 
     /**
      * play spine animations in sequence and execute function after last animation completes
      * @param {String[]} animations - names of the animations to be played
      * @param {Function} func - function to be executed
+     * @param {Number} [track] - you can define track number for current animation
      */
-    _playInSequenceAndThen(animations, func) {
+    _playInSequenceAndThen(animations, func, track) {
         this.stop();
         let removeSelf = () => { };
         let animationCount = 0;
@@ -123,7 +126,7 @@ class ModulesObjectsModelsSpine extends ModulesObjectsBaseModel {
                 animationCount++;
 
                 if (animations[animationCount])
-                    this.play(animations[animationCount])
+                    this.play(animations[animationCount], false, track)
                 else {
                     func && func();
                     removeSelf();
@@ -133,7 +136,7 @@ class ModulesObjectsModelsSpine extends ModulesObjectsBaseModel {
 
         removeSelf = () => this._baseObject.state.removeListener(completer);
         this._baseObject.state.addListener(completer);
-        this.play(animations[0]);
+        this.play(animations[0], false, track);
     }
 
     /**
@@ -319,7 +322,7 @@ class ModulesObjectsModelsSpine extends ModulesObjectsBaseModel {
             if (replaceSlotContents)
                 currentSlot.removeChildren(); //todo check if its proxy and reset parent
 
-            this.addChild(object); //todo make removeChild for addedToSlotObjects
+            this.addChild(object, true); //todo make removeChild for addedToSlotObjects
             currentSlot.addChild(object._baseObject);
             Urso.objects.refreshStyles();
         } else {

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

@@ -323,9 +323,9 @@ class PropertyAdapter {
             case 'left':
                 return 0;
             case 'right':
-                return object.parent ? this._getWidthAsNumber(object.parent) - this._getWidthAsNumber(object) : 0; //parentWidth-objectWidth
+                return object.parent ? this._getWidthAsNumber(object.parent) : 0; //parentWidth
             case 'center':
-                const parentWidth = object.parent ? this._getWidthAsNumber(object.parent) - this._getWidthAsNumber(object) : 0;
+                const parentWidth = object.parent ? this._getWidthAsNumber(object.parent) : 0;
                 return parentWidth / 2;
             default:
                 Urso.logger.error('AlignX string is not valid!');
@@ -347,9 +347,9 @@ class PropertyAdapter {
             case 'top':
                 return 0;
             case 'bottom':
-                return object.parent ? this._getHeightAsNumber(object.parent) - this._getHeightAsNumber(object) : 0; //parentHeight
+                return object.parent ? this._getHeightAsNumber(object.parent) : 0; //parentHeight
             case 'center':
-                const parentHeight = object.parent ? this._getHeightAsNumber(object.parent) - this._getHeightAsNumber(object) : 0;
+                const parentHeight = object.parent ? this._getHeightAsNumber(object.parent) : 0;
                 return parentHeight / 2;
             default:
                 Urso.logger.error('AlignY string is not valid!');
@@ -458,10 +458,7 @@ class PropertyAdapter {
                 return this._getRoundedPercentageOfNumber(object[propertyName], parentValue);
 
             case 'boolean':
-                if (this._canBeParent(object))
-                    return this._getPropertyAsNumber(object.parent, propertyName, parentPropertyName);
-                else
-                    return object._baseObject[propertyName];
+                return this._getPropertyAsNumber(object.parent, propertyName, parentPropertyName)
 
             default:
                 Urso.logger.error('Property value not number or string!', object, propertyName);

package/src/js/modules/observer/events.js

@@ -12,6 +12,7 @@ class ModulesObserverConfig {
         EXTRA_BROWSEREVENTS_POINTER_EVENT: 'extra.browserEvents.window.pointer.event',
         EXTRA_BROWSEREVENTS_WINDOW_PRE_RESIZE: 'extra.browserEvents.window.pre.resize',
         EXTRA_BROWSEREVENTS_WINDOW_RESIZE: 'extra.browserEvents.window.resize',
+        EXTRA_BROWSEREVENTS_PARENT_RESIZE: 'extra.browserEvents.parent.resize',
         EXTRA_BROWSEREVENTS_WINDOW_VISIBILITYCHANGE: 'extra.browserEvents.window.visibilitychange',
         MODULES_ASSETS_GROUP_LOADED: 'modules.assets.group.loaded',
         MODULES_ASSETS_LOAD_PROGRESS: 'modules.assets.load.progress',

package/src/js/modules/scenes/pixiWrapper.js

@@ -34,8 +34,31 @@ class ModulesScenesPixiWrapper {
 
         //define renderer
         PIXI.utils.skipHello();
-        this._renderer = new PIXI.Renderer({ preserveDrawingBuffer: true, width: 1, height: 1 });
-        document.body.appendChild(this._renderer.view);
+        const app = new PIXI.Application();
+        this.ticker = app.ticker;
+        this.ticker.autoStart = false;
+        this.ticker.stop();
+
+        //this._renderer = new PIXI.Renderer({ preserveDrawingBuffer: true, width: 1, height: 1 });
+        //document.body.appendChild(this._renderer.view);
+        this._renderer = app.renderer;
+        let parentContainer = document.body;
+
+        if (Urso.config.domParentSelector) {
+            const container = document.querySelector(Urso.config.domParentSelector);
+
+            if (container) {
+                parentContainer = container;
+            } else {
+                Urso.logger.warn(`No element found for domParentSelector: ${Urso.config.domParentSelector}`);
+                Urso.logger.warn(`waitForDomElement...`);
+                Urso.helper.waitForDomElement(Urso.config.domParentSelector).then(() => {
+                    parentContainer.appendChild(this._renderer.view);
+                });
+            }
+        }
+
+        parentContainer.appendChild(this._renderer.view);
 
         //root and world
         this._root = new PIXI.Container();
@@ -286,6 +309,8 @@ class ModulesScenesPixiWrapper {
 
         this.currentScene.update(deltaTime);
         this.currentScene.render();
+        //this._renderer.render(this._root);
+        this.ticker.update(deltaTime);
         this._renderer.render(this._root);
     };
 

package/src/js/modules/scenes/resolutions.js

@@ -10,6 +10,9 @@ class ModulesScenesResolutions {
         this.preResize = this.preResize.bind(this);
         this.refreshSceneSize();
 
+        this._customDomElementlatestWidth = 0;
+        this._customDomElementlatestHeight = 0;
+
         //TODO optimization (performance)
         /*if (devicePixelRatio > 2)
             devicePixelRatio = 2;*/ // when we are calculating canvas size
@@ -18,7 +21,52 @@ class ModulesScenesResolutions {
     _subscribeOnce() {
         this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_PRE_RESIZE, this.preResize, true);
         this.addListener(Urso.events.EXTRA_BROWSEREVENTS_WINDOW_RESIZE, this.refreshSceneSize, true);
+        this.addListener(Urso.events.EXTRA_BROWSEREVENTS_PARENT_RESIZE, this.refreshSceneSize, true);
         this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this.refreshSceneSize, true);
+
+        if (Urso.config.domParentSelector) { this._observeCustomDomElementResize(); }
+    }
+
+    _observeCustomDomElementResize() {
+        const container = document.querySelector(Urso.config.domParentSelector);
+
+        if (!container) {
+            Urso.logger.warn(`No element found for domParentSelector: ${Urso.config.domParentSelector}`);
+            Urso.logger.warn(`waitForDomElement...`);
+            Urso.helper.waitForDomElement(Urso.config.domParentSelector).then(() => {
+                this._observeCustomDomElementResize();
+            });
+            return;
+        }
+
+        const ro = new ResizeObserver((entries) => {
+            for (const entry of entries) {
+                if (entry.target.resizeHandler) {
+                    entry.target.resizeHandler(entry.target.clientHeight, entry.target.clientWidth);
+                }
+            }
+        });
+
+        container.resizeHandler = this._customDomElementResizeHandler.bind(this);
+        ro.observe(container);
+    }
+
+    _customDomElementResizeHandler(newHeight, newWidth) {
+        let needResize = false;
+
+        if (this._customDomElementlatestWidth !== newWidth) {
+            this._customDomElementlatestWidth = newWidth;
+            needResize = true;
+        }
+
+        if (this._customDomElementlatestHeight !== newHeight) {
+            this._customDomElementlatestHeight = newHeight;
+            needResize = true;
+        }
+
+        if (needResize) {
+            this.emit(Urso.events.EXTRA_BROWSEREVENTS_PARENT_RESIZE);
+        }
     }
 
     getTemplateSize() {
@@ -73,6 +121,17 @@ class ModulesScenesResolutions {
             height: window.innerHeight
         };
 
+        if (Urso.config.domParentSelector) {
+            const container = document.querySelector(Urso.config.domParentSelector);
+
+            if (container) {
+                windowSize = {
+                    width: container.offsetWidth,
+                    height: container.offsetHeight
+                };
+            }
+        }
+
         if (window.devicePixelRatio && window.devicePixelRatio !== 1) {
             windowSize.width *= window.devicePixelRatio;
             windowSize.height *= window.devicePixelRatio;

package/build/162.js/index.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_urso_core=self.webpackChunk_urso_core||[]).push([[162],{88058:(d,a,r)=>{var O=r(8507),X=r(36697),e=r(46719);O.XO.add(X.U),O.XO.add(e.y)},42162:(d,a,r)=>{r.r(a),r(88058),r(26197),r(17801),r(25361),r(28849),r(28299),r(15311),r(4241),r(11981),r(51437),r(95902)},95902:(d,a,r)=>{var O=r(8507),X=r(69430),e=r(90825);O.XO.add(e.u),O.XO.add(X.L)},25361:(d,a,r)=>{var O=r(8507),X=r(40378),e=r(49260);O.XO.add(e.S),O.XO.add(X.GH)},28849:(d,a,r)=>{var O=r(8507),X=r(41892);O.XO.add(X.G)},51437:(d,a,r)=>{var O=r(8507),X=r(56880);O.XO.add(X.e)},11981:(d,a,r)=>{var O=r(8507),X=r(75773);O.XO.add(X.x)},15311:(d,a,r)=>{var O=r(8507),X=r(70661);O.XO.add(X.n)},4241:(d,a,r)=>{var O=r(8507),X=r(76829),e=r(47602);O.XO.add(e.Q),O.XO.add(X.n)},28299:(d,a,r)=>{var O=r(8507),X=r(45369),e=r(87278);O.XO.add(e.p),O.XO.add(X.e)}}]);

package/build/24.js/index.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_urso_core=self.webpackChunk_urso_core||[]).push([[24],{88058:(d,a,r)=>{var O=r(8507),X=r(36697),v=r(46719);O.XO.add(X.U),O.XO.add(v.y)},22024:(d,a,r)=>{r.r(a);var O=r(8507),X=r(44980),v=r(83946),e=r(74302);O.XO.add(v.a),X.mc.mixin(e.K),r(88058);var c=r(60809),s=r(90317);O.XO.add(c.C),X.mc.mixin(s.e),r(26197),r(17801),r(25361),r(28849),r(28299),r(15311),r(4241),r(11981),r(51437),r(95902)},95902:(d,a,r)=>{var O=r(8507),X=r(69430),v=r(90825);O.XO.add(v.u),O.XO.add(X.L)},25361:(d,a,r)=>{var O=r(8507),X=r(40378),v=r(49260);O.XO.add(v.S),O.XO.add(X.GH)},28849:(d,a,r)=>{var O=r(8507),X=r(41892);O.XO.add(X.G)},51437:(d,a,r)=>{var O=r(8507),X=r(56880);O.XO.add(X.e)},11981:(d,a,r)=>{var O=r(8507),X=r(75773);O.XO.add(X.x)},15311:(d,a,r)=>{var O=r(8507),X=r(70661);O.XO.add(X.n)},4241:(d,a,r)=>{var O=r(8507),X=r(76829),v=r(47602);O.XO.add(v.Q),O.XO.add(X.n)},28299:(d,a,r)=>{var O=r(8507),X=r(45369),v=r(87278);O.XO.add(v.p),O.XO.add(X.e)}}]);