@urso/core 0.1.93 → 0.1.98

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

@@ -27,135 +27,127 @@ object-assign
  */
 
 /*!
- * @pixi/accessibility - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
- *
- * @pixi/accessibility is licensed under the MIT License.
- * http://www.opensource.org/licenses/mit-license
- */
-
-/*!
- * @pixi/constants - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/constants - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/constants is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/core - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/core - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/core is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/display - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/display - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/display is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/extract - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/extract - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/extract is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/filter-displacement - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/filter-displacement - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/filter-displacement is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/loaders - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/loaders - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/loaders is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/math - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/math - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/math is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/mesh-extras - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @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.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/mixin-get-child-by-name - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 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.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/mixin-get-global-position - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/mixin-get-global-position is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/polyfill - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/polyfill - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/polyfill is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/prepare - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/prepare - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/prepare is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/runner - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/runner - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/runner is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/ticker - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @pixi/ticker - v5.3.11
+ * Compiled Mon, 01 Nov 2021 16:10:12 UTC
  *
  * @pixi/ticker is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 
 /*!
- * @pixi/utils - v5.3.10
- * Compiled Mon, 07 Jun 2021 22:37:25 UTC
+ * @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.7.1
+ * GSAP 3.8.0
  * https://greensock.com
  *
  * @license Copyright 2008-2021, GreenSock. All rights reserved.
@@ -172,6 +164,16 @@ object-assign
  * http://www.opensource.org/licenses/mit-license
  */
 
+/*!
+ * pixi-viewport - v4.34.3
+ * Compiled Wed, 01 Dec 2021 19:28:04 UTC
+ *
+ * pixi-viewport is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ * 
+ * Copyright 2019-2020, David Figatner, All Rights Reserved
+ */
+
 /*!
  * resource-loader - v3.0.1
  * https://github.com/pixijs/pixi-sound

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.1.93",
+  "version": "0.1.98",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -29,7 +29,10 @@
     "pixi-projection": "0.3.15",
     "pixi-spine": "^2.1.11",
     "pixi.js": "^5.1.3",
-    "pixi5-dragonbones": "5.7.0-2"
+    "pixi5-dragonbones": "5.7.0-2",
+    "pixi-scrollbox": "^2.3.1",
+    "pixi-viewport": "^4.34.0",
+    "pixi-text-input": "^1.0.6"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",

package/src/js/app.js

@@ -59,6 +59,7 @@ class App {
 
         //App.run
         Urso.device.whenReady(() => {
+            Urso.assets.updateQuality();
             Urso.getInstance('App').run();
         });
     }

package/src/js/config/main.js

@@ -2,7 +2,8 @@ let ConfigMain = {
     title: 'Urso', //game title
     mode: "development", // development/production/testing
     extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
-    defaultScene: 'play' //default scene to display
+    defaultScene: 'play', //default scene to display
+    useBinPath: false 
 };
 
 module.exports = ConfigMain;

package/src/js/extra/_info.js

@@ -8,6 +8,7 @@ PIXI.filters['DropShadowFilter'] = DropShadowFilter;
 
 require("pixi-spine");
 require("pixi-projection");
+require("pixi-text-input");
 
 Urso.DragonBones = require("pixi5-dragonbones");
 

package/src/js/lib/helper.js

@@ -201,6 +201,17 @@ class LibHelper {
         return true;
     }
 
+    /**
+     * tranpose matrix (rows to cols)
+     * @param {Array} matrix 
+     * @returns {Array}
+     */
+    transpose(matrix) {
+        return Object.keys(matrix[0])
+        .map(colNumber => matrix
+            .map(rowNumber => rowNumber[colNumber]));
+    }
+
     /**
      * recursive merge two objects into one
      * @param {Object} obj1 

package/src/js/lib/loader.js

@@ -17,6 +17,26 @@ class LibLoader {
         this._assetsQuery.push(asset);
     }
 
+    /**
+     * gets part of loading path
+     */
+    _getLoadPath(asset){
+        const { path } = asset;
+
+        if(!Urso.config.useBinPath) {
+            return `assets/${path}`;
+        }
+
+        const quality = Urso.getInstance('Modules.Assets.Service').getQuality();
+        const splitted = path.split('/');
+
+        if (splitted[0] === 'images') {
+            splitted.splice(1, 0, quality);
+        }
+        
+        return `bin/${splitted.join('/')}`;
+    };
+
     /**
      * store loaded asset in cache
      */
@@ -79,7 +99,8 @@ class LibLoader {
             // TODO: check to load
 
             const params = asset.params || false; // TODO: Set params field in base mode
-            loader.add(asset.key, asset.path, params, (resource) => this._storeAsset(asset, resource))  //TODO set assets resolution instead _processLoadedImage baseTexture resolution
+            const loadPath = this._getLoadPath(asset);
+            loader.add(asset.key, loadPath, params, (resource) => this._storeAsset(asset, resource))  //TODO set assets resolution instead _processLoadedImage baseTexture resolution
         });
 
         this._onLoadUpdate({progress: 0});

package/src/js/modules/assets/config.js

@@ -2,6 +2,16 @@ class ModulesAssetsConfig {
     constructor() {
         this.singleton = true;
 
+        /**
+         * quality settings for resource loading selection
+         */
+        this.qualityFactors = {
+            medium: 0.5,
+            hd: 0.75,
+            high: 1 
+        };
+
+
         /**
          * initial is the default and will load on the preload
          * also you can call preload manualy by assets.loadGroup('groupName')
@@ -10,7 +20,7 @@ class ModulesAssetsConfig {
             initial: 0 //will load on the preload
             /*lazyPart1: 'lazyPart1',
             lazyPart2: 'lazyPart2'*/
-        }
+        };
 
         /**
          * you can make lazy load groups priority here

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

@@ -3,6 +3,22 @@ class ModulesAssetsController {
         this.singleton = true;
     };
 
+    /**
+     * Update quality
+     */
+    updateQuality(){
+        if(Urso.config.useBinPath){
+            this.getInstance('Service').updateQuality();
+        }
+    }
+
+    /**
+     * Current quality getter
+     */
+    getQuality(){
+        this.getInstance('Service').getQuality();
+    }
+
     /**
      * instantly load initial assets and start lazy loading process, if needed
      * @param {Mixed} assets - asset or array of assets

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

@@ -1,12 +1,22 @@
 class ModulesAssetsService {
     constructor() {
         this.singleton = true;
-
+        
         this.assets = {};
 
+        this._currentQuality = 'auto';
         this._addedAssetsCache = [];
     };
 
+    getQuality(){
+        return this._currentQuality;
+    }
+
+    updateQuality(){
+        this._currentQuality = this._detectQuality();
+        Urso.addInstancesMode(this._currentQuality);
+    }
+
     sortAssets(assets) {
         this.assets[this.getInstance('Config').loadingGroups.initial] = [];
 
@@ -125,13 +135,9 @@ class ModulesAssetsService {
     }
 
     _processLoadedImage(assetModel) {
-        const { params, current } = this._getQualityParams();
-        let imageQualityKey = assetModel.useBinPath;
+        const { qualityFactors } = this.getInstance('Config');
 
-        if (imageQualityKey === true)
-            imageQualityKey = current;
-
-        let qualityTextureResolution = params[imageQualityKey] || 1;
+        const resolution = qualityFactors[this._currentQuality] || 1;
 
         const assetKey = assetModel.key;
         //textures cache
@@ -140,14 +146,14 @@ 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);
 
             Urso.cache.addTexture(assetKey, texture); //TODO change resolution of base texture
         } else {
             //regular image
-            const baseTexture = new PIXI.BaseTexture(imageData.data, { resolution: qualityTextureResolution });
+            const baseTexture = new PIXI.BaseTexture(imageData.data, { resolution });
             const texture = new PIXI.Texture(baseTexture);
             Urso.cache.addTexture(assetKey, texture);
         }
@@ -215,9 +221,6 @@ class ModulesAssetsService {
         //set loadingGroup
         model.loadingGroup = loadingGroup || model.loadingGroup || this.getInstance('Config').loadingGroups.initial;
 
-        //setup path if its need
-        this._setQualityPath(model); //TODO adapt for dragonbones
-
         //check if container or dragonbones
         if (model.contents) {
             for (let content of model.contents) {
@@ -253,41 +256,65 @@ class ModulesAssetsService {
         this.loadGroup(groupName, () => { this._continueLazyLoad(step + 1); })
     }
 
-    // TODO: MOVE TO CFG OR HELPER?
-    _getQualityParams() {
-        const params = {
-            high: 1,
-            hd: 0.75,
-            medium: 0.5,
-            low: 0.25
-        }
-        const current = 'hd';
-        return { params, current };
+    _qualityReducer(qualityFactors, widthFactor){
+        return [(acc, val) => {
+            if (acc === null) {
+                return val;
+            }
+
+            const currentQuality = qualityFactors[acc];
+            const qualityFactor = qualityFactors[val];
+
+            const nextQuality = (currentQuality > qualityFactor && qualityFactor >= widthFactor)
+                || (qualityFactor >= widthFactor && widthFactor > currentQuality)
+                || (widthFactor >= qualityFactor && qualityFactor > currentQuality);
+            
+            return nextQuality ? val : acc;
+                
+        }, null]
     }
 
-    _setQualityPath(asset) {
-        if (!asset.useBinPath)
-            return;
+    _detectQuality(){
+        const { qualityFactors } = this.getInstance('Config');
+        const userQuality = Urso.helper.parseGetParams()['quality'];
+        
+        if(userQuality && qualityFactors[userQuality]){
+            return userQuality;
+        }
+        
+        return this._calculateQuality(qualityFactors);
+    }
 
-        const { params, current } = this._getQualityParams();
+    _calculateQuality(qualityFactors){
+        const { android, iOS, iPad, macOS } = Urso.device;
+        const isMobile = android || iOS || iPad;
 
-        const setQuality = asset => {
-            const qualityPath = (typeof asset.useBinPath === 'string' && params[asset.useBinPath]) ? asset.useBinPath : current;
-            asset.path = asset.path.replace('assets', `bin/${qualityPath}`);
+        if (macOS && !isMobile) {
+            return 'high';
         }
 
-        if (!asset.contents) {
-            setQuality(asset);
-            return;
+        if(macOS && iPad) {
+            return 'medium';
         }
 
-        for (const childAsset of asset.contents) {
-            const binPath = (childAsset.useBinPath && childAsset.useBinPath !== asset.useBinPath)
-                ? childAsset.useBinPath : asset.useBinPath;
+        const resCfg = Urso.getInstance('Modules.Scenes.ResolutionsConfig').contents[0];
+        
+        const { devicePixelRatio } = window;
+        let { width, height } = screen;
 
-            childAsset.useBinPath = binPath;
-            setQuality(childAsset);
+        if (isMobile) {
+            width = (width > height) ? width : height;
         }
+
+        if (iOS) {
+            width *= devicePixelRatio;
+        }
+
+        const widthFactor = width / resCfg.width;
+    
+        return Object
+            .keys(qualityFactors)
+            .reduce(...this._qualityReducer(qualityFactors, widthFactor));
     }
 
     _addAssetToLoader(assetModel, loader) {

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

@@ -105,6 +105,21 @@ class ModulesObjectsCreate {
             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);
+                break;
+            case Urso.types.objects.TEXTINPUT:
+                model = this.getInstance('Models.TextInput', object);
+                break;
             default:
                 break;
         }

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

@@ -16,5 +16,10 @@ Urso.Core.Modules.Objects.Models = {
     Mask: require('./mask.js'),
     Spine: require('./spine.js'),
     Text: require('./text.js'),
+    Slider: require('./slider.js'),
+    Toggle: require('./toggle.js'),
+    Checkbox: require('./checkbox.js'),
+    Scrollbox: require('./scrollbox.js'),
+    TextInput: require('./textInput.js'),
     World:  require('./world.js')
 };

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

@@ -0,0 +1,96 @@
+const UrsoCoreModulesObjectsModelsToggle = require('./toggle');
+
+class ModulesObjectsModelsCheckbox extends UrsoCoreModulesObjectsModelsToggle {
+    constructor(params) {
+        super(params);
+
+        this._isDisabled = false;
+        this._lable = null;
+        this._checkbox = null;
+
+        this.type = Urso.types.objects.CHECKBOX;
+
+        this._createCheckbox();
+
+        this.enable = this.enable.bind(this);
+        this.disable = this.disable.bind(this);
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.contents = [];
+
+        this.action = Urso.helper.recursiveGet('action', params, () => { 
+            this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, { name: this.name, status: this._toggleStatus }) 
+        });
+
+        this.action = Urso.helper.recursiveGet('action', params, () => { this.emit(Urso.events.MODULES_OBJECTS_CHECKBOX_PRESS, this.name) });
+        this.lable = Urso.helper.recursiveGet('lable', params, false);
+
+        this.defaultStatus = Urso.helper.recursiveGet('defaultStatus', params, 'unpressed'); //pressed or unpressed
+    }
+
+    _createCheckbox() {
+        this._toggleStatus = this.defaultStatus;
+        this._checkbox = this._createObject(this.buttonFrames[`${this.defaultStatus}Out`])
+
+        if (this.lable)
+            this._lable = this._createObject(this.lable);
+    }
+
+    _createObject(model) {
+        model = Urso.helper.objectClone(model);
+        let object = Urso.objects.create(model, this);
+
+        object._baseObject.interactive = true;
+        object._baseObject.buttonMode = true;
+
+        object._baseObject
+            .on('pointerdown', this._onButtonDown.bind(this))
+            .on('pointerup', this._onButtonUp.bind(this))
+            .on('pointerupoutside', this._onButtonUp.bind(this))
+            .on('pointerover', this._onButtonOver.bind(this))
+            .on('pointerout', this._onButtonOut.bind(this));
+
+        return object;
+    }
+
+    _addBaseObject() {
+        this._baseObject = new PIXI.Container();
+    };
+
+    _drawGraphics({ polygon, rectangle, fillColor }) {
+        if (!polygon && !rectangle)
+            return;
+
+        this._checkbox._baseObject.clear();
+        this._checkbox._baseObject.beginFill(fillColor);
+
+        if (polygon && polygon.length) {
+            this._checkbox._baseObject.drawPolygon(polygon);
+        } else if (rectangle && rectangle.length) {
+            this._checkbox._baseObject.drawRect(...rectangle)
+        }
+
+        this._checkbox._baseObject.endFill();
+    };
+
+    _changeTexture(key) {
+        if (!this.buttonFrames[key]) {
+            if (key === `${this._toggleStatus}Out`) {
+                Urso.logger.error('ModulesObjectsModelsButton assets error: no out image ' + this.buttonFrames.out);
+                return false;
+            }
+
+            this._changeTexture(`${this._toggleStatus}Out`); // load default texture for this key
+            return false;
+        }
+        if (this.buttonFrames[key].type === Urso.types.objects.GRAPHICS)
+            this._drawGraphics(this.buttonFrames[key].figure);
+        else
+            this._checkbox.changeTexture(this.buttonFrames[key].assetKey);
+    }
+}
+
+module.exports = ModulesObjectsModelsCheckbox;