From 0f66b420d9e3a27a6308605a0347a6e8f81563d9 Mon Sep 17 00:00:00 2001
From: NicBOMB <19939315+NicBOMB@users.noreply.github.com>
Date: Sat, 22 Jun 2024 09:06:32 +0000
Subject: [PATCH] Change `Matrix4f.set3x3(Matrix4f)` to
`Matrix4f.set3x3(Matrix4fc)` (#344)
All of the underlying `MemUtil` functions for copying rely on
the read-only interface methods. These now specify the read-only class
in their parameters. This should allow for greater flexibility in using
these memory helpers.
---
src/main/java/org/joml/Matrix2d.java | 51 ++------
src/main/java/org/joml/Matrix2f.java | 44 ++-----
src/main/java/org/joml/Matrix3x2d.java | 40 +------
src/main/java/org/joml/Matrix3x2f.java | 32 +----
src/main/java/org/joml/Matrix4f.java | 24 ++--
src/main/java/org/joml/Matrix4x3f.java | 17 +--
src/main/java/org/joml/MemUtil.java | 160 ++++++++++++-------------
7 files changed, 120 insertions(+), 248 deletions(-)
diff --git a/src/main/java/org/joml/Matrix2d.java b/src/main/java/org/joml/Matrix2d.java
index b5ec150d..abb7f4be 100644
--- a/src/main/java/org/joml/Matrix2d.java
+++ b/src/main/java/org/joml/Matrix2d.java
@@ -66,10 +66,8 @@ public Matrix2d() {
* the {@link Matrix2dc} to copy the values from
*/
public Matrix2d(Matrix2dc mat) {
- if (mat instanceof Matrix2d) {
- MemUtil.INSTANCE.copy((Matrix2d) mat, this);
- } else {
- setMatrix2dc(mat);
+ if (mat != this) {
+ MemUtil.INSTANCE.copy(mat, this);
}
}
@@ -93,11 +91,7 @@ public Matrix2d(Matrix2fc mat) {
* the {@link Matrix3dc} to copy the values from
*/
public Matrix2d(Matrix3dc mat) {
- if (mat instanceof Matrix3d) {
- MemUtil.INSTANCE.copy((Matrix3d) mat, this);
- } else {
- setMatrix3dc(mat);
- }
+ MemUtil.INSTANCE.copy(mat, this);
}
/**
@@ -277,21 +271,12 @@ Matrix2d _m11(double m11) {
* @return this
*/
public Matrix2d set(Matrix2dc m) {
- if (m == this)
- return this;
- else if (m instanceof Matrix2d) {
- MemUtil.INSTANCE.copy((Matrix2d) m, this);
- } else {
- setMatrix2dc(m);
+ if (m != this)
+ {
+ MemUtil.INSTANCE.copy(m, this);
}
return this;
}
- private void setMatrix2dc(Matrix2dc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Set the elements of this matrix to the ones in m
.
@@ -316,19 +301,9 @@ public Matrix2d set(Matrix2fc m) {
* @return this
*/
public Matrix2d set(Matrix3x2dc m) {
- if (m instanceof Matrix3x2d) {
- MemUtil.INSTANCE.copy((Matrix3x2d) m, this);
- } else {
- setMatrix3x2dc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix3x2dc(Matrix3x2dc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Set the elements of this matrix to the left 2x2 submatrix of m
.
@@ -353,19 +328,9 @@ public Matrix2d set(Matrix3x2fc m) {
* @return this
*/
public Matrix2d set(Matrix3dc m) {
- if (m instanceof Matrix3d) {
- MemUtil.INSTANCE.copy((Matrix3d) m, this);
- } else {
- setMatrix3dc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix3dc(Matrix3dc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Set the elements of this matrix to the upper left 2x2 of the given {@link Matrix3dc}.
diff --git a/src/main/java/org/joml/Matrix2f.java b/src/main/java/org/joml/Matrix2f.java
index b5749aa5..89100ca7 100644
--- a/src/main/java/org/joml/Matrix2f.java
+++ b/src/main/java/org/joml/Matrix2f.java
@@ -65,10 +65,8 @@ public Matrix2f() {
* the {@link Matrix2fc} to copy the values from
*/
public Matrix2f(Matrix2fc mat) {
- if (mat instanceof Matrix2f) {
- MemUtil.INSTANCE.copy((Matrix2f) mat, this);
- } else {
- setMatrix2fc(mat);
+ if (mat != this) {
+ MemUtil.INSTANCE.copy(mat, this);
}
}
@@ -79,11 +77,7 @@ public Matrix2f(Matrix2fc mat) {
* the {@link Matrix3fc} to copy the values from
*/
public Matrix2f(Matrix3fc mat) {
- if (mat instanceof Matrix3f) {
- MemUtil.INSTANCE.copy((Matrix3f) mat, this);
- } else {
- setMatrix3fc(mat);
- }
+ MemUtil.INSTANCE.copy(mat, this);
}
/**
@@ -250,12 +244,8 @@ Matrix2f _m11(float m11) {
* @return this
*/
public Matrix2f set(Matrix2fc m) {
- if (m == this)
- return this;
- else if (m instanceof Matrix2f) {
- MemUtil.INSTANCE.copy((Matrix2f) m, this);
- } else {
- setMatrix2fc(m);
+ if (m != this) {
+ MemUtil.INSTANCE.copy(m, this);
}
return this;
}
@@ -274,19 +264,9 @@ private void setMatrix2fc(Matrix2fc mat) {
* @return this
*/
public Matrix2f set(Matrix3x2fc m) {
- if (m instanceof Matrix3x2f) {
- MemUtil.INSTANCE.copy((Matrix3x2f) m, this);
- } else {
- setMatrix3x2fc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix3x2fc(Matrix3x2fc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Set the elements of this matrix to the upper left 2x2 of the given {@link Matrix3fc}.
@@ -296,19 +276,9 @@ private void setMatrix3x2fc(Matrix3x2fc mat) {
* @return this
*/
public Matrix2f set(Matrix3fc m) {
- if (m instanceof Matrix3f) {
- MemUtil.INSTANCE.copy((Matrix3f) m, this);
- } else {
- setMatrix3fc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix3fc(Matrix3fc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Multiply this matrix by the supplied right
matrix.
diff --git a/src/main/java/org/joml/Matrix3x2d.java b/src/main/java/org/joml/Matrix3x2d.java
index 3a5b1cf9..99562a41 100644
--- a/src/main/java/org/joml/Matrix3x2d.java
+++ b/src/main/java/org/joml/Matrix3x2d.java
@@ -68,11 +68,7 @@ public Matrix3x2d() {
* the {@link Matrix2dc}
*/
public Matrix3x2d(Matrix2dc mat) {
- if (mat instanceof Matrix2d) {
- MemUtil.INSTANCE.copy((Matrix2d) mat, this);
- } else {
- setMatrix2dc(mat);
- }
+ MemUtil.INSTANCE.copy(mat, this);
}
/**
@@ -96,10 +92,8 @@ public Matrix3x2d(Matrix2fc mat) {
* the {@link Matrix3x2dc} to copy the values from
*/
public Matrix3x2d(Matrix3x2dc mat) {
- if (mat instanceof Matrix3x2d) {
- MemUtil.INSTANCE.copy((Matrix3x2d) mat, this);
- } else {
- setMatrix3x2dc(mat);
+ if (mat != this) {
+ MemUtil.INSTANCE.copy(mat, this);
}
}
@@ -242,23 +236,11 @@ Matrix3x2d _m21(double m21) {
* @return this
*/
public Matrix3x2d set(Matrix3x2dc m) {
- if (m == this)
- return this;
- else if (m instanceof Matrix3x2d) {
- MemUtil.INSTANCE.copy((Matrix3x2d) m, this);
- } else {
- setMatrix3x2dc(m);
+ if (m != this) {
+ MemUtil.INSTANCE.copy(m, this);
}
return this;
}
- private void setMatrix3x2dc(Matrix3x2dc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- m20 = mat.m20();
- m21 = mat.m21();
- }
/**
* Set the left 2x2 submatrix of this {@link Matrix3x2d} to the given {@link Matrix2dc} and don't change the other elements.
@@ -268,19 +250,9 @@ private void setMatrix3x2dc(Matrix3x2dc mat) {
* @return this
*/
public Matrix3x2d set(Matrix2dc m) {
- if (m instanceof Matrix2d) {
- MemUtil.INSTANCE.copy((Matrix2d) m, this);
- } else {
- setMatrix2dc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix2dc(Matrix2dc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Set the left 2x2 submatrix of this {@link Matrix3x2d} to the given {@link Matrix2fc} and don't change the other elements.
diff --git a/src/main/java/org/joml/Matrix3x2f.java b/src/main/java/org/joml/Matrix3x2f.java
index 2d3c6719..5e589fb1 100644
--- a/src/main/java/org/joml/Matrix3x2f.java
+++ b/src/main/java/org/joml/Matrix3x2f.java
@@ -66,10 +66,8 @@ public Matrix3x2f() {
* the {@link Matrix3x2fc} to copy the values from
*/
public Matrix3x2f(Matrix3x2fc mat) {
- if (mat instanceof Matrix3x2f) {
- MemUtil.INSTANCE.copy((Matrix3x2f) mat, this);
- } else {
- setMatrix3x2fc(mat);
+ if (mat != this) {
+ MemUtil.INSTANCE.copy(mat, this);
}
}
@@ -81,11 +79,7 @@ public Matrix3x2f(Matrix3x2fc mat) {
* the {@link Matrix2fc}
*/
public Matrix3x2f(Matrix2fc mat) {
- if (mat instanceof Matrix2f) {
- MemUtil.INSTANCE.copy((Matrix2f) mat, this);
- } else {
- setMatrix2fc(mat);
- }
+ MemUtil.INSTANCE.copy(mat, this);
}
/**
@@ -227,12 +221,8 @@ Matrix3x2f _m21(float m21) {
* @return this
*/
public Matrix3x2f set(Matrix3x2fc m) {
- if (m == this)
- return this;
- else if (m instanceof Matrix3x2f) {
- MemUtil.INSTANCE.copy((Matrix3x2f) m, this);
- } else {
- setMatrix3x2fc(m);
+ if (m != this) {
+ MemUtil.INSTANCE.copy(m, this);
}
return this;
}
@@ -253,19 +243,9 @@ private void setMatrix3x2fc(Matrix3x2fc mat) {
* @return this
*/
public Matrix3x2f set(Matrix2fc m) {
- if (m instanceof Matrix2f) {
- MemUtil.INSTANCE.copy((Matrix2f) m, this);
- } else {
- setMatrix2fc(m);
- }
+ MemUtil.INSTANCE.copy(m, this);
return this;
}
- private void setMatrix2fc(Matrix2fc mat) {
- m00 = mat.m00();
- m01 = mat.m01();
- m10 = mat.m10();
- m11 = mat.m11();
- }
/**
* Multiply this matrix by the supplied right
matrix by assuming a third row in
diff --git a/src/main/java/org/joml/Matrix4f.java b/src/main/java/org/joml/Matrix4f.java
index f061d6c2..116acf3b 100644
--- a/src/main/java/org/joml/Matrix4f.java
+++ b/src/main/java/org/joml/Matrix4f.java
@@ -1075,16 +1075,16 @@ public Matrix4f set(Quaterniondc q) {
}
/**
- * Set the upper left 3x3 submatrix of this {@link Matrix4f} to that of the given {@link Matrix4f}
+ * Set the upper left 3x3 submatrix of this {@link Matrix4f} to that of the given {@link Matrix4fc}
* and don't change the other elements.
*
* @param mat
- * the {@link Matrix4f}
+ * the {@link Matrix4fc}
* @return this
*/
- public Matrix4f set3x3(Matrix4f mat) {
+ public Matrix4f set3x3(Matrix4fc mat) {
MemUtil.INSTANCE.copy3x3(mat, this);
- return _properties(properties & mat.properties & ~(PROPERTY_PERSPECTIVE));
+ return _properties(properties & mat.properties() & ~(PROPERTY_PERSPECTIVE));
}
@@ -1116,16 +1116,16 @@ public Matrix4f set4x3(Matrix4x3fc mat) {
}
/**
- * Set the upper 4x3 submatrix of this {@link Matrix4f} to the upper 4x3 submatrix of the given {@link Matrix4f}
+ * Set the upper 4x3 submatrix of this {@link Matrix4f} to the upper 4x3 submatrix of the given {@link Matrix4fc}
* and don't change the other elements.
*
* @param mat
- * the {@link Matrix4f}
+ * the {@link Matrix4fc}
* @return this
*/
- public Matrix4f set4x3(Matrix4f mat) {
+ public Matrix4f set4x3(Matrix4fc mat) {
MemUtil.INSTANCE.copy4x3(mat, this);
- return _properties(properties & mat.properties & ~(PROPERTY_PERSPECTIVE));
+ return _properties(properties & mat.properties() & ~(PROPERTY_PERSPECTIVE));
}
/**
@@ -12731,10 +12731,10 @@ public Matrix4f setRowColumn(int row, int column, float value) {
*
* Please note that, if this
is an orthogonal matrix or a matrix whose columns are orthogonal vectors,
* then this method need not be invoked, since in that case this
itself is its normal matrix.
- * In that case, use {@link #set3x3(Matrix4f)} to set a given Matrix4f to only the upper left 3x3 submatrix
+ * In that case, use {@link #set3x3(Matrix4fc)} to set a given Matrix4f to only the upper left 3x3 submatrix
* of this matrix.
*
- * @see #set3x3(Matrix4f)
+ * @see #set3x3(Matrix4fc)
*
* @return this
*/
@@ -12751,10 +12751,10 @@ public Matrix4f normal() {
*
* Please note that, if this
is an orthogonal matrix or a matrix whose columns are orthogonal vectors,
* then this method need not be invoked, since in that case this
itself is its normal matrix.
- * In that case, use {@link #set3x3(Matrix4f)} to set a given Matrix4f to only the upper left 3x3 submatrix
+ * In that case, use {@link #set3x3(Matrix4fc)} to set a given Matrix4f to only the upper left 3x3 submatrix
* of this matrix.
*
- * @see #set3x3(Matrix4f)
+ * @see #set3x3(Matrix4fc)
*
* @param dest
* will hold the result
diff --git a/src/main/java/org/joml/Matrix4x3f.java b/src/main/java/org/joml/Matrix4x3f.java
index 4d77db92..03f3c348 100644
--- a/src/main/java/org/joml/Matrix4x3f.java
+++ b/src/main/java/org/joml/Matrix4x3f.java
@@ -3109,25 +3109,10 @@ public Matrix4x3f translationRotateInvert(Vector3fc translation,
* @return this
*/
public Matrix4x3f set3x3(Matrix3fc mat) {
- if (mat instanceof Matrix3f) {
- MemUtil.INSTANCE.copy3x3((Matrix3f) mat, this);
- } else {
- set3x3Matrix3fc(mat);
- }
+ MemUtil.INSTANCE.copy3x3(mat, this);
properties = PROPERTY_UNKNOWN;
return this;
}
- private void set3x3Matrix3fc(Matrix3fc 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();
- }
public Vector4f transform(Vector4f v) {
return v.mul(this);
diff --git a/src/main/java/org/joml/MemUtil.java b/src/main/java/org/joml/MemUtil.java
index eb427c18..24d8feb1 100644
--- a/src/main/java/org/joml/MemUtil.java
+++ b/src/main/java/org/joml/MemUtil.java
@@ -242,32 +242,32 @@ else if (Options.NO_UNSAFE)
public abstract Vector4f getColumn(Matrix4f m, int column, Vector4f dest);
public abstract Matrix4f setColumn(Vector4f v, int column, Matrix4f dest);
public abstract Matrix4f setColumn(Vector4fc v, int column, Matrix4f dest);
- public abstract void copy(Matrix4f src, Matrix4f dest);
- public abstract void copy(Matrix4x3f src, Matrix4x3f dest);
- public abstract void copy(Matrix4f src, Matrix4x3f dest);
- public abstract void copy(Matrix4x3f src, Matrix4f dest);
- public abstract void copy(Matrix3f src, Matrix3f dest);
- public abstract void copy(Matrix3f src, Matrix4f dest);
- public abstract void copy(Matrix4f src, Matrix3f dest);
- public abstract void copy(Matrix3f src, Matrix4x3f dest);
- public abstract void copy(Matrix3x2f src, Matrix3x2f dest);
- public abstract void copy(Matrix3x2d src, Matrix3x2d dest);
- public abstract void copy(Matrix2f src, Matrix2f dest);
- public abstract void copy(Matrix2d src, Matrix2d dest);
- public abstract void copy(Matrix2f src, Matrix3f dest);
- public abstract void copy(Matrix3f src, Matrix2f dest);
- public abstract void copy(Matrix2f src, Matrix3x2f dest);
- public abstract void copy(Matrix3x2f src, Matrix2f dest);
- public abstract void copy(Matrix2d src, Matrix3d dest);
- public abstract void copy(Matrix3d src, Matrix2d dest);
- public abstract void copy(Matrix2d src, Matrix3x2d dest);
- public abstract void copy(Matrix3x2d src, Matrix2d 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(Matrix4fc src, Matrix4f dest);
+ public abstract void copy(Matrix4x3fc src, Matrix4x3f dest);
+ public abstract void copy(Matrix4fc src, Matrix4x3f dest);
+ public abstract void copy(Matrix4x3fc src, Matrix4f dest);
+ public abstract void copy(Matrix3fc src, Matrix3f dest);
+ public abstract void copy(Matrix3fc src, Matrix4f dest);
+ public abstract void copy(Matrix4fc src, Matrix3f dest);
+ public abstract void copy(Matrix3fc src, Matrix4x3f dest);
+ public abstract void copy(Matrix3x2fc src, Matrix3x2f dest);
+ public abstract void copy(Matrix3x2dc src, Matrix3x2d dest);
+ public abstract void copy(Matrix2fc src, Matrix2f dest);
+ public abstract void copy(Matrix2dc src, Matrix2d dest);
+ public abstract void copy(Matrix2fc src, Matrix3f dest);
+ public abstract void copy(Matrix3fc src, Matrix2f dest);
+ public abstract void copy(Matrix2fc src, Matrix3x2f dest);
+ public abstract void copy(Matrix3x2fc src, Matrix2f dest);
+ public abstract void copy(Matrix2dc src, Matrix3d dest);
+ public abstract void copy(Matrix3dc src, Matrix2d dest);
+ public abstract void copy(Matrix2dc src, Matrix3x2d dest);
+ public abstract void copy(Matrix3x2dc src, Matrix2d dest);
+ public abstract void copy3x3(Matrix4fc src, Matrix4f dest);
+ public abstract void copy3x3(Matrix4x3fc src, Matrix4x3f dest);
+ public abstract void copy3x3(Matrix3fc src, Matrix4x3f dest);
+ public abstract void copy3x3(Matrix3fc src, Matrix4f dest);
+ public abstract void copy4x3(Matrix4fc src, Matrix4f dest);
+ public abstract void copy4x3(Matrix4x3fc src, Matrix4f dest);
public abstract void copy(float[] arr, int off, Matrix4f dest);
public abstract void copyTransposed(float[] arr, int off, Matrix4f dest);
public abstract void copy(float[] arr, int off, Matrix3f dest);
@@ -277,20 +277,20 @@ else if (Options.NO_UNSAFE)
public abstract void copy(float[] arr, int off, Matrix3x2d dest);
public abstract void copy(float[] arr, int off, Matrix2f dest);
public abstract void copy(double[] arr, int off, Matrix2d dest);
- public abstract void copy(Matrix4f src, float[] dest, int off);
- public abstract void copy(Matrix3f src, float[] dest, int off);
- public abstract void copy(Matrix4x3f src, float[] dest, int off);
- public abstract void copy(Matrix3x2f src, float[] dest, int off);
- public abstract void copy(Matrix3x2d src, double[] dest, int off);
- public abstract void copy(Matrix2f src, float[] dest, int off);
- public abstract void copy(Matrix2d src, double[] dest, int off);
- public abstract void copy4x4(Matrix4x3f src, float[] dest, int off);
- public abstract void copy4x4(Matrix4x3d src, float[] dest, int off);
- public abstract void copy4x4(Matrix4x3d src, double[] dest, int off);
- public abstract void copy4x4(Matrix3x2f src, float[] dest, int off);
- public abstract void copy4x4(Matrix3x2d src, double[] dest, int off);
- public abstract void copy3x3(Matrix3x2f src, float[] dest, int off);
- public abstract void copy3x3(Matrix3x2d src, double[] dest, int off);
+ public abstract void copy(Matrix4fc src, float[] dest, int off);
+ public abstract void copy(Matrix3fc src, float[] dest, int off);
+ public abstract void copy(Matrix4x3fc src, float[] dest, int off);
+ public abstract void copy(Matrix3x2fc src, float[] dest, int off);
+ public abstract void copy(Matrix3x2dc src, double[] dest, int off);
+ public abstract void copy(Matrix2fc src, float[] dest, int off);
+ public abstract void copy(Matrix2dc src, double[] dest, int off);
+ public abstract void copy4x4(Matrix4x3fc src, float[] dest, int off);
+ public abstract void copy4x4(Matrix4x3dc src, float[] dest, int off);
+ public abstract void copy4x4(Matrix4x3dc src, double[] dest, int off);
+ public abstract void copy4x4(Matrix3x2fc src, float[] dest, int off);
+ public abstract void copy4x4(Matrix3x2dc src, double[] dest, int off);
+ public abstract void copy3x3(Matrix3x2fc src, float[] dest, int off);
+ public abstract void copy3x3(Matrix3x2dc src, double[] dest, int off);
public abstract void identity(Matrix4f dest);
public abstract void identity(Matrix4x3f dest);
public abstract void identity(Matrix3f dest);
@@ -2936,7 +2936,7 @@ public Matrix4f setColumn(Vector4fc v, int column, Matrix4f dest) {
}
}
- public void copy(Matrix4f src, Matrix4f dest) {
+ public void copy(Matrix4fc src, Matrix4f dest) {
dest._m00(src.m00()).
_m01(src.m01()).
_m02(src.m02()).
@@ -2955,7 +2955,7 @@ public void copy(Matrix4f src, Matrix4f dest) {
_m33(src.m33());
}
- public void copy(Matrix3f src, Matrix4f dest) {
+ public void copy(Matrix3fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -2974,7 +2974,7 @@ public void copy(Matrix3f src, Matrix4f dest) {
._m33(1.0f);
}
- public void copy(Matrix4f src, Matrix3f dest) {
+ public void copy(Matrix4fc src, Matrix3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -2986,7 +2986,7 @@ public void copy(Matrix4f src, Matrix3f dest) {
._m22(src.m22());
}
- public void copy(Matrix3f src, Matrix4x3f dest) {
+ public void copy(Matrix3fc src, Matrix4x3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3001,7 +3001,7 @@ public void copy(Matrix3f src, Matrix4x3f dest) {
._m32(0.0f);
}
- public void copy(Matrix3x2f src, Matrix3x2f dest) {
+ public void copy(Matrix3x2fc src, Matrix3x2f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
@@ -3010,7 +3010,7 @@ public void copy(Matrix3x2f src, Matrix3x2f dest) {
._m21(src.m21());
}
- public void copy(Matrix3x2d src, Matrix3x2d dest) {
+ public void copy(Matrix3x2dc src, Matrix3x2d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
@@ -3019,21 +3019,21 @@ public void copy(Matrix3x2d src, Matrix3x2d dest) {
._m21(src.m21());
}
- public void copy(Matrix2f src, Matrix2f dest) {
+ public void copy(Matrix2fc src, Matrix2f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy(Matrix2d src, Matrix2d dest) {
+ public void copy(Matrix2dc src, Matrix2d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy(Matrix2f src, Matrix3f dest) {
+ public void copy(Matrix2fc src, Matrix3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(0.0f)
@@ -3045,14 +3045,14 @@ public void copy(Matrix2f src, Matrix3f dest) {
._m22(1.0f);
}
- public void copy(Matrix3f src, Matrix2f dest) {
+ public void copy(Matrix3fc src, Matrix2f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy(Matrix2f src, Matrix3x2f dest) {
+ public void copy(Matrix2fc src, Matrix3x2f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
@@ -3061,14 +3061,14 @@ public void copy(Matrix2f src, Matrix3x2f dest) {
._m21(0.0f);
}
- public void copy(Matrix3x2f src, Matrix2f dest) {
+ public void copy(Matrix3x2fc src, Matrix2f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy(Matrix2d src, Matrix3d dest) {
+ public void copy(Matrix2dc src, Matrix3d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(0.0)
@@ -3080,14 +3080,14 @@ public void copy(Matrix2d src, Matrix3d dest) {
._m22(1.0);
}
- public void copy(Matrix3d src, Matrix2d dest) {
+ public void copy(Matrix3dc src, Matrix2d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy(Matrix2d src, Matrix3x2d dest) {
+ public void copy(Matrix2dc src, Matrix3x2d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
@@ -3096,14 +3096,14 @@ public void copy(Matrix2d src, Matrix3x2d dest) {
._m21(0.0);
}
- public void copy(Matrix3x2d src, Matrix2d dest) {
+ public void copy(Matrix3x2dc src, Matrix2d dest) {
dest._m00(src.m00())
._m01(src.m01())
._m10(src.m10())
._m11(src.m11());
}
- public void copy3x3(Matrix4f src, Matrix4f dest) {
+ public void copy3x3(Matrix4fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3115,7 +3115,7 @@ public void copy3x3(Matrix4f src, Matrix4f dest) {
._m22(src.m22());
}
- public void copy3x3(Matrix4x3f src, Matrix4x3f dest) {
+ public void copy3x3(Matrix4x3fc src, Matrix4x3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3127,7 +3127,7 @@ public void copy3x3(Matrix4x3f src, Matrix4x3f dest) {
._m22(src.m22());
}
- public void copy3x3(Matrix3f src, Matrix4x3f dest) {
+ public void copy3x3(Matrix3fc src, Matrix4x3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3139,7 +3139,7 @@ public void copy3x3(Matrix3f src, Matrix4x3f dest) {
._m22(src.m22());
}
- public void copy3x3(Matrix3f src, Matrix4f dest) {
+ public void copy3x3(Matrix3fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3151,7 +3151,7 @@ public void copy3x3(Matrix3f src, Matrix4f dest) {
._m22(src.m22());
}
- public void copy4x3(Matrix4x3f src, Matrix4f dest) {
+ public void copy4x3(Matrix4x3fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3166,7 +3166,7 @@ public void copy4x3(Matrix4x3f src, Matrix4f dest) {
._m32(src.m32());
}
- public void copy4x3(Matrix4f src, Matrix4f dest) {
+ public void copy4x3(Matrix4fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3181,7 +3181,7 @@ public void copy4x3(Matrix4f src, Matrix4f dest) {
._m32(src.m32());
}
- public void copy(Matrix4f src, Matrix4x3f dest) {
+ public void copy(Matrix4fc src, Matrix4x3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3196,7 +3196,7 @@ public void copy(Matrix4f src, Matrix4x3f dest) {
._m32(src.m32());
}
- public void copy(Matrix4x3f src, Matrix4f dest) {
+ public void copy(Matrix4x3fc src, Matrix4f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3215,7 +3215,7 @@ public void copy(Matrix4x3f src, Matrix4f dest) {
._m33(1.0f);
}
- public void copy(Matrix4x3f src, Matrix4x3f dest) {
+ public void copy(Matrix4x3fc src, Matrix4x3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3230,7 +3230,7 @@ public void copy(Matrix4x3f src, Matrix4x3f dest) {
._m32(src.m32());
}
- public void copy(Matrix3f src, Matrix3f dest) {
+ public void copy(Matrix3fc src, Matrix3f dest) {
dest._m00(src.m00())
._m01(src.m01())
._m02(src.m02())
@@ -3348,7 +3348,7 @@ public void copy(double[] arr, int off, Matrix2d dest) {
._m11(arr[off+3]);
}
- public void copy(Matrix4f src, float[] dest, int off) {
+ public void copy(Matrix4fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m02();
@@ -3367,7 +3367,7 @@ public void copy(Matrix4f src, float[] dest, int off) {
dest[off+15] = src.m33();
}
- public void copy(Matrix3f src, float[] dest, int off) {
+ public void copy(Matrix3fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m02();
@@ -3379,7 +3379,7 @@ public void copy(Matrix3f src, float[] dest, int off) {
dest[off+8] = src.m22();
}
- public void copy(Matrix4x3f src, float[] dest, int off) {
+ public void copy(Matrix4x3fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m02();
@@ -3394,7 +3394,7 @@ public void copy(Matrix4x3f src, float[] dest, int off) {
dest[off+11] = src.m32();
}
- public void copy(Matrix3x2f src, float[] dest, int off) {
+ public void copy(Matrix3x2fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m10();
@@ -3403,7 +3403,7 @@ public void copy(Matrix3x2f src, float[] dest, int off) {
dest[off+5] = src.m21();
}
- public void copy(Matrix3x2d src, double[] dest, int off) {
+ public void copy(Matrix3x2dc src, double[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m10();
@@ -3412,21 +3412,21 @@ public void copy(Matrix3x2d src, double[] dest, int off) {
dest[off+5] = src.m21();
}
- public void copy(Matrix2f src, float[] dest, int off) {
+ public void copy(Matrix2fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m10();
dest[off+3] = src.m11();
}
- public void copy(Matrix2d src, double[] dest, int off) {
+ public void copy(Matrix2dc src, double[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m10();
dest[off+3] = src.m11();
}
- public void copy4x4(Matrix4x3f src, float[] dest, int off) {
+ public void copy4x4(Matrix4x3fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m02();
@@ -3445,7 +3445,7 @@ public void copy4x4(Matrix4x3f src, float[] dest, int off) {
dest[off+15] = 1.0f;
}
- public void copy4x4(Matrix4x3d src, float[] dest, int off) {
+ public void copy4x4(Matrix4x3dc src, float[] dest, int off) {
dest[off+0] = (float) src.m00();
dest[off+1] = (float) src.m01();
dest[off+2] = (float) src.m02();
@@ -3464,7 +3464,7 @@ public void copy4x4(Matrix4x3d src, float[] dest, int off) {
dest[off+15] = 1.0f;
}
- public void copy4x4(Matrix4x3d src, double[] dest, int off) {
+ public void copy4x4(Matrix4x3dc src, double[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = src.m02();
@@ -3483,7 +3483,7 @@ public void copy4x4(Matrix4x3d src, double[] dest, int off) {
dest[off+15] = 1.0;
}
- public void copy3x3(Matrix3x2f src, float[] dest, int off) {
+ public void copy3x3(Matrix3x2fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = 0.0f;
@@ -3495,7 +3495,7 @@ public void copy3x3(Matrix3x2f src, float[] dest, int off) {
dest[off+8] = 1.0f;
}
- public void copy3x3(Matrix3x2d src, double[] dest, int off) {
+ public void copy3x3(Matrix3x2dc src, double[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = 0.0;
@@ -3507,7 +3507,7 @@ public void copy3x3(Matrix3x2d src, double[] dest, int off) {
dest[off+8] = 1.0;
}
- public void copy4x4(Matrix3x2f src, float[] dest, int off) {
+ public void copy4x4(Matrix3x2fc src, float[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = 0.0f;
@@ -3526,7 +3526,7 @@ public void copy4x4(Matrix3x2f src, float[] dest, int off) {
dest[off+15] = 1.0f;
}
- public void copy4x4(Matrix3x2d src, double[] dest, int off) {
+ public void copy4x4(Matrix3x2dc src, double[] dest, int off) {
dest[off+0] = src.m00();
dest[off+1] = src.m01();
dest[off+2] = 0.0;