@next2d/display 2.4.1 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/display",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "Next2D Display Package",
   "author": "Toshiyuki Ienaga<ienaga@next2d.app> (https://github.com/ienaga/)",
   "license": "MIT",
@@ -24,13 +24,13 @@
     "url": "git+https://github.com/Next2D/Player.git"
   },
   "dependencies": {
-    "@next2d/ui": "2.4.1",
-    "@next2d/text": "2.4.1",
-    "@next2d/geom": "2.4.1",
-    "@next2d/media": "2.4.1",
-    "@next2d/net": "2.4.1",
-    "@next2d/events": "2.4.1",
-    "@next2d/filters": "2.4.1",
-    "@next2d/render-queue": "2.4.1"
+    "@next2d/ui": "2.5.0",
+    "@next2d/text": "2.5.0",
+    "@next2d/geom": "2.5.0",
+    "@next2d/media": "2.5.0",
+    "@next2d/net": "2.5.0",
+    "@next2d/events": "2.5.0",
+    "@next2d/filters": "2.5.0",
+    "@next2d/render-queue": "2.5.0"
   }
 }

package/src/DisplayObject/usecase/DisplayObjectGetScaleXUseCase.js

@@ -15,7 +15,8 @@ export const execute = (display_object) => {
     if (!matrix) {
         return 1;
     }
-    const xScale = Math.round(Math.sqrt(matrix[0] * matrix[0]
-        + matrix[1] * matrix[1]) * 10000) / 10000;
-    return 0 > matrix[0] ? xScale * -1 : xScale;
+    const EPS = 1e-12;
+    const signX = (Math.abs(matrix[0]) >= EPS ? Math.sign(matrix[0]) : Math.sign(matrix[1])) || 1;
+    const xScale = Math.hypot(matrix[0], matrix[1]);
+    return Math.round(xScale * signX * 10000) / 10000;
 };

package/src/DisplayObject/usecase/DisplayObjectGetScaleYUseCase.js

@@ -15,7 +15,8 @@ export const execute = (display_object) => {
     if (!matrix) {
         return 1;
     }
-    const yScale = Math.round(Math.sqrt(matrix[2] * matrix[2]
-        + matrix[3] * matrix[3]) * 10000) / 10000;
-    return 0 > matrix[3] ? yScale * -1 : yScale;
+    const EPS = 1e-12;
+    const sxAbs = Math.hypot(matrix[0], matrix[1]);
+    const signX = (Math.abs(matrix[0]) >= EPS ? Math.sign(matrix[0]) : Math.sign(matrix[1])) || 1;
+    return Math.round((matrix[0] * matrix[3] - matrix[1] * matrix[2]) / (sxAbs * signX) * 10000) / 10000;
 };

package/src/DisplayObject/usecase/DisplayObjectSetRotationUseCase.js

@@ -18,7 +18,7 @@ const $Deg2Rad = Math.PI / 180;
  * @protected
  */
 export const execute = (display_object, rotation) => {
-    rotation = $clamp(rotation % 360, 0 - 360, 360, 0);
+    rotation = $clamp(rotation % 360, -360, 360, 0);
     if (display_object.$rotation === rotation) {
         return;
     }
@@ -58,6 +58,8 @@ export const execute = (display_object, rotation) => {
             matrix.d = scaleY * Math.cos(radianY);
         }
     }
+    display_object.$scaleX = null;
+    display_object.$scaleY = null;
     display_object.$rotation = rotation;
     displayObjectApplyChangesService(display_object);
 };

package/src/DisplayObject/usecase/DisplayObjectSetScaleXUseCase.js

@@ -26,16 +26,21 @@ export const execute = (display_object, scale_x) => {
             : new Matrix();
     }
     if (matrix.b === 0 || isNaN(matrix.b)) {
-        matrix.a = scale_x;
+        matrix.a = scaleX;
     }
     else {
-        let radianX = Math.atan2(matrix.b, matrix.a);
-        if (radianX === -Math.PI) {
-            radianX = 0;
-        }
-        matrix.b = scale_x * Math.sin(radianX);
-        matrix.a = scale_x * Math.cos(radianX);
+        const EPS = 1e-12;
+        const theta = Math.atan2(matrix.b, matrix.a);
+        const sxAbs = Math.hypot(matrix.a, matrix.b);
+        const signX = (Math.abs(matrix.a) >= EPS ? Math.sign(matrix.a) : Math.sign(matrix.b)) || 1;
+        const sxSigned = sxAbs * signX;
+        const thetaPos = sxSigned >= 0 ? theta : theta - Math.PI;
+        const thetaUse = thetaPos + (scaleX < 0 ? Math.PI : 0);
+        const use = Math.abs(scaleX);
+        matrix.a = use * Math.cos(thetaUse);
+        matrix.b = use * Math.sin(thetaUse);
     }
     display_object.$scaleX = scaleX;
+    display_object.$rotation = null;
     displayObjectApplyChangesService(display_object);
 };

package/src/DisplayObject/usecase/DisplayObjectSetScaleYUseCase.js

@@ -26,16 +26,26 @@ export const execute = (display_object, scale_y) => {
             : new Matrix();
     }
     if (matrix.c === 0 || isNaN(matrix.c)) {
-        matrix.d = scale_y;
+        matrix.d = scaleY;
     }
     else {
-        let radianY = Math.atan2(-matrix.c, matrix.d);
-        if (radianY === -Math.PI) {
-            radianY = 0;
+        const targetAbs = Math.max(0, Math.abs(scaleY));
+        const EPS = 1e-12;
+        let theta = Math.atan2(matrix.b, matrix.a);
+        if (matrix.a < 0 || Math.abs(matrix.a) < EPS && matrix.b < 0) {
+            theta -= Math.PI;
         }
-        matrix.c = -scale_y * Math.sin(radianY);
-        matrix.d = scale_y * Math.cos(radianY);
+        if (theta <= -Math.PI) {
+            theta += 2 * Math.PI;
+        }
+        if (theta > Math.PI) {
+            theta -= 2 * Math.PI;
+        }
+        const thetaUse = theta + (scaleY < 0 ? Math.PI : 0);
+        matrix.c = -targetAbs * Math.sin(thetaUse);
+        matrix.d = targetAbs * Math.cos(thetaUse);
     }
     display_object.$scaleY = scaleY;
+    display_object.$rotation = null;
     displayObjectApplyChangesService(display_object);
 };