From d8a1bd3ec6b8a02a44ffe8bdc694d46908a02fd0 Mon Sep 17 00:00:00 2001 From: Tae Lim Kook Date: Thu, 26 Dec 2019 07:36:42 -0500 Subject: [PATCH] Quick Matrix{3,4}f and Rotation3 fixes (#1025) * Rename Gson fields in some classes to GSON * Quick Matrix{3,4}f and Rotation3 fixes --- .../client/util/math/Matrix3f.mapping | 11 +++++++++++ .../client/util/math/Matrix4f.mapping | 8 ++++++++ .../client/util/math/Rotation3.mapping | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/mappings/net/minecraft/client/util/math/Matrix3f.mapping b/mappings/net/minecraft/client/util/math/Matrix3f.mapping index b5d2bdceb2..12c35daf5d 100644 --- a/mappings/net/minecraft/client/util/math/Matrix3f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix3f.mapping @@ -17,8 +17,13 @@ CLASS net/minecraft/class_4581 net/minecraft/client/util/math/Matrix3f METHOD (Lnet/minecraft/class_4581;)V ARG 1 source METHOD method_22847 transpose ()V + METHOD method_22849 getSinAndCosOfRotation (FFF)Lcom/mojang/datafixers/util/Pair; + ARG 0 upperLeft + ARG 1 diagonalAverage + ARG 2 lowerRight METHOD method_22852 load (Lnet/minecraft/class_4581;)V ARG 1 source + METHOD method_22853 decomposeLinearTransformation ()Lorg/apache/commons/lang3/tuple/Triple; METHOD method_22855 multiply (Lnet/minecraft/class_4581;)V ARG 1 other METHOD method_22856 loadIdentity ()V @@ -26,3 +31,9 @@ CLASS net/minecraft/class_4581 net/minecraft/client/util/math/Matrix3f METHOD method_23296 copy ()Lnet/minecraft/class_4581; METHOD method_23729 multiply (F)V ARG 1 scalar + METHOD method_23731 determinantAndAdjugate ()F + METHOD method_23732 invert ()Z + METHOD method_23963 scale (FFF)Lnet/minecraft/class_4581; + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/client/util/math/Matrix4f.mapping b/mappings/net/minecraft/client/util/math/Matrix4f.mapping index 20fd9287aa..4aeb5d1c5f 100644 --- a/mappings/net/minecraft/client/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix4f.mapping @@ -34,9 +34,17 @@ CLASS net/minecraft/class_1159 net/minecraft/client/util/math/Matrix4f METHOD method_22868 determinantAndAdjugate ()F METHOD method_22870 invert ()Z METHOD method_22871 transpose ()V + METHOD method_24019 scale (FFF)Lnet/minecraft/class_1159; + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_24020 pack (II)I ARG 0 x ARG 1 y + METHOD method_24021 translate (FFF)Lnet/minecraft/class_1159; + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_4929 viewboxMatrix (DFFF)Lnet/minecraft/class_1159; ARG 0 fov ARG 2 aspectRatio diff --git a/mappings/net/minecraft/client/util/math/Rotation3.mapping b/mappings/net/minecraft/client/util/math/Rotation3.mapping index d8cb2b14a9..d016dc3ce7 100644 --- a/mappings/net/minecraft/client/util/math/Rotation3.mapping +++ b/mappings/net/minecraft/client/util/math/Rotation3.mapping @@ -1,11 +1,29 @@ CLASS net/minecraft/class_4590 net/minecraft/client/util/math/Rotation3 FIELD field_20900 matrix Lnet/minecraft/class_1159; FIELD field_20901 initialized Z + FIELD field_20902 translation Lnet/minecraft/class_1160; + FIELD field_20903 rotation2 Lnet/minecraft/class_1158; + FIELD field_20904 scale Lnet/minecraft/class_1160; + FIELD field_20905 rotation1 Lnet/minecraft/class_1158; FIELD field_20906 IDENTITY Lnet/minecraft/class_4590; + METHOD (Lnet/minecraft/class_1159;)V + ARG 1 transformation + METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)V + ARG 1 translation + ARG 2 rotation2 + ARG 3 scale + ARG 4 rotation1 METHOD method_22931 identity ()Lnet/minecraft/class_4590; + METHOD method_22932 getLinearTransformationAndTranslationFromAffine (Lnet/minecraft/class_1159;)Lcom/mojang/datafixers/util/Pair; + ARG 0 affineTransform METHOD method_22933 multiply (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; ARG 1 other METHOD method_22934 setup (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)Lnet/minecraft/class_1159; + ARG 0 translation + ARG 1 rotation2 + ARG 2 scale + ARG 3 rotation1 METHOD method_22935 invert ()Lnet/minecraft/class_4590; METHOD method_22936 getMatrix ()Lnet/minecraft/class_1159; + METHOD method_22937 getRotation2 ()Lnet/minecraft/class_1158; METHOD method_22938 init ()V