@urso/core 0.5.1 → 0.5.4

package/package.json

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

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

@@ -2,9 +2,9 @@ Urso.Core.Modules.Objects = {
     BaseModel: require('./baseModel.js'),
     Cache: require('./cache.js'),
     Controller: require('./controller.js'),
-    Create: require('./create.js'),
     Find: require('./find.js'),
     Proxy: require('./proxy.js'),
+    Service: require('./service.js'),
     Styles: require('./styles.js'),
     PropertyAdapter: require('./propertyAdapter.js')
 };

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

@@ -35,7 +35,7 @@ class ModulesObjectsController {
             return Urso.scenes.addObject(object, parent, doNotRefreshStylesFlag);
         }
 
-        return this.getInstance('Create').add(object, parent);
+        return this.getInstance('Service').add(object, parent);
     }
 
     find(selector) {
@@ -85,19 +85,19 @@ class ModulesObjectsController {
     }
 
     getWorld() {
-        return this.getInstance('Create').getWorld();
+        return this.getInstance('Service').getWorld();
     }
 
     addChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Create').addChild(parent, child, doNotRefreshStylesFlag);
+        this.getInstance('Service').addChild(parent, child, doNotRefreshStylesFlag);
     }
 
     removeChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Create').removeChild(parent, child, doNotRefreshStylesFlag);
+        this.getInstance('Service').removeChild(parent, child, doNotRefreshStylesFlag);
     }
 
     destroy(object, doNotRefreshStylesFlag) {
-        this.getInstance('Create').destroy(object, doNotRefreshStylesFlag);
+        this.getInstance('Service').destroy(object, doNotRefreshStylesFlag);
     }
 
     //do not use outside engine
@@ -106,19 +106,19 @@ class ModulesObjectsController {
     }
 
     _updateCommonProperties(object) {
-        this.getInstance('Create')._updateCommonProperties(object);
+        this.getInstance('Service')._updateCommonProperties(object);
     }
 
     _newResolutionHandler(params) {
-        this.getInstance('Create').updateWorldBounds(params);
+        this.getInstance('Service').updateWorldBounds(params);
     }
 
     _resetWorld() {
-        this.getInstance('Create').resetWorld();
+        this.getInstance('Service').resetWorld();
     }
 
     _applyClassesToWorld() {
-        this.getInstance('Create').applyClassesToWorld();
+        this.getInstance('Service').applyClassesToWorld();
     }
 
     _subscribeOnce() {

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

@@ -2,7 +2,7 @@ class ModulesObjectsModelsImagesAnimation extends Urso.Core.Modules.Objects.Base
     constructor(params) {
         super(params);
 
-        this.type = Urso.types.objects.IMAGES_ANIMATION;
+        this.type = Urso.types.objects.IMAGESANIMATION;
 
         //sys
         this._tween = null;

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

@@ -4,18 +4,21 @@ class ModulesObjectsModelsScrollbox extends Urso.Core.Modules.Objects.BaseModel
 
         this.type = Urso.types.objects.SCROLLBOX;
         this._addBaseObject();
-        this._createContent();
+        this._createScrollContent();
     }
 
     setupParams(params) {
         super.setupParams(params);
 
-        this.content = Urso.helper.recursiveGet('content', params, []);
+        this.scrollContent = Urso.helper.recursiveGet('scrollContent', params, []);
         this.dragScroll = Urso.helper.recursiveGet('dragScroll', params, true);
-        this.scrollType = Urso.helper.recursiveGet('scrollType', params, 3);
+        this.scrollType = Urso.helper.recursiveGet('scrollType', params, 'auto'); // hidden / hiddenVertical / hiddenHorizontal / auto
+
+        this.width = Urso.helper.recursiveGet('width', params, false); //number format
+        this.height = Urso.helper.recursiveGet('height', params, false); //number format
     }
 
-    _getScrollboxParams(){
+    _getScrollboxParams() {
         return {
             boxWidth: this.width,
             boxHeight: this.height,
@@ -25,25 +28,25 @@ class ModulesObjectsModelsScrollbox extends Urso.Core.Modules.Objects.BaseModel
         }
     }
 
-    _setScrollWidth(){
-        if(this.scrollType === 1 || this.scrollType === 0){
+    _setScrollWidth() {
+        if (this.scrollType === 'hiddenHorizontal' || this.scrollType === 'hidden') {
             this._baseObject.scrollWidth = this.width;
             this._baseObject.overflowX = 'hidden';
         }
     }
 
-    _setScrollHeight(){
-        if(this.scrollType === 2 || this.scrollType === 0){
+    _setScrollHeight() {
+        if (this.scrollType === 'hiddenVertical' || this.scrollType === 'hidden') {
             this._baseObject.scrollHeight = this.height;
-            this._baseObject.overflowY = 'hidden'
+            this._baseObject.overflowY = 'hidden';
         }
     }
 
-    _createContent(){
-        this.content.forEach(child => {
-            let object = Urso.objects.create(child)
-            this._baseObject.content.addChild(object._baseObject)
-        })
+    _createScrollContent() {
+        this.scrollContent.forEach(child => {
+            let object = Urso.objects.create(child);
+            this._baseObject.content.addChild(object._baseObject);
+        });
 
         this._baseObject.update();
     }

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

@@ -236,7 +236,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         if (this.animation.name)
             this.play(this.animation.name, this.animation.loop);
 
-        animation.state.addListener({ event: this._eventHandler.bind(this) });
+        this._baseObject.state.addListener({ event: this._eventHandler.bind(this) });
     };
 
     _eventHandler(entry, event) {

package/src/js/modules/objects/{create.js → service.js}

@@ -1,4 +1,4 @@
-class ModulesObjectsCreate {
+class ModulesObjectsService {
     constructor() {
         this.singleton = true;
 
@@ -92,7 +92,7 @@ class ModulesObjectsCreate {
             case Urso.types.objects.HITAREA:
                 model = this.getInstance('Models.HitArea', object);
                 break;
-            case Urso.types.objects.IMAGES_ANIMATION:
+            case Urso.types.objects.IMAGESANIMATION:
                 model = this.getInstance('Models.ImagesAnimation', object);
                 break;
             case Urso.types.objects.TEXTINPUT:
@@ -237,4 +237,4 @@ class ModulesObjectsCreate {
     }
 }
 
-module.exports = ModulesObjectsCreate;
+module.exports = ModulesObjectsService;

package/src/js/modules/template/types.js

@@ -2,42 +2,42 @@ class ModulesTemplateTypes {
     constructor() {
         this.list = {
             assets: {
-                IMAGE: 1,
-                CONTAINER: 2,
-                ATLAS: 3,
-                JSON: 4,
-                SPINE: 5,
-                BITMAPFONT: 6,
-                SOUND: 7,
-                FONT: 8,
-                AUDIOSPRITE: 9
+                ATLAS: 1,
+                AUDIOSPRITE: 2,
+                BITMAPFONT: 3,
+                CONTAINER: 4,
+                FONT: 5,
+                IMAGE: 6,
+                JSON: 7,
+                SOUND: 8,
+                SPINE: 9
             },
 
             objects: {
-                WORLD: 1,
-                IMAGE: 2,
-                CONTAINER: 3,
-                TEXT: 4,
-                BUTTON: 5,
-                BUTTONCOMPOSITE: 6,
-                SPINE: 7,
-                BITMAPTEXT: 8,
-                MASK: 9,
-                GRAPHICS: 10,
-                HITAREA: 11,
-                COLLECTION: 12,
-                EMITTER: 13,
-                COMPONENT: 14,
-                GROUP: 15,
-                IMAGES_ANIMATION: 16,
-                ATLASIMAGE: 17,
-                SLIDER: 18,
-                TOGGLE: 19,
-                CHECKBOX: 20,
-                SCROLLBOX: 21,
+                ATLASIMAGE: 1,
+                BITMAPTEXT: 2,
+                BUTTON: 3,
+                BUTTONCOMPOSITE: 4,
+                CHECKBOX: 5,
+                COLLECTION: 6,
+                COMPONENT: 7,
+                CONTAINER: 8,
+                EMITTER: 9,
+                EMITTERFX: 10,
+                GRAPHICS: 11,
+                GROUP: 12,
+                HITAREA: 13,
+                IMAGE: 14,
+                IMAGESANIMATION: 15,
+                MASK: 16,
+                NINESLICEPLANE: 17,
+                SCROLLBOX: 18,
+                SLIDER: 19,
+                SPINE: 20,
+                TEXT: 21,
                 TEXTINPUT: 22,
-                NINESLICEPLANE: 23,
-                EMITTERFX: 24
+                TOGGLE: 23,
+                WORLD: 24
             }
         }
     }