@urso/core 0.4.20 → 0.4.23

package/package.json

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

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

@@ -37,6 +37,8 @@ class ModulesObjectsBaseModel {
         this.alignY = Urso.helper.recursiveGet('alignY', params, 'top'); //or bottom or center
         this.width = Urso.helper.recursiveGet('width', params, false); //or 40% or 1456  // highest priority then scale
         this.height = Urso.helper.recursiveGet('height', params, false); //or 40% or 568  // highest priority then scale
+        this.maxWidth = Urso.helper.recursiveGet('maxWidth', params, false); //maximum width value. If objects width will be higher, it will be downscale. Do not use with scale.
+        this.maxHeight = Urso.helper.recursiveGet('maxHeight', params, false); //maximum height value. If objects height will be higher, it will be downscale. Do not use with scale.
         this.stretchingType = Urso.helper.recursiveGet('stretchingType', params, false);  //or inscribed or circumscribed //works only if width=height=100%
         this.angle = Urso.helper.recursiveGet('angle', params, 0);
         this.visible = Urso.helper.recursiveGet('visible', params, true);

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

@@ -30,15 +30,13 @@ class ModulesObjectsModelsText extends Urso.Core.Modules.Objects.BaseModel {
         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.maxWidth = Urso.helper.recursiveGet('maxWidth', params, false); //todo
     }
 
     _addBaseObject() {
         if (this.localeId)
             this._originalModel.text = this.text = Urso.i18n.get(this.localeId, this.localeVariables);
 
-        this._baseObject = new PIXI.Text(this.text);
+        this._baseObject = new PIXI.Text(this.text, { fontFamily: this.fontFamily });
 
         if (this.fillCustomColors) {
             this._baseObject.fillCustomColors = this.fillCustomColors;

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

@@ -85,6 +85,8 @@ class ModulesObjectsProxy {
 
         this._setProperty(target, propertyName, value);
 
+        this._checkMaxSize(target);
+
         //setup dirty to recalc params
         if (typeof target._baseObject.dirty !== 'undefined')
             target._baseObject.dirty = true;
@@ -92,6 +94,30 @@ class ModulesObjectsProxy {
         return true;
     };
 
+    _checkMaxSize(target) {
+        if (!target.maxWidth && !target.maxHeight)
+            return;
+
+        let scaleNeed = 1;
+
+        if (target.maxWidth) {
+            scaleNeed = Math.abs((target._baseObject.scale.x * target.maxWidth) / target._baseObject.width);
+        }
+
+        if (target.maxHeight) {
+            const scaleYNeed = Math.abs((target._baseObject.scale.y * target.maxHeight) / target._baseObject.height);
+
+            if (scaleNeed > scaleYNeed)
+                scaleNeed = scaleYNeed;
+        }
+
+        if (scaleNeed > 1)
+            scaleNeed = 1;
+
+        target._baseObject.scale.x = scaleNeed * Math.sign(target._baseObject.scale.x);
+        target._baseObject.scale.y = scaleNeed * Math.sign(target._baseObject.scale.y);
+    }
+
     _runCustomFunction(property, target) {
         const funcName = property.replace('function.', '');
         if (target[funcName])

package/src/js/modules/objects/styles.js

@@ -4,6 +4,7 @@ class ModulesObjectsStyles {
 
         this._cache = {};
         this._tempObject = this.getInstance('BaseModel', {})
+        this._tempTextObject = this.getInstance('Models.Text', {})
     }
 
     refresh(parent) {
@@ -103,8 +104,10 @@ class ModulesObjectsStyles {
         if (object._originalModel[key])
             return;
 
+        const tempObject = (object.type === Urso.types.objects.TEXT) ? this._tempTextObject : this._tempObject;
+
         //restore defaults
-        Urso.objects._safeSetValueToTarget(object, key, this._tempObject[key]);
+        Urso.objects._safeSetValueToTarget(object, key, tempObject[key]);
 
         //check other styles
         for (let [selector, style] of Object.entries(object._styles))