Fix Matrix4.rotateXYZ/YXZ/ZYX erroneously using dest matrix propert…

…ies when `this` was affine
JOML-CI · Jun 29, 2023 · eab54cb · eab54cb
1 parent 54e7747
commit eab54cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/joml/Matrix4d.java b/src/main/java/org/joml/Matrix4d.java
@@ -6349,7 +6349,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             double tx = m30, ty = m31, tz = m32;
             return dest.rotationXYZ(angleX, angleY, angleZ).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineXYZ(angleX, angleY, angleZ);
+            return rotateAffineXYZ(angleX, angleY, angleZ, dest);
         return rotateXYZInternal(angleX, angleY, angleZ, dest);
     }
     private Matrix4d rotateXYZInternal(double angleX, double angleY, double angleZ, Matrix4d dest) {
@@ -6539,7 +6539,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             double tx = m30, ty = m31, tz = m32;
             return dest.rotationZYX(angleZ, angleY, angleX).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineZYX(angleZ, angleY, angleX);
+            return rotateAffineZYX(angleZ, angleY, angleX, dest);
         return rotateZYXInternal(angleZ, angleY, angleX, dest);
     }
     private Matrix4d rotateZYXInternal(double angleZ, double angleY, double angleX, Matrix4d dest) {
@@ -6718,7 +6718,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             double tx = m30, ty = m31, tz = m32;
             return dest.rotationYXZ(angleY, angleX, angleZ).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineYXZ(angleY, angleX, angleZ);
+            return rotateAffineYXZ(angleY, angleX, angleZ, dest);
         return rotateYXZInternal(angleY, angleX, angleZ, dest);
     }
     private Matrix4d rotateYXZInternal(double angleY, double angleX, double angleZ, Matrix4d dest) {

diff --git a/src/main/java/org/joml/Matrix4f.java b/src/main/java/org/joml/Matrix4f.java
@@ -5314,7 +5314,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             float tx = m30(), ty = m31(), tz = m32();
             return dest.rotationXYZ(angleX, angleY, angleZ).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineXYZ(angleX, angleY, angleZ);
+            return rotateAffineXYZ(angleX, angleY, angleZ, dest);
         return rotateXYZInternal(angleX, angleY, angleZ, dest);
     }
     private Matrix4f rotateXYZInternal(float angleX, float angleY, float angleZ, Matrix4f dest) {
@@ -5504,7 +5504,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             float tx = m30(), ty = m31(), tz = m32();
             return dest.rotationZYX(angleZ, angleY, angleX).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineZYX(angleZ, angleY, angleX);
+            return rotateAffineZYX(angleZ, angleY, angleX, dest);
         return rotateZYXInternal(angleZ, angleY, angleX, dest);
     }
     private Matrix4f rotateZYXInternal(float angleZ, float angleY, float angleX, Matrix4f dest) {
@@ -5679,7 +5679,7 @@ else if ((properties & PROPERTY_TRANSLATION) != 0) {
             float tx = m30(), ty = m31(), tz = m32();
             return dest.rotationYXZ(angleY, angleX, angleZ).setTranslation(tx, ty, tz);
         } else if ((properties & PROPERTY_AFFINE) != 0)
-            return dest.rotateAffineYXZ(angleY, angleX, angleZ);
+            return rotateAffineYXZ(angleY, angleX, angleZ, dest);
         return rotateYXZInternal(angleY, angleX, angleZ, dest);
     }
     private Matrix4f rotateYXZInternal(float angleY, float angleX, float angleZ, Matrix4f dest) {