From 93a615e900902cefe43b1f6f35b29f0c9b675013 Mon Sep 17 00:00:00 2001 From: Kovak Date: Wed, 19 Jul 2023 14:46:05 -0700 Subject: [PATCH] Add a config option to restore the calculate all normals behavior in case some setups require old broken behavior. (#9670) --- .../net/minecraftforge/client/ForgeHooksClient.java | 2 +- .../java/net/minecraftforge/common/ForgeConfig.java | 12 ++++++++++++ src/main/resources/assets/forge/lang/en_us.json | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index eaa2bc39c5..235e1b55d1 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -512,7 +512,7 @@ public class ForgeHooksClient public static void fillNormal(int[] faceData, Direction facing, boolean calculateNormals) { Vector3f v2; - if (calculateNormals) { + if (calculateNormals || ForgeConfig.CLIENT.calculateAllNormals.get()) { Vector3f v1 = getVertexPos(faceData, 3); Vector3f t1 = getVertexPos(faceData, 1); v2 = getVertexPos(faceData, 2); diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index 9607f01993..0944705bb0 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -106,8 +106,11 @@ public class ForgeConfig { @Deprecated(since = "1.20.1", forRemoval = true) // Config option ignored. public final BooleanValue compressLanIPv6Addresses; + public final BooleanValue calculateAllNormals; + public final BooleanValue stabilizeDirectionGetNearest; + Client(ForgeConfigSpec.Builder builder) { builder.comment("Client only settings, mostly things related to rendering") .push("client"); @@ -139,6 +142,15 @@ public class ForgeConfig { .translation("forge.configgui.compressLanIPv6Addresses") .define("compressLanIPv6Addresses", true); + calculateAllNormals = builder + .comment("During block model baking, manually calculates the normal for all faces.", + "This was the default behavior of forge between versions 31.0 and 47.1.", + "May result in differences between vanilla rendering and forge rendering.", + "Will only produce differences for blocks that contain non-axis aligned faces.", + "You will need to reload your resources to see results.") + .translation("forge.configgui.calculateAllNormals") + .define("calculateAllNormals", false); + stabilizeDirectionGetNearest = builder .comment("When enabled, a slightly biased Direction#getNearest calculation will be used to prevent normal fighting on 45 degree angle faces.") .translation("forge.configgui.stabilizeDirectionGetNearest") diff --git a/src/main/resources/assets/forge/lang/en_us.json b/src/main/resources/assets/forge/lang/en_us.json index 23ddc25608..f49962e808 100644 --- a/src/main/resources/assets/forge/lang/en_us.json +++ b/src/main/resources/assets/forge/lang/en_us.json @@ -195,6 +195,8 @@ "forge.configgui.indexVanillaPackCachesOnThread": "Index vanilla resource packs on thread", "forge.configgui.indexModPackCachesOnThread.tooltip": "Set this to true to index mod resource and data packs on thread", "forge.configgui.indexModPackCachesOnThread": "Index mod resource packs on thread", + "forge.configgui.calculateAllNormals": "Calculate All Normals", + "forge.configgui.calculateAllNormals.tooltip": "During block model baking, manually calculates the normal for all faces. You will need to reload your resources to see results.", "forge.configgui.stabilizeDirectionGetNearest": "Stabilize Direction Get Nearest", "forge.configgui.stabilizeDirectionGetNearest.tooltip": "When enabled, a slightly biased Direction#getNearest calculation will be used to prevent normal fighting on 45 degree angle faces.",