Optimize Matrix[4/4x3]f.set3x3(Matrix3f)

JOML-CI · Oct 11, 2016 · fe16c78 · fe16c78
1 parent e256692
commit fe16c78
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 18 deletions.
diff --git a/src/org/joml/Matrix4f.java b/src/org/joml/Matrix4f.java
@@ -4370,15 +4370,7 @@ public Matrix4f translationRotate(float tx, float ty, float tz, Quaternionf quat
      * @return this
      */
     public Matrix4f set3x3(Matrix3f mat) {
-        m00 = mat.m00;
-        m01 = mat.m01;
-        m02 = mat.m02;
-        m10 = mat.m10;
-        m11 = mat.m11;
-        m12 = mat.m12;
-        m20 = mat.m20;
-        m21 = mat.m21;
-        m22 = mat.m22;
+        MemUtil.INSTANCE.copy3x3(mat, this);
         properties &= ~(PROPERTY_PERSPECTIVE | PROPERTY_IDENTITY | PROPERTY_TRANSLATION);
         return this;
     }

diff --git a/src/org/joml/Matrix4x3f.java b/src/org/joml/Matrix4x3f.java
@@ -2865,15 +2865,7 @@ public Matrix4x3f translationRotate(float tx, float ty, float tz, Quaternionf qu
      * @return this
      */
     public Matrix4x3f set3x3(Matrix3f mat) {
-        m00 = mat.m00;
-        m01 = mat.m01;
-        m02 = mat.m02;
-        m10 = mat.m10;
-        m11 = mat.m11;
-        m12 = mat.m12;
-        m20 = mat.m20;
-        m21 = mat.m21;
-        m22 = mat.m22;
+        MemUtil.INSTANCE.copy3x3(mat, this);
         properties &= ~(PROPERTY_IDENTITY | PROPERTY_TRANSLATION);
         return this;
     }

diff --git a/src/org/joml/MemUtil.java b/src/org/joml/MemUtil.java
@@ -145,6 +145,8 @@ private static final MemUtil createInstance() {
     public abstract void copy(Matrix3f src, Matrix4x3f dest);
     public abstract void copy3x3(Matrix4f src, Matrix4f dest);
     public abstract void copy3x3(Matrix4x3f src, Matrix4x3f dest);
+    public abstract void copy3x3(Matrix3f src, Matrix4x3f dest);
+    public abstract void copy3x3(Matrix3f src, Matrix4f dest);
     public abstract void copy4x3(Matrix4f src, Matrix4f dest);
     public abstract void copy4x3(Matrix4x3f src, Matrix4f dest);
     public abstract void copy(Vector4f src, Vector4f dst);
@@ -1244,6 +1246,30 @@ public final void copy3x3(Matrix4x3f src, Matrix4x3f dest) {
             dest.m22 = src.m22;
         }
 
+        public final void copy3x3(Matrix3f src, Matrix4x3f dest) {
+            dest.m00 = src.m00;
+            dest.m01 = src.m01;
+            dest.m02 = src.m02;
+            dest.m10 = src.m10;
+            dest.m11 = src.m11;
+            dest.m12 = src.m12;
+            dest.m20 = src.m20;
+            dest.m21 = src.m21;
+            dest.m22 = src.m22;
+        }
+
+        public final void copy3x3(Matrix3f src, Matrix4f dest) {
+            dest.m00 = src.m00;
+            dest.m01 = src.m01;
+            dest.m02 = src.m02;
+            dest.m10 = src.m10;
+            dest.m11 = src.m11;
+            dest.m12 = src.m12;
+            dest.m20 = src.m20;
+            dest.m21 = src.m21;
+            dest.m22 = src.m22;
+        }
+
         public final void copy4x3(Matrix4x3f src, Matrix4f dest) {
             dest.m00 = src.m00;
             dest.m01 = src.m01;
@@ -2509,6 +2535,22 @@ public final void copy3x3(Matrix4x3f src, Matrix4x3f dest) {
             dest.m22 = src.m22;
         }
 
+        public final void copy3x3(Matrix3f src, Matrix4x3f dest) {
+            for (int i = 0; i < 4; i++) {
+                UNSAFE.putOrderedLong(dest, Matrix4x3f_m00 + (i << 3), UNSAFE.getLong(src, Matrix3f_m00 + (i << 3)));
+            }
+            dest.m22 = src.m22;
+        }
+
+        public final void copy3x3(Matrix3f src, Matrix4f dest) {
+            for (int i = 0; i < 3; i++) {
+                UNSAFE.putOrderedLong(dest, Matrix4f_m00 + (i << 4), UNSAFE.getLong(src, Matrix3f_m00 + 12 * i));
+            }
+            dest.m02 = src.m02;
+            dest.m12 = src.m12;
+            dest.m22 = src.m22;
+        }
+
         public final void copy4x3(Matrix4x3f src, Matrix4f dest) {
             for (int i = 0; i < 4; i++) {
                 UNSAFE.putOrderedLong(dest, Matrix4f_m00 + (i << 4), UNSAFE.getLong(src, Matrix4x3f_m00 + 12 * i));