@urso/core 0.4.23 → 0.4.26

package/package.json

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

package/src/js/modules/i18n/controller.js

@@ -68,7 +68,10 @@ class ModulesI18nController {
     _interpolate(string, params) {
         const names = Object.keys(params);
         const vals = Object.values(params);
-        return new Function(...names, `return \`${string}\`;`)(...vals);
+        const encodedString = encodeURIComponent(string);
+        const resultEncodedString = new Function(...names, `return \`${encodedString}\`;`)(...vals);
+
+        return decodeURIComponent(resultEncodedString);
     }
 }
 

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

@@ -98,6 +98,9 @@ class ModulesObjectsCreate {
             case Urso.types.objects.TEXTINPUT:
                 model = this.getInstance('Models.TextInput', object);
                 break;
+            case Urso.types.objects.NINESLICEPLANE:
+                model = this.getInstance('Models.NineSlicePlane', object);
+                break;
 
             default:
                 const objectName = Urso.helper.capitaliseFirstLetter(

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

@@ -3,6 +3,7 @@ Urso.Core.Modules.Objects.Models = {
     BitmapText: require('./bitmapText.js'),
     Button: require('./button.js'),
     ButtonComposite: require('./buttonComposite.js'),
+    Checkbox: require('./checkbox.js'),
     Collection: require('./collection.js'),
     Component: require('./component.js'),
     Container: require('./container.js'),
@@ -13,12 +14,12 @@ Urso.Core.Modules.Objects.Models = {
     Image: require('./image.js'),
     ImagesAnimation: require('./imagesAnimation.js'),
     Mask: require('./mask.js'),
+    NineSlicePlane: require('./nineSlicePlane.js'),
+    Scrollbox: require('./scrollbox.js'),
+    Slider: require('./slider.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')
+    Toggle: require('./toggle.js'),
+    World: require('./world.js')
 };

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

@@ -0,0 +1,30 @@
+class ModulesObjectsModelsNineSlicePlane extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.NINESLICEPLANE;
+        this._addBaseObject();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
+        this.leftWidth = Urso.helper.recursiveGet('leftWidth', params, false);
+        this.topHeight = Urso.helper.recursiveGet('topHeight', params, false);
+        this.rightWidth = Urso.helper.recursiveGet('rightWidth', params, false);
+        this.bottomHeight = Urso.helper.recursiveGet('bottomHeight', params, false);
+    }
+
+
+    _addBaseObject() {
+        let texture = Urso.cache.getTexture(this.assetKey)
+
+        if (!texture)
+            Urso.logger.error('ModulesObjectsModelsImage assets error: no image with key: ' + this.assetKey);
+
+        this._baseObject = new PIXI.NineSlicePlane(texture, this.leftWidth, this.topHeight, this.rightWidth, this.bottomHeight);
+    };
+}
+
+module.exports = ModulesObjectsModelsNineSlicePlane;

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

@@ -29,14 +29,17 @@ class ModulesObjectsModelsText extends Urso.Core.Modules.Objects.BaseModel {
         this.dropShadowAngle = Urso.helper.recursiveGet('dropShadowAngle', params, 0); //Math.PI / 6
         this.dropShadowDistance = Urso.helper.recursiveGet('dropShadowBlur', params, 0); // 6
         this.wordWrap = Urso.helper.recursiveGet('wordWrap', params, false);
-        this.wordWrapWidth = Urso.helper.recursiveGet('wordWrapWidth', params, 100)
+        this.wordWrapWidth = Urso.helper.recursiveGet('wordWrapWidth', params, 100);
+        this.leading = Urso.helper.recursiveGet('leading', params, 0);
+        this.textAlign = Urso.helper.recursiveGet('textAlign', params, 'left');
     }
 
     _addBaseObject() {
         if (this.localeId)
             this._originalModel.text = this.text = Urso.i18n.get(this.localeId, this.localeVariables);
 
-        this._baseObject = new PIXI.Text(this.text, { fontFamily: this.fontFamily });
+        const styles = { fontFamily: this.fontFamily, leading: this.leading, align: this.textAlign }
+        this._baseObject = new PIXI.Text(this.text, styles);
 
         if (this.fillCustomColors) {
             this._baseObject.fillCustomColors = this.fillCustomColors;

package/src/js/modules/objects/propertyAdapter.js

@@ -31,21 +31,22 @@ class PropertyAdapter {
             Urso.types.objects.COMPONENT,
             Urso.types.objects.CONTAINER,
             Urso.types.objects.GROUP,
-            Urso.types.objects.WORLD,
-            Urso.types.objects.SLIDER,
             Urso.types.objects.SCROLLBOX,
+            Urso.types.objects.SLIDER,
+            Urso.types.objects.WORLD
         ];
 
         this._typesWithoutAnchor = [
+            Urso.types.objects.CHECKBOX,
             Urso.types.objects.EMITTER,
             Urso.types.objects.GRAPHICS,
             Urso.types.objects.HITAREA,
             Urso.types.objects.MASK,
-            Urso.types.objects.SPINE,
+            Urso.types.objects.NINESLICEPLANE,
             Urso.types.objects.SLIDER,
+            Urso.types.objects.SPINE,
             Urso.types.objects.TEXTINPUT,
-            Urso.types.objects.CHECKBOX,
-            Urso.types.objects.WORLD,
+            Urso.types.objects.WORLD
         ];
     }
 

package/src/js/modules/objects/proxy.js

@@ -197,6 +197,8 @@ class ModulesObjectsProxy {
             'dropShadowDistance': 'style.dropShadowDistance',
             'wordWrap': 'style.wordWrap',
             'wordWrapWidth': 'style.wordWrapWidth',
+            'leading ': 'style.leading',
+            'textAlign ': 'style.align',
             'enabled': 'input.enabled',
             'cacheAsBitmap': 'cacheAsBitmap',
 

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

@@ -35,7 +35,9 @@ class ModulesTemplateTypes {
                 TOGGLE: 19,
                 CHECKBOX: 20,
                 SCROLLBOX: 21,
-                TEXTINPUT: 22
+                TEXTINPUT: 22,
+                TEXTINPUT: 22,
+                NINESLICEPLANE: 23
             }
         }
     }