Check if current element is Normal before doing any injections + rename

Dev0Louis · May 23, 2022 · dc9f29c · dc9f29c
1 parent a4905a4
commit dc9f29c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/net/coderbot/iris/mixin/vertices/MixinBufferBuilder.java b/src/main/java/net/coderbot/iris/mixin/vertices/MixinBufferBuilder.java
@@ -12,7 +12,6 @@
 import net.coderbot.iris.vertices.ExtendingBufferBuilder;
 import net.coderbot.iris.vertices.IrisVertexFormats;
 import net.coderbot.iris.vertices.NormalHelper;
-import net.minecraft.client.renderer.texture.OverlayTexture;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Mixin;
@@ -42,7 +41,7 @@ public abstract class MixinBufferBuilder implements BufferVertexConsumer, BlockS
 	private final Vector3f normal = new Vector3f();
 
 	@Unique
-	private boolean injectOverlayAndNormal;
+	private boolean injectNormal;
 
 	@Unique
 	private short currentBlock;
@@ -95,7 +94,7 @@ public abstract class MixinBufferBuilder implements BufferVertexConsumer, BlockS
 		vertexCount = 0;
 
 		if (extending) {
-			injectOverlayAndNormal = format == DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP;
+			injectNormal = format == DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP;
 		}
 	}
 
@@ -131,7 +130,7 @@ public abstract class MixinBufferBuilder implements BufferVertexConsumer, BlockS
 			return;
 		}
 
-		if (injectOverlayAndNormal) {
+		if (injectNormal && currentElement.getUsage() == VertexFormatElement.Usage.NORMAL) {
 			this.putInt(0, 0);
 			this.nextElement();
 		}