@urso/core 0.2.7 → 0.3.2

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

@@ -27,127 +27,131 @@ 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
+ * GSAP 3.9.0
  * https://greensock.com
  *
  * @license Copyright 2008-2021, GreenSock. All rights reserved.
@@ -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.7",
+  "version": "0.3.2",
   "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/app.js

@@ -44,8 +44,6 @@ class App {
 
         //Modules
         Urso.assets = Urso.getInstance('Modules.Assets.Controller');
-        Urso.buttons = Urso.getInstance('Modules.Buttons.Controller');
-        // TODO: CHECK FOR EVENT TO START COMMUNICATION WITH SERVER
         Urso.transport = Urso.getInstance('Modules.Transport.Controller');
         Urso.logic = Urso.getInstance('Modules.Logic.Controller');
         Urso.objects = Urso.getInstance('Modules.Objects.Controller');
@@ -57,6 +55,9 @@ class App {
         //set title
         document.title = Urso.config.title;
 
+        //device type mode
+        Urso.addInstancesMode(!Urso.helper.mobileAndTabletCheck() ? 'desktop' : 'mobile');
+
         //App.run
         Urso.device.whenReady(() => {
             Urso.assets.updateQuality();

package/src/js/config/main.js

@@ -3,7 +3,8 @@ let ConfigMain = {
     mode: "development", // development/production/testing
     extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
     defaultScene: 'play', //default scene to display
-    useBinPath: false 
+    useBinPath: false, // use assets from bin directory
+    useTransport: false // use transport module for connetcting with server
 };
 
 module.exports = ConfigMain;

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/lib/helper.js

@@ -123,6 +123,21 @@ class LibHelper {
         return c;
     }
 
+    /**
+     * Swap key with value in object
+     * @param {Object} obj
+     * @returns {Object}
+     */
+    objectFlip(obj) {
+        const ret = {};
+
+        Object.keys(obj).forEach(key => {
+            ret[obj[key]] = key;
+        });
+
+        return ret;
+    }
+
     /**
      * recursive set value to object by key
      * @param {String} key 
@@ -208,8 +223,8 @@ class LibHelper {
      */
     transpose(matrix) {
         return Object.keys(matrix[0])
-        .map(colNumber => matrix
-            .map(rowNumber => rowNumber[colNumber]));
+            .map(colNumber => matrix
+                .map(rowNumber => rowNumber[colNumber]));
     }
 
     /**

package/src/js/modules/assets/controller.js

@@ -6,16 +6,18 @@ class ModulesAssetsController {
     /**
      * Update quality
      */
-    updateQuality(){
-        if(Urso.config.useBinPath){
+    updateQuality() {
+        if (Urso.config.useBinPath) {
             this.getInstance('Service').updateQuality();
         }
+
+        console.log('[ASSETS] Quality set to', this.getInstance('Service').getQuality());
     }
 
     /**
      * Current quality getter
      */
-    getQuality(){
+    getQuality() {
         this.getInstance('Service').getQuality();
     }
 

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

@@ -1,20 +1,20 @@
 class ModulesAssetsService {
     constructor() {
         this.singleton = true;
-        
+
         this.assets = {};
 
         this._currentQuality = 'auto';
         this._addedAssetsCache = [];
     };
 
-    getQuality(){
+    getQuality() {
         return this._currentQuality;
     }
 
-    updateQuality(){
+    updateQuality() {
         this._currentQuality = this._detectQuality();
-        Urso.addInstancesMode(this._currentQuality);
+        Urso.addInstancesMode(this._currentQuality + 'Quality');
     }
 
     sortAssets(assets) {
@@ -74,7 +74,7 @@ class ModulesAssetsService {
 
     _processLoadedAtlases(group) {
         const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
-        
+
         for (let assetModel of atlases) {
             const assetKey = assetModel.key;
             let imageData = Urso.cache.getAtlas(assetKey);
@@ -85,7 +85,7 @@ class ModulesAssetsService {
                 let texture = imageData.textures[i];
                 let newFilename = frame.filename;
 
-                if(frame.filename.indexOf('/') === -1)
+                if (frame.filename.indexOf('/') === -1)
                     newFilename = folderPath + '/' + frame.filename;
 
                 Urso.cache.addFile(newFilename, texture);
@@ -146,7 +146,7 @@ class ModulesAssetsService {
         if (!imageData) {
             //from atlas ?!
             let texture = Urso.cache.getFile(assetModel.path);
-            
+
             if (!texture)
                 return Urso.logger.error('ModulesAssetsService process Loaded Image error: no image ', assetModel);
 
@@ -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);
@@ -256,7 +253,7 @@ class ModulesAssetsService {
         this.loadGroup(groupName, () => { this._continueLazyLoad(step + 1); })
     }
 
-    _qualityReducer(qualityFactors, widthFactor){
+    _qualityReducer(qualityFactors, widthFactor) {
         return [(acc, val) => {
             if (acc === null) {
                 return val;
@@ -268,24 +265,24 @@ class ModulesAssetsService {
             const nextQuality = (currentQuality > qualityFactor && qualityFactor >= widthFactor)
                 || (qualityFactor >= widthFactor && widthFactor > currentQuality)
                 || (widthFactor >= qualityFactor && qualityFactor > currentQuality);
-            
+
             return nextQuality ? val : acc;
-                
+
         }, null]
     }
 
-    _detectQuality(){
+    _detectQuality() {
         const { qualityFactors } = this.getInstance('Config');
         const userQuality = Urso.helper.parseGetParams()['quality'];
-        
-        if(userQuality && qualityFactors[userQuality]){
+
+        if (userQuality && qualityFactors[userQuality]) {
             return userQuality;
         }
-        
+
         return this._calculateQuality(qualityFactors);
     }
 
-    _calculateQuality(qualityFactors){
+    _calculateQuality(qualityFactors) {
         const { android, iOS, iPad, macOS } = Urso.device;
         const isMobile = android || iOS || iPad;
 
@@ -293,12 +290,12 @@ class ModulesAssetsService {
             return 'high';
         }
 
-        if(macOS && iPad) {
+        if (macOS && iPad) {
             return 'medium';
         }
 
         const resCfg = Urso.getInstance('Modules.Scenes.ResolutionsConfig').contents[0];
-        
+
         const { devicePixelRatio } = window;
         let { width, height } = screen;
 
@@ -311,7 +308,7 @@ class ModulesAssetsService {
         }
 
         const widthFactor = width / resCfg.width;
-    
+
         return Object
             .keys(qualityFactors)
             .reduce(...this._qualityReducer(qualityFactors, widthFactor));

package/src/js/modules/instances/controller.js

@@ -29,7 +29,7 @@ class ModulesInstancesController {
             return false;
 
         this._modes.push(mode);
-
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
         return true;
     }
 
@@ -40,6 +40,7 @@ class ModulesInstancesController {
             return false;
 
         this._modes.splice(index, 1);
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
         return true;
     }
 

package/src/js/modules/logic/_info.js

@@ -1,5 +1,4 @@
 Urso.Core.Modules.Logic = {
-    Buttons: require('./buttons'),
     Controller: require('./controller.js'),
     Sounds: require('./sounds.js')
 };

package/src/js/modules/logic/config/_info.js

@@ -1,4 +1,3 @@
 Urso.Core.Modules.Logic.Config = {
-    Buttons: require('./buttons.js'),
     Sounds: require('./sounds.js')
 };

package/src/js/modules/objects/controller.js

@@ -8,6 +8,7 @@ class ModulesObjectsController {
 
         this._newResolutionHandler = this._newResolutionHandler.bind(this);
         this._resetWorld = this._resetWorld.bind(this);
+        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
     };
 
     create(objects, parent, doNotRefreshStylesFlag) { //TODO parse template for assets and objects (groups, components)
@@ -106,9 +107,14 @@ class ModulesObjectsController {
         this.getInstance('Create').resetWorld();
     }
 
+    _applyClassesToWorld() {
+        this.getInstance('Create').applyClassesToWorld();
+    }
+
     _subscribeOnce() {
         this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
         this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
+        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
     }
 }
 

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

@@ -4,6 +4,7 @@ class ModulesObjectsCreate {
 
         this._world = null;
         this._counter = 0;
+        this._objectsTypesFlipped;
     }
 
     _checkWorld() {
@@ -23,6 +24,7 @@ class ModulesObjectsCreate {
 
         this.updateWorldBounds({ template: Urso.scenes.getTemplateSize() })
         this.getInstance('Cache').reset();
+        this.applyClassesToWorld();
         this._addToCache(proxy);
     }
 
@@ -34,6 +36,23 @@ class ModulesObjectsCreate {
         Urso.objects._safeSetValueToTarget(this._world, 'height', params.template.height);
     }
 
+    applyClassesToWorld() {
+        if (!this._world) {
+            return; //world do not created yet
+        }
+
+        //remove old classes
+        if (this._world.class) {
+            this._world.class.split(' ').forEach((className) => this._world.removeClass(className, true));
+        }
+
+        //apply new classes
+        Urso.getInstancesModes().forEach((className) => this._world.addClass(className, true));
+
+        //refresh styles
+        Urso.objects.refreshStyles();
+    }
+
     _getUid() {
         this._counter++;
         return 'object_' + this._counter;
@@ -56,71 +75,36 @@ class ModulesObjectsCreate {
             object.contents = []; //clear contents. We will put here just correct models
         }
 
+        if (!this._objectsTypesFlipped)
+            this._objectsTypesFlipped = Urso.helper.objectFlip(Urso.types.objects);
+
         //set uid
         object._uid = this._getUid();
 
         switch (object.type) {
-            case Urso.types.objects.BITMAPTEXT:
-                model = this.getInstance('Models.BitmapText', object);
-                break;
-            case Urso.types.objects.BUTTON:
-                model = this.getInstance('Models.Button', object);
-                break;
-            case Urso.types.objects.COMPONENT:
-                model = this.getInstance('Models.Component', object);
-                break;
-            case Urso.types.objects.CONTAINER:
-                model = this.getInstance('Models.Container', object);
-                break;
-            case Urso.types.objects.DRAGONBONES:
-                model = this.getInstance('Models.DragonBones', object);
-                break;
-            case Urso.types.objects.GROUP:
-                model = this.getInstance('Models.Group', object);
-                break;
-            case Urso.types.objects.IMAGE:
-                model = this.getInstance('Models.Image', object);
-                break;
+            //exceptions with camelCase namings
             case Urso.types.objects.ATLASIMAGE:
                 model = this.getInstance('Models.AtlasImage', object);
                 break;
-            case Urso.types.objects.IMAGES_ANIMATION:
-                model = this.getInstance('Models.ImagesAnimation', object);
-                break;
-            case Urso.types.objects.MASK:
-                model = this.getInstance('Models.Mask', object);
-                break;
-            case Urso.types.objects.SPINE:
-                model = this.getInstance('Models.Spine', object);
-                break;
-            case Urso.types.objects.TEXT:
-                model = this.getInstance('Models.Text', object);
-                break;
-            case Urso.types.objects.GRAPHICS:
-                model = this.getInstance('Models.Graphics', object);
+            case Urso.types.objects.BITMAPTEXT:
+                model = this.getInstance('Models.BitmapText', object);
                 break;
             case Urso.types.objects.HITAREA:
                 model = this.getInstance('Models.HitArea', object);
                 break;
-            case Urso.types.objects.EMITTER:
-                model = this.getInstance('Models.Emitter', object);
-                break;
-            case Urso.types.objects.SLIDER:
-                model = this.getInstance('Models.Slider', object);
-                break;
-            case Urso.types.objects.TOGGLE:
-                model = this.getInstance('Models.Toggle', object);
-                break;
-            case Urso.types.objects.CHECKBOX:
-                model = this.getInstance('Models.Checkbox', object);
-                break;
-            case Urso.types.objects.SCROLLBOX:
-                model = this.getInstance('Models.Scrollbox', object);
+            case Urso.types.objects.IMAGES_ANIMATION:
+                model = this.getInstance('Models.ImagesAnimation', object);
                 break;
             case Urso.types.objects.TEXTINPUT:
                 model = this.getInstance('Models.TextInput', object);
                 break;
+
             default:
+                const objectName = Urso.helper.capitaliseFirstLetter(
+                    this._objectsTypesFlipped[object.type].toLowerCase()
+                );
+
+                model = this.getInstance(`Models.${objectName}`, 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'),