From 4cbae4eb7fa8e830841416b8c9a7803abdcf443e Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Tue, 1 Jun 2021 01:20:25 +0900 Subject: [PATCH] Fix swapped names in Matrix3f and Matrix4f (#2453) * Fix swapped names in Matrix3f and Matrix4f * first -> major --- .../net/minecraft/util/math/Matrix3f.mapping | 44 +++++++++---------- .../net/minecraft/util/math/Matrix4f.mapping | 44 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/mappings/net/minecraft/util/math/Matrix3f.mapping b/mappings/net/minecraft/util/math/Matrix3f.mapping index 287bba27b3..d3c77ad1ba 100644 --- a/mappings/net/minecraft/util/math/Matrix3f.mapping +++ b/mappings/net/minecraft/util/math/Matrix3f.mapping @@ -56,50 +56,50 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f METHOD method_35260 (Lnet/minecraft/class_4581;Lnet/minecraft/class_1158;)V ARG 0 matrix ARG 1 quaternion - METHOD method_35261 readRowFirst (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in row-major order. + METHOD method_35261 readColumnMajor (Ljava/nio/FloatBuffer;)V + COMMENT Reads a matrix from the buffer in column-major order. COMMENT - COMMENT @see #readColumnFirst(FloatBuffer) + COMMENT @see #readRowMajor(FloatBuffer) COMMENT @see #read(FloatBuffer, boolean) ARG 1 buf METHOD method_35262 read (Ljava/nio/FloatBuffer;Z)V COMMENT Reads a matrix from the buffer. COMMENT - COMMENT @see #readRowFirst(FloatBuffer) - COMMENT @see #readColumnFirst(FloatBuffer) + COMMENT @see #readRowMajor(FloatBuffer) + COMMENT @see #readColumnMajor(FloatBuffer) ARG 1 buf - ARG 2 columnFirst - COMMENT {@code true} to read in column-major order; {@code false} to read in - COMMENT row-major order - METHOD method_35263 readColumnFirst (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in column-major order. + ARG 2 rowMajor + COMMENT {@code true} to read in row-major order; {@code false} to read in + COMMENT column-major order + METHOD method_35263 readRowMajor (Ljava/nio/FloatBuffer;)V + COMMENT Reads a matrix from the buffer in row-major order. COMMENT - COMMENT @see #readRowFirst(FloatBuffer) + COMMENT @see #readColumnMajor(FloatBuffer) COMMENT @see #read(FloatBuffer, boolean) ARG 1 buf METHOD method_35264 write (Ljava/nio/FloatBuffer;Z)V COMMENT Writes this matrix to the buffer. COMMENT - COMMENT @see #writeRowFirst(FloatBuffer) - COMMENT @see #writeColumnFirst(FloatBuffer) + COMMENT @see #writeRowMajor(FloatBuffer) + COMMENT @see #writeColumnMajor(FloatBuffer) ARG 1 buf - ARG 2 columnFirst - COMMENT {@code true} to write in column-major order; {@code false} to write in - COMMENT row-major order + ARG 2 rowMajor + COMMENT {@code true} to write in row-major order; {@code false} to write in + COMMENT column-major order METHOD method_35265 add (Lnet/minecraft/class_4581;)V ARG 1 matrix - METHOD method_35266 writeRowFirst (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in row-major order. + METHOD method_35266 writeColumnMajor (Ljava/nio/FloatBuffer;)V + COMMENT Writes this matrix to the buffer in column-major order. COMMENT - COMMENT @see #writeColumnFirst(FloatBuffer) + COMMENT @see #writeRowMajor(FloatBuffer) COMMENT @see #write(FloatBuffer, boolean) ARG 1 buf METHOD method_35267 subtract (Lnet/minecraft/class_4581;)V ARG 1 matrix - METHOD method_35268 writeColumnFirst (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in column-major order. + METHOD method_35268 writeRowMajor (Ljava/nio/FloatBuffer;)V + COMMENT Writes this matrix to the buffer in row-major order. COMMENT - COMMENT @see #writeRowFirst(FloatBuffer) + COMMENT @see #writeColumnMajor(FloatBuffer) COMMENT @see #write(FloatBuffer, boolean) ARG 1 buf METHOD method_35269 determinant ()F diff --git a/mappings/net/minecraft/util/math/Matrix4f.mapping b/mappings/net/minecraft/util/math/Matrix4f.mapping index 282f4b9daf..b820293c15 100644 --- a/mappings/net/minecraft/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/util/math/Matrix4f.mapping @@ -63,47 +63,47 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f ARG 5 farPlane METHOD method_35434 load (Lnet/minecraft/class_1159;)V ARG 1 source - METHOD method_35435 readRowFirst (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in row-major order. + METHOD method_35435 readColumnMajor (Ljava/nio/FloatBuffer;)V + COMMENT Reads a matrix from the buffer in column-major order. COMMENT - COMMENT @see #readColumnFirst(FloatBuffer) + COMMENT @see #readRowMajor(FloatBuffer) COMMENT @see #read(FloatBuffer, boolean) ARG 1 buf METHOD method_35436 read (Ljava/nio/FloatBuffer;Z)V COMMENT Reads a matrix from the buffer. COMMENT - COMMENT @see #readRowFirst(FloatBuffer) - COMMENT @see #readColumnFirst(FloatBuffer) + COMMENT @see #readRowMajor(FloatBuffer) + COMMENT @see #readColumnMajor(FloatBuffer) ARG 1 buf - ARG 2 columnFirst - COMMENT {@code true} to read in column-major order; {@code false} to read in - COMMENT row-major order + ARG 2 rowMajor + COMMENT {@code true} to read in row-major order; {@code false} to read in + COMMENT column-major order METHOD method_35437 isInteger (F)Z ARG 0 value - METHOD method_35438 readColumnFirst (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in column-major order. + METHOD method_35438 readRowMajor (Ljava/nio/FloatBuffer;)V + COMMENT Reads a matrix from the buffer in row-major order. COMMENT - COMMENT @see #readRowFirst(FloatBuffer) + COMMENT @see #readColumnMajor(FloatBuffer) COMMENT @see #read(FloatBuffer, boolean) ARG 1 buf METHOD method_35439 write (Ljava/nio/FloatBuffer;Z)V COMMENT Writes this matrix to the buffer. COMMENT - COMMENT @see #writeRowFirst(FloatBuffer) - COMMENT @see #writeColumnFirst(FloatBuffer) + COMMENT @see #writeRowMajor(FloatBuffer) + COMMENT @see #writeColumnMajor(FloatBuffer) ARG 1 buf - ARG 2 columnFirst - COMMENT {@code true} to write in column-major order; {@code false} to write in - COMMENT row-major order + ARG 2 rowMajor + COMMENT {@code true} to write in row-major order; {@code false} to write in + COMMENT column-major order METHOD method_35440 add (Lnet/minecraft/class_1159;)V ARG 1 matrix METHOD method_35441 determinant ()F METHOD method_35442 subtract (Lnet/minecraft/class_1159;)V ARG 1 matrix - METHOD method_35443 writeColumnFirst (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in column-major order. + METHOD method_35443 writeRowMajor (Ljava/nio/FloatBuffer;)V + COMMENT Writes this matrix to the buffer in row-major order. COMMENT - COMMENT @see #writeRowFirst(FloatBuffer) + COMMENT @see #writeColumnMajor(FloatBuffer) COMMENT @see #write(FloatBuffer, boolean) ARG 1 buf METHOD method_35444 trace ()F @@ -113,10 +113,10 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f ARG 2 aspectRatio ARG 3 cameraDepth ARG 4 viewDistance - METHOD method_4932 writeRowFirst (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in row-major order. + METHOD method_4932 writeColumnMajor (Ljava/nio/FloatBuffer;)V + COMMENT Writes this matrix to the buffer in column-major order. COMMENT - COMMENT @see #writeColumnFirst(FloatBuffer) + COMMENT @see #writeRowMajor(FloatBuffer) COMMENT @see #write(FloatBuffer, boolean) ARG 1 buf METHOD method_4933 projectionMatrix (FFFF)Lnet/minecraft/class_1159;