@urso/core 0.7.51 → 0.7.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.51",
+  "version": "0.7.53",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/components/debug/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsDebugController extends ComponentsBaseController {
     constructor(params) {

package/src/js/components/deviceRotate/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsDeviceRotateController extends ComponentsBaseController {
   constructor(params) {
@@ -67,7 +67,7 @@ class ComponentsDeviceRotateController extends ComponentsBaseController {
   }
 
   _updateVisibility() {
-      this._isVisible = this._needShow;
+    this._isVisible = this._needShow;
   }
 
   _resizeHandler() {

package/src/js/components/editor/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsEditorController extends ComponentsBaseController {
     constructor(params) {

package/src/js/components/fullscreen/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsFullscreenController extends ComponentsBaseController {
 

package/src/js/components/layersSwitcher/controller.js

@@ -1,4 +1,6 @@
-class ComponentsLayersSwitcherController extends Urso.Core.Components.Base.Controller {
+const ComponentsBaseController = require('./../base/controller');
+
+class ComponentsLayersSwitcherController extends ComponentsBaseController {
 
     constructor(...args) {
         super(...args);

package/src/js/components/loader/controller.js

@@ -1,14 +1,14 @@
-class ComponentsLoaderController extends Urso.Core.Components.Base.Controller {
+const ComponentsBaseController = require('./../base/controller');
 
-    constructor(options){
+class ComponentsLoaderController extends ComponentsBaseController {
+
+    constructor(options) {
         super(options);
 
         //load own assets
 
         //then create loader objects
-        Urso.objects.create(this.getInstance('Template').objects)
-
-        
+        Urso.objects.create(this.getInstance('Template').objects);
     }
 
     assetsMount() {
@@ -23,43 +23,44 @@ class ComponentsLoaderController extends Urso.Core.Components.Base.Controller {
         this.setLoadProgress(loadProgress);
     }
 
-    create(){
+    create() {
         this.setMask();
         //todo remove all objects
     }
-    
-    setMask(){
-        if(this.loaderBg && this.loaderBgMask)
+
+    setMask() {
+        if (this.loaderBg && this.loaderBgMask)
             this.loaderBg._baseObject.mask = this.loaderBgMask._baseObject
     }
 
-    formatAmountText(text){
+    formatAmountText(text) {
         return `${text}%`;
     }
 
-    setLoadProgress(val){
-        if(!this.componentCreated)
+    setLoadProgress(val) {
+        if (!this.componentCreated)
             return;
 
         this.loaderBgMask._baseObject.scale.x = val;
         this.loadAmountText.text = this.formatAmountText(val);
     }
 
-    get componentCreated(){
+    get componentCreated() {
         return !!this.loadAmountText && !!this.loaderBg && !!this.loaderBgMask;
     }
 
-    get loadAmountText(){
+    get loadAmountText() {
         return Urso.findOne('.loadAmountText');
     }
 
-    get loaderBg(){
+    get loaderBg() {
         return Urso.findOne('^loaderBg');
     }
 
-    get loaderBgMask(){
+    get loaderBgMask() {
         return Urso.findOne('^loaderBgMask');
     }
+
 }
 
 module.exports = ComponentsLoaderController;

package/src/js/components/soundInitialPopup/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsSoundInitialPopupController extends ComponentsBaseController {
 

package/src/js/components/stateDriven/controller.js

@@ -1,4 +1,4 @@
-ComponentsBaseController = require('./../base/controller.js');
+const ComponentsBaseController = require('./../base/controller');
 
 class ComponentsStateDrivenController extends ComponentsBaseController {
 

package/src/js/config/load.js

@@ -1,5 +1,191 @@
-require('./../components/_info.js');
-require('./../extra/_info.js');
-require('./../lib/_info.js');
-require('./../modules/_info.js');
-require('./../templates/_info.js');
+//Urso namespace
+window.Urso = {
+    //Core namespace
+    Core: {
+        Components: {
+            Base: {
+                Controller: require('../components/base/controller')
+            },
+            Debug: {
+                Controller: require('../components/debug/controller'),
+                Coords: require('../components/debug/coords'),
+                Fps: require('../components/debug/fps'),
+                Template: require('../components/debug/template'),
+                Timescale: require('../components/debug/timescale')
+            },
+            DeviceRotate: {
+                Controller: require('../components/deviceRotate/controller')
+            },
+            Editor: {
+                Controller: require('../components/editor/controller'),
+                Api: require('../components/editor/api')
+            },
+            Fullscreen: {
+                Android: require('../components/fullscreen/android'),
+                Controller: require('../components/fullscreen/controller'),
+                Desktop: require('../components/fullscreen/desktop'),
+                Ios: require('../components/fullscreen/ios')
+            },
+            LayersSwitcher: {
+                Controller: require('../components/layersSwitcher/controller'),
+                Config: require('../components/layersSwitcher/config')
+            },
+            Loader: {
+                Controller: require('../components/loader/controller'),
+                Template: require('../components/loader/template')
+            },
+            SoundInitialPopup: {
+                Controller: require('../components/soundInitialPopup/controller'),
+                Template: require('../components/soundInitialPopup/template')
+            },
+            StateDriven: {
+                Controller: require('../components/stateDriven/controller')
+            }
+        },
+        Config: {
+            Main: require('../config/main')
+        },
+        Extra: {
+            BrowserEvents: require('../extra/browserEvents'),
+            Main: require('../extra/main'),
+            PixiPatch: require('../extra/pixiPatch')
+        },
+        Lib: {
+            Cache: require('../lib/cache'),
+            Composition: require('../lib/composition'),
+            Device: require('../lib/device'),
+            Helper: require('../lib/helper'),
+            Loader: require('../lib/loader'),
+            LocalData: require('../lib/localData'),
+            Logger: require('../lib/logger'),
+            Math: require('../lib/math'),
+            ObjectPool: require('../lib/objectPool'),
+            Time: require('../lib/time'),
+            Tween: require('../lib/tween')
+        },
+        Modules: {
+            Assets: {
+                BaseModel: require('../modules/assets/baseModel'),
+                Config: require('../modules/assets/config'),
+                Controller: require('../modules/assets/controller'),
+                Service: require('../modules/assets/service'),
+                Models: {
+                    Atlas: require('../modules/assets/models/atlas'),
+                    Audiosprite: require('../modules/assets/models/audiosprite'),
+                    BitmapFont: require('../modules/assets/models/bitmapFont'),
+                    Container: require('../modules/assets/models/container'),
+                    Font: require('../modules/assets/models/font'),
+                    Html: require('../modules/assets/models/html'),
+                    Image: require('../modules/assets/models/image'),
+                    Json: require('../modules/assets/models/json'),
+                    Sound: require('../modules/assets/models/sound'),
+                    Spine: require('../modules/assets/models/spine')
+                }
+            },
+            I18n: {
+                Config: require('../modules/i18n/config'),
+                Controller: require('../modules/i18n/controller')
+            },
+            Instances: {
+                Controller: require('../modules/instances/controller')
+            },
+            Logic: {
+                Controller: require('../modules/logic/controller'),
+                Main: require('../modules/logic/main'),
+                Sounds: require('../modules/logic/sounds'),
+                Config: {
+                    Sounds: require('../modules/logic/config/sounds')
+                }
+            },
+            Objects: {
+                BaseModel: require('../modules/objects/baseModel'),
+                Cache: require('../modules/objects/cache'),
+                Controller: require('../modules/objects/controller'),
+                Find: require('../modules/objects/find'),
+                PropertyAdapter: require('../modules/objects/propertyAdapter'),
+                Proxy: require('../modules/objects/proxy'),
+                Selector: require('../modules/objects/selector'),
+                Service: require('../modules/objects/service'),
+                Styles: require('../modules/objects/styles'),
+                Models: {
+                    AtlasImage: require('../modules/objects/models/atlasImage'),
+                    BitmapText: require('../modules/objects/models/bitmapText'),
+                    Button: require('../modules/objects/models/button'),
+                    ButtonComposite: require('../modules/objects/models/buttonComposite'),
+                    Checkbox: require('../modules/objects/models/checkbox'),
+                    Collection: require('../modules/objects/models/collection'),
+                    Component: require('../modules/objects/models/component'),
+                    Container: require('../modules/objects/models/container'),
+                    DragContainer: require('../modules/objects/models/dragContainer'),
+                    Emitter: require('../modules/objects/models/emitter'),
+                    EmitterFx: require('../modules/objects/models/emitterFx'),
+                    Graphics: require('../modules/objects/models/graphics'),
+                    Group: require('../modules/objects/models/group'),
+                    HitArea: require('../modules/objects/models/hitArea'),
+                    Image: require('../modules/objects/models/image'),
+                    ImagesAnimation: require('../modules/objects/models/imagesAnimation'),
+                    Mask: require('../modules/objects/models/mask'),
+                    NineSlicePlane: require('../modules/objects/models/nineSlicePlane'),
+                    Scrollbox: require('../modules/objects/models/scrollbox'),
+                    Slider: require('../modules/objects/models/slider'),
+                    Spine: require('../modules/objects/models/spine'),
+                    Text: require('../modules/objects/models/text'),
+                    TextInput: require('../modules/objects/models/textInput'),
+                    Toggle: require('../modules/objects/models/toggle'),
+                    World: require('../modules/objects/models/world')
+                }
+            },
+            Observer: {
+                Controller: require('../modules/observer/controller'),
+                Events: require('../modules/observer/events')
+            },
+            Scenes: {
+                Controller: require('../modules/scenes/controller'),
+                Model: require('../modules/scenes/model'),
+                PixiWrapper: require('../modules/scenes/pixiWrapper'),
+                Resolutions: require('../modules/scenes/resolutions'),
+                ResolutionsConfig: require('../modules/scenes/resolutionsConfig'),
+                Service: require('../modules/scenes/service')
+            },
+            SoundManager: {
+                Controller: require('../modules/soundManager/controller'),
+                SoundSprite: require('../modules/soundManager/soundSprite')
+            },
+            StatesManager: {
+                Action: require('../modules/statesManager/action'),
+                All: require('../modules/statesManager/all'),
+                ConfigStates: require('../modules/statesManager/configStates'),
+                Controller: require('../modules/statesManager/controller'),
+                FunctionsStorage: require('../modules/statesManager/functionsStorage'),
+                Helper: require('../modules/statesManager/helper'),
+                Race: require('../modules/statesManager/race'),
+                Sequence: require('../modules/statesManager/sequence'),
+                Actions: {
+                    //put your custom actions here
+                }
+            },
+            Template: {
+                Controller: require('../modules/template/controller'),
+                Model: require('../modules/template/model'),
+                Service: require('../modules/template/service'),
+                Types: require('../modules/template/types')
+            },
+            Transport: {
+                BaseConnectionType: require('../modules/transport/baseConnectionType'),
+                Config: require('../modules/transport/config'),
+                Controller: require('../modules/transport/controller'),
+                Decorator: require('../modules/transport/decorator'),
+                Service: require('../modules/transport/service'),
+                ConnectionTypes: {
+                    Websocket: require('../modules/transport/connectionTypes/websocket'),
+                    Xhr: require('../modules/transport/connectionTypes/xhr')
+                }
+            }
+        },
+        Templates: {
+            Groups: {},
+            Scenes: {}
+        },
+        App: require('../app')
+    }
+};

package/src/js/extra/{_info.js → main.js}

@@ -17,9 +17,3 @@ window.gsap = gsap;
 
 import Howler from 'howler';
 window.Howler = Howler;
-
-require("./pixiPatch.js");
-
-Urso.Core.Extra = {
-    BrowserEvents: require('./browserEvents.js')
-};

package/src/js/index.js

@@ -1,8 +1,7 @@
-window.Urso = { Core: {} };
-
 require('./config/load.js');
-Urso.config = require('./config/main.js');
-Urso.Core.App = require('./app.js');
+
+//main config
+Urso.config = Urso.Core.Config.Main;
 
 //function to run game with engine
 Urso.runGame = (new Urso.Core.App()).setup;

package/src/js/modules/assets/models/atlas.js

@@ -1,15 +1,17 @@
-class ModulesAssetsModelsAtlas extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsAtlas extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 
         this.type = Urso.types.assets.ATLAS;
     }
-  
+
     // cacheTextures: if true - add atlas parced textures in Urso textures cache with it's file name as asset key. 
     // Example - atlas texture with path 'atlasPath/image/image_01.png' will be saved in cache with a key 'image_01'.
     setupParams(params) {
         super.setupParams(params);
- 
+
         this.cacheTextures = Urso.helper.recursiveGet('cacheTextures', params, false);
     }
 }

package/src/js/modules/assets/models/audiosprite.js

@@ -1,6 +1,7 @@
 const { Howler } = require("howler");
+const ModulesAssetsBaseModel = require('./../baseModel');
 
-class ModulesAssetsModelsAudiosprite extends Urso.Core.Modules.Assets.BaseModel {
+class ModulesAssetsModelsAudiosprite extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/bitmapFont.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsBitmapFont extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsBitmapFont extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/container.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsContainer extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsContainer extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/font.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsFont extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsFont extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/html.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsHtml extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsHtml extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/image.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsImage extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsImage extends ModulesAssetsBaseModel {
 
     constructor(params) {
         super(params);

package/src/js/modules/assets/models/json.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsJson extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsJson extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/assets/models/sound.js

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsSound extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsSound extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesAssetsModelsSpine extends Urso.Core.Modules.Assets.BaseModel {
+const ModulesAssetsBaseModel = require('./../baseModel');
+
+class ModulesAssetsModelsSpine extends ModulesAssetsBaseModel {
     constructor(params) {
         super(params);
 

package/src/js/modules/objects/baseModel.js

@@ -198,7 +198,7 @@ class ModulesObjectsBaseModel {
 
     // sorts children by zIndex
     sortChildren() {
-        if(this._baseObject.children?.length > 0)
+        if (this._baseObject.children?.length > 0)
             this._baseObject.sortChildren();
     }
 }

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsAtlasImage extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsAtlasImage extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsBitmapText extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsBitmapText extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -8,7 +8,10 @@
     }
 }*/
 
-class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
+
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsButton extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -8,7 +8,9 @@ buttonModel = {
     }
 }*/
 
-class ModulesObjectsModelsButtonComposite extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsButtonComposite extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsComponent extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsComponent extends ModulesObjectsBaseModel {
 
     constructor(params) {
         super(params);

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsContainer extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsContainer extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsEmitter extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsEmitter extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsEmitterFx extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 
@@ -8,7 +10,7 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
         this.update = this.update.bind(this);
 
         this._addBaseObject();
-        this._createBundle();   
+        this._createBundle();
     }
 
     /**
@@ -55,15 +57,15 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
      * Stops emitter. If new emitter wasn't inited before particles disappears - clears this._emitter to stop bundle update.
      */
     stop() {
-        if(!this._emitter)
+        if (!this._emitter)
             return;
 
         this._emitter.stop();
         this._emitter.on.completed.add(() => {
-            if(!this._isActive)
+            if (!this._isActive)
                 this._emitter = null;
         });
-        
+
         this._isActive = false;
     }
 
@@ -75,7 +77,7 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
         this._bundle = new PIXI.particlesFx.FX();
         let fx_settings_data = Urso.cache.getJson(this.cfg).data;
 
-        if(this.spritesheetFilter)
+        if (this.spritesheetFilter)
             fx_settings_data.spritesheetFilter = this.spritesheetFilter;
 
         this._defaultEmitterName = fx_settings_data.emitters[0].name;

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsGraphics extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsGraphics extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsGroup extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsGroup extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsHitArea extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
         this._isDisabled = false;

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsImage extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsImage extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);
 

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

@@ -1,4 +1,6 @@
-class ModulesObjectsModelsImagesAnimation extends Urso.Core.Modules.Objects.BaseModel {
+const ModulesObjectsBaseModel = require('./../baseModel');
+
+class ModulesObjectsModelsImagesAnimation extends ModulesObjectsBaseModel {
     constructor(params) {
         super(params);