Improve rotate code (thanks roro1506HD)

Author: lowercasebtw

src/main/java/btw/lowercase/skyboxify/utils/CommonUtils.java

@@ -27,7 +27,9 @@
 import btw.lowercase.skyboxify.skybox.components.Weather;
 import lombok.experimental.UtilityClass;
 import net.minecraft.util.Mth;
+import org.joml.AxisAngle4f;
 import org.joml.Matrix4f;
+import org.joml.Quaternionf;
 import org.joml.Vector3fc;
 
 import java.util.List;
@@ -115,46 +117,27 @@ public static float getWeatherAlpha(List<Weather> weatherConditions, float rainS
 	// This method replicates the old Mojang-made Quaternion mulPose method, which was
 	// used for the initial sky transformations which did not have any bobbing issues.
 	// See https://github.com/sp614x/optifine/issues/7235#issuecomment-1581930719
-	public static void rotate(final Matrix4f pose, final float angle, final Vector3fc axis) {
-		// Quaternion fields
-		float q_sin = Mth.sin(angle * 0.5F);
-		float q_x = axis.x() * q_sin;
-		float q_y = axis.y() * q_sin;
-		float q_z = axis.z() * q_sin;
-		float q_w = Mth.cos(angle * 0.5F);
-
-		// Matrix4f/Matrix3f fields
-		float m_xFactor = 2.0F * q_x * q_x;
-		float m_yFactor = 2.0F * q_y * q_y;
-		float m_zFactor = 2.0F * q_z * q_z;
-		float m_xy = q_x * q_y;
-		float m_yz = q_y * q_z;
-		float m_zx = q_z * q_x;
-		float m_xw = q_x * q_w;
-		float m_yw = q_y * q_w;
-		float m_zw = q_z * q_w;
-		float m_m00 = 1.0F - m_yFactor - m_zFactor;
-		float m_m01 = 2.0F * (m_xy - m_zw);
-		float m_m02 = 2.0F * (m_zx + m_yw);
-		float m_m10 = 2.0F * (m_xy + m_zw);
-		float m_m11 = 1.0F - m_zFactor - m_xFactor;
-		float m_m12 = 2.0F * (m_yz - m_xw);
-		float m_m20 = 2.0F * (m_zx - m_yw);
-		float m_m21 = 2.0F * (m_yz + m_xw);
-		float m_m22 = 1.0F - m_xFactor - m_yFactor;
-
-		// Multiply pose matrix
-		pose.m00(m_m00 * pose.m00() + m_m01 * pose.m10() + m_m02 * pose.m20());
-		pose.m01(m_m00 * pose.m01() + m_m01 * pose.m11() + m_m02 * pose.m21());
-		pose.m02(m_m00 * pose.m02() + m_m01 * pose.m12() + m_m02 * pose.m22());
-		pose.m03(m_m00 * pose.m03() + m_m01 * pose.m13() + m_m02 * pose.m23());
-		pose.m10(m_m10 * pose.m00() + m_m11 * pose.m10() + m_m12 * pose.m20());
-		pose.m11(m_m10 * pose.m01() + m_m11 * pose.m11() + m_m12 * pose.m21());
-		pose.m12(m_m10 * pose.m02() + m_m11 * pose.m12() + m_m12 * pose.m22());
-		pose.m13(m_m10 * pose.m03() + m_m11 * pose.m13() + m_m12 * pose.m23());
-		pose.m20(m_m20 * pose.m00() + m_m21 * pose.m10() + m_m22 * pose.m20());
-		pose.m21(m_m20 * pose.m01() + m_m21 * pose.m11() + m_m22 * pose.m21());
-		pose.m22(m_m20 * pose.m02() + m_m21 * pose.m12() + m_m22 * pose.m22());
-		pose.m23(m_m20 * pose.m03() + m_m21 * pose.m13() + m_m22 * pose.m23());
+	public static void rotate(final Matrix4f pose, final float angleRads, final Vector3fc axis) {
+		final Quaternionf quat = new Quaternionf(new AxisAngle4f(-angleRads, axis));
+		float qxy = quat.x * quat.y;
+		float qyz = quat.y * quat.z;
+		float qzx = quat.z * quat.x;
+		float qxw = quat.x * quat.w;
+		float qyw = quat.y * quat.w;
+		float qzw = quat.z * quat.w;
+		float j = 2.0F * quat.x * quat.x;
+		float k = 2.0F * quat.y * quat.y;
+		float l = 2.0F * quat.z * quat.z;
+		pose.mul0(new Matrix4f()
+				.m00(1.0F - k - l)
+				.m11(1.0F - l - j)
+				.m22(1.0F - j - k)
+				.m33(1.0F)
+				.m10(2.0F * (qxy + qzw))
+				.m01(2.0F * (qxy - qzw))
+				.m20(2.0F * (qzx - qyw))
+				.m02(2.0F * (qzx + qyw))
+				.m21(2.0F * (qyz + qxw))
+				.m12(2.0F * (qyz - qxw)));
 	}
 }