@urso/core 0.4.40 → 0.4.43

package/package.json

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

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

@@ -6,6 +6,8 @@ class ModulesI18nController {
      * get text by localeId
      * @param {String} localeId 
      * @param {Object} [localeVariables] - variables for locale string
+     *
+     * @example get('Some333 ${bet} " `test ${multi} text localized', {bet:12,multi:13})
      */
     get(localeId, localeVariables = {}) {
         if (this.#vocabulary && this.#vocabulary[localeId]) {
@@ -66,12 +68,11 @@ class ModulesI18nController {
     }
 
     _interpolate(string, params) {
-        const names = Object.keys(params);
-        const vals = Object.values(params);
-        const encodedString = encodeURIComponent(string);
-        const resultEncodedString = new Function(...names, `return \`${encodedString}\`;`)(...vals);
+        for (const [key, value] of Object.entries(params)) {
+            string = Urso.helper.stringReplace('${' + key + '}', value, string);
+        }
 
-        return decodeURIComponent(resultEncodedString);
+        return string
     }
 }
 

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

@@ -101,6 +101,27 @@ class ModulesObjectsProxy {
         if (!target.maxWidth && !target.maxHeight)
             return;
 
+        let calculationNeed = false;
+
+        const baseObject = target._baseObject;
+
+        //Pixi texts have _texture.orig.width. When we call baseObject.width, Pixi runs update text. Its too slow operation.
+        if (baseObject._texture && (!baseObject._texture.orig.width || !baseObject._texture.orig.height)) {
+            baseObject.updateText(true);
+        }
+
+        const baseObjectWidth = baseObject._texture ? Math.abs(baseObject.scale.x) * baseObject._texture.orig.width : baseObject.width;
+        const baseObjectHeight = baseObject._texture ? Math.abs(baseObject.scale.y) * baseObject._texture.orig.height : baseObject.height;
+
+        if (target.maxWidth && target.maxWidth < baseObjectWidth) //check maxWidth
+            calculationNeed = true;
+
+        if (target.maxHeight && target.maxHeight < baseObjectHeight) //check maxHeight
+            calculationNeed = true;
+
+        if (!calculationNeed)
+            return;
+
         let scaleNeed = 1;
 
         if (target.maxWidth) {

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

@@ -42,7 +42,6 @@ class ModulesObjectsStyles {
                     delete this._cache[selector];
             }
         }
-
     }
 
     _apply(selector, style) {
@@ -68,7 +67,7 @@ class ModulesObjectsStyles {
     _globalResetStyles() {
         for (let [selector, selectorCache] of Object.entries(this._cache)) {
             for (let [uid, object] of Object.entries(selectorCache))
-                this._removeSelectorStyles(object, selector);
+                this._removeSelectorStyles(object, selector, true);
 
             delete this._cache[selector];
         }
@@ -84,7 +83,7 @@ class ModulesObjectsStyles {
             }
     }
 
-    _removeSelectorStyles(object, selector) {
+    _removeSelectorStyles(object, selector, globalResetFlag) {
         delete object._styles[selector];
         let template = Urso.template.get();
         let styles = template.styles[selector];
@@ -94,12 +93,12 @@ class ModulesObjectsStyles {
         }
 
         for (let [key, value] of Object.entries(styles)) {
-            this._restoreValueByKey(key, object);
+            this._restoreValueByKey(key, object, globalResetFlag);
         }
 
     }
 
-    _restoreValueByKey(key, object) {
+    _restoreValueByKey(key, object, globalResetFlag) {
         //check own
         if (object._originalModel[key])
             return;
@@ -110,9 +109,11 @@ class ModulesObjectsStyles {
         Urso.objects._safeSetValueToTarget(object, key, tempObject[key]);
 
         //check other styles
-        for (let [selector, style] of Object.entries(object._styles))
-            if (typeof style[key] !== 'undefined')
-                Urso.objects._safeSetValueToTarget(object, key, style[key]);
+        if (!globalResetFlag) {
+            for (let [selector, style] of Object.entries(object._styles))
+                if (typeof style[key] !== 'undefined')
+                    Urso.objects._safeSetValueToTarget(object, key, style[key]);
+        }
     }
 }