Add new config setting "legacyRotationLogic", puts the new rotation logic behind setting as it caused some issues

Author: lowercasebtw

src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfig.java

@@ -36,9 +36,16 @@ public class SkyboxifyConfig extends Config {
 	public final BooleanConfigField renderStars = this.booleanFieldOf("renderStars", true);
 	public final BooleanConfigField showOverworldForUnknownDimension = this.booleanFieldOf("showOverworldForUnknownDimension", true);
 	public final BooleanConfigField debug = this.booleanFieldOf("debug", false);
+	public final BooleanConfigField legacyRotationLogic = this.booleanFieldOf("legacyRotationLogic", false);
 
 	public SkyboxifyConfig() {
 		super(Skyboxify.MOD_ID);
+		this.enabled.onValueChanged((oldVal, newVal) -> {
+			final Minecraft minecraft = Minecraft.getInstance();
+			if (minecraft != null /* It can be null, on game launch */) {
+				minecraft.reloadResourcePacks();
+			}
+		});
 	}
 
 	@Override

src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfigScreen.java

@@ -58,6 +58,7 @@ protected void init() {
 		rowHelper.addChild(skyboxifyConfig.renderSunMoon.createWidget());
 		rowHelper.addChild(skyboxifyConfig.renderStars.createWidget());
 		rowHelper.addChild(skyboxifyConfig.debug.createWidget());
+		rowHelper.addChild(skyboxifyConfig.legacyRotationLogic.createWidget());
 		layout.addToContents(gridLayout);
 
 		GridLayout footerGridLayout = new GridLayout();

src/main/java/btw/lowercase/skyboxify/skybox/SkyboxSkyRenderer.java

@@ -23,6 +23,7 @@
 
 package btw.lowercase.skyboxify.skybox;
 
+import btw.lowercase.skyboxify.Skyboxify;
 import btw.lowercase.skyboxify.mixins.RenderPipelinesAccessor;
 import btw.lowercase.skyboxify.skybox.components.UV;
 import btw.lowercase.skyboxify.utils.*;
@@ -32,7 +33,9 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
+import org.joml.AxisAngle4f;
 import org.joml.Matrix4f;
+import org.joml.Quaternionf;
 import org.joml.Vector4f;
 
 public final class SkyboxSkyRenderer {
@@ -131,7 +134,13 @@ private void renderSkyLayer(final SkyLayer skyLayer, final Matrix4f modelViewMat
         final float finalAlpha = Mth.clamp(conditionAlpha * weatherAlpha * fadeAlpha, 0.0F, 1.0F);
         if (!(finalAlpha < 1.0E-4F)) {
             if (skyLayer.rotate()) {
-				CommonUtils.rotate(modelViewMatrix, this.getAngle(level, skyAngle, skyLayer.speed()), skyLayer.axis());
+				final float angle = this.getAngle(level, skyAngle, skyLayer.speed());
+				if (Skyboxify.getConfig().debug.isEnabled() && Skyboxify.getConfig().legacyRotationLogic.isEnabled()) {
+					CommonUtils.rotate(modelViewMatrix, angle, skyLayer.axis());
+				} else {
+					// NOTE: Using `mulPose` directly gives a different result.
+					modelViewMatrix.rotate(new Quaternionf(new AxisAngle4f(angle, skyLayer.axis())));
+				}
             }
 
             //? <=1.21.4 {

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

@@ -28,9 +28,7 @@
 import lombok.experimental.UtilityClass;
 import net.minecraft.util.Mth;
 import org.joml.Matrix4f;
-import org.joml.Vector3f;
 import org.joml.Vector3fc;
-import org.joml.Vector4f;
 
 import java.util.List;
 
@@ -119,18 +117,22 @@ public static float getWeatherAlpha(List<Weather> weatherConditions, float rainS
 	// 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
-		final Vector4f q = new Vector4f(axis.mul(Mth.sin(angle * 0.5F), new Vector3f()), Mth.cos(angle * 0.5F));
+		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_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);
@@ -142,17 +144,17 @@ public static void rotate(final Matrix4f pose, final float angle, final Vector3f
 		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())
-				.m01(m_m00 * pose.m01() + m_m01 * pose.m11() + m_m02 * pose.m21())
-				.m02(m_m00 * pose.m02() + m_m01 * pose.m12() + m_m02 * pose.m22())
-				.m03(m_m00 * pose.m03() + m_m01 * pose.m13() + m_m02 * pose.m23())
-				.m10(m_m10 * pose.m00() + m_m11 * pose.m10() + m_m12 * pose.m20())
-				.m11(m_m10 * pose.m01() + m_m11 * pose.m11() + m_m12 * pose.m21())
-				.m12(m_m10 * pose.m02() + m_m11 * pose.m12() + m_m12 * pose.m22())
-				.m13(m_m10 * pose.m03() + m_m11 * pose.m13() + m_m12 * pose.m23())
-				.m20(m_m20 * pose.m00() + m_m21 * pose.m10() + m_m22 * pose.m20())
-				.m21(m_m20 * pose.m01() + m_m21 * pose.m11() + m_m22 * pose.m21())
-				.m22(m_m20 * pose.m02() + m_m21 * pose.m12() + m_m22 * pose.m22())
-				.m23(m_m20 * pose.m03() + m_m21 * pose.m13() + m_m22 * pose.m23());
+		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());
 	}
 }

src/main/resources/assets/skyboxify/lang/en_us.json

@@ -10,6 +10,8 @@
 	"options.skyboxify.renderStars.tooltip": "Enable/disable rendering of the stars.",
 	"options.skyboxify.debug": "Debug Mode",
 	"options.skyboxify.debug.tooltip": "Enable debug logging & other debugging aspects.",
+	"options.skyboxify.legacyRotationLogic": "[DM] Legacy Rotation Logic",
+	"options.skyboxify.legacyRotationLogic.tooltip": "Enables legacy rotation logic when rotating the sky from PR #24.\nNOTE: Requires \"Debug Mode\" to be on.",
 	"options.template": "%s: %s",
 	"options.on": "ON",
 	"options.off": "OFF",