@urso/core 0.2.8 → 0.3.3

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.3",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -27,12 +27,11 @@
     "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-scrollbox": "^2.3.1",
+    "pixi-spine": "^3.0.13",
+    "pixi-text-input": "^1.0.6",
     "pixi-viewport": "^4.34.0",
-    "pixi-text-input": "^1.0.6"
+    "pixi.js": "^6.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",

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/objects/models/checkbox.js

@@ -22,7 +22,7 @@ class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
         this.contents = [];
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus }) 
+            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
         });
 
         this.lable = Urso.helper.recursiveGet('lable', params, false);

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

@@ -188,7 +188,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
             this.currentValueText.text = value;
 
         this._setFillMask();
-        this.emit(Urso.events.MODULES_OBJECTS_SLIDER_SET_NEW_VALUE, { name: this.name, value: value });
+        this.emit(Urso.events.MODULES_OBJECTS_SLIDER_SET_NEW_VALUE, { name: this.name, value: value, class: this.class });
     }
 
     _subscribeOnce() {

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

@@ -18,7 +18,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
         super.setupParams(params);
 
         this.action = Urso.helper.recursiveGet('action', params, () => { 
-            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this._toggleStatus }) 
+            this.emit(Urso.events.MODULES_OBJECTS_TOGGLE_PRESS, { name: this.name, status: this._toggleStatus, class: this.class }) 
         });
 
         this.buttonFrames = {

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

@@ -17,6 +17,8 @@ class ModulesObserverConfig {
             MODULES_SOUND_MANAGER_UPDATE_CFG: 'modules.soundManager.updateCfg',
             MODULES_SOUND_MANAGER_SET_GLOBAL_VOLUME: 'modules.soundManager.setGlobalVolume',
             MODULES_STATES_MANAGER_STATE_CHANGE: 'modules.statesManager.stateChange',
+            MODULES_STATES_MANAGER_ACTION_START: 'modules.statesManager.actionStart',
+            MODULES_STATES_MANAGER_ACTION_FINISH: 'modules.statesManager.actionFinish',
             MODULES_SCENES_ORIENTATION_CHANGE: 'modules.scenes.orientation.change',
             MODULES_SCENES_NEW_RESOLUTION: 'modules.scenes.newResolution',
             MODULES_SCENES_NEW_SCENE_INIT: 'modules.scenes.newSceneInit',

package/src/js/modules/statesManager/action.js

@@ -18,6 +18,8 @@ class ModulesStatesManagerAction {
     run(onFinishCallback) {
         log(`%c action run ---> ${this.name}`, 'color: blue');
 
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_START, this.name);
+
         this.finished = false;
         this._onFinishCallback = onFinishCallback;
 
@@ -47,6 +49,9 @@ class ModulesStatesManagerAction {
 
         this._terminating = false;
         this.finished = true;
+
+        this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_FINISH, this.name);
+        
         log(`%c action finish <--- ${this.name}`, 'color: blue');
         this._onFinishCallback();
     }

package/src/js/modules/statesManager/controller.js

@@ -27,6 +27,16 @@ class ModulesStatesManagerController {
 
     _iteratorConstructor() {
         let nextIndex = 0;
+    
+
+        const getNextStateByOrder = () => {
+            let statesArray = Object.keys(this._configStates);
+
+            if (nextIndex === statesArray.length)
+                nextIndex = 0;
+
+            return statesArray[nextIndex++];
+        }
 
         return {
             next: (() => {
@@ -36,7 +46,7 @@ class ModulesStatesManagerController {
                 if (this._currentState) {
                     const currentState = this._configStates[this._currentState];
 
-                    if (this.checkStateGuard(this._currentState) && currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
+                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
                         for (const stateKey of currentState.nextState) {
                             if (this.checkStateGuard(stateKey)) {
                                 nextIndex = statesArray.indexOf(stateKey) + 1;
@@ -52,11 +62,14 @@ class ModulesStatesManagerController {
                     }
                 }
 
-                //regular round logic
-                if (nextIndex === statesArray.length)
-                    nextIndex = 0;
+                //go next state by order
+                let stateName;
 
-                return statesArray[nextIndex++];
+                do {
+                    stateName = getNextStateByOrder();
+                } while (!this.checkStateGuard(stateName));
+
+                return stateName;
             }).bind(this)
         }
     }
@@ -71,10 +84,6 @@ class ModulesStatesManagerController {
         let config = this._configStates[this._currentState];
         let classInstance = this.getInstance('Helper').getActionByConfig(config);
 
-        //state guard
-        if (!this.checkStateGuard(this._currentState))
-            return this._nextState();
-
         //actions instances guard
         if (!classInstance.guard())
             return this._nextState();

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;