Added per-vertex tangents and normals

IrisShaders · Aug 1, 2023 · dc4de9b · dc4de9b
1 parent 1ac3968
commit dc4de9b
Showing 1 changed file with 21 additions and 18 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
@@ -259,27 +259,30 @@ private void fillExtendedData(int vertexAmount) {
 			tangentOffset = 6;
 		}
 
-		int packedNormal = -1;
-		int tangent = -1;
 		if (vertexAmount == 3) {
-			// Removed to enable smooth shaded triangles. Mods rendering triangles with bad normals need to recalculate their normals manually or otherwise shading might be inconsistent.
-			// NormalHelper.computeFaceNormalTri(normal, polygon);
-			packedNormal = buffer.getInt(nextElementByte - normalOffset - stride * vertex);
-			normal.set(unpackX(packedNormal), unpackY(packedNormal), unpackZ(packedNormal));
-			tangent = NormalHelper.computeTangentSmooth(normal.x, normal.y, normal.z, polygon);
-		} else {
-			NormalHelper.computeFaceNormal(normal, polygon);
-		  packedNormal = NormalHelper.packNormal(normal, 0.0f);
-      tangent = NormalHelper.computeTangent(normal.x, normal.y, normal.z, polygon);
-		}
+			// NormalHelper.computeFaceNormalTri(normal, polygon);	// Removed to enable smooth shaded triangles. Mods rendering triangles with bad normals need to recalculate their normals manually or otherwise shading might be inconsistent.
 
-		int tangent = NormalHelper.computeTangent(normal.x, normal.y, normal.z, polygon);
+			for (int vertex = 0; vertex < vertexAmount; vertex++) {
+				int packedNormal = buffer.getInt(nextElementByte - normalOffset - stride * vertex); // retrieve per-vertex normal
+				normal.set(unpackX(packedNormal), unpackY(packedNormal), unpackZ(packedNormal));
 
-		for (int vertex = 0; vertex < vertexAmount; vertex++) {
-			buffer.putFloat(nextElementByte - midUOffset - stride * vertex, midU);
-			buffer.putFloat(nextElementByte - midVOffset - stride * vertex, midV);
-			buffer.putInt(nextElementByte - normalOffset - stride * vertex, packedNormal);
-			buffer.putInt(nextElementByte - tangentOffset - stride * vertex, tangent);
+				int tangent = NormalHelper.computeTangentSmooth(normal.x, normal.y, normal.z, polygon);
+
+				buffer.putFloat(nextElementByte - midUOffset - stride * vertex, midU);
+				buffer.putFloat(nextElementByte - midVOffset - stride * vertex, midV);
+				buffer.putInt(nextElementByte - tangentOffset - stride * vertex, tangent);
+			}
+		} else {
+			NormalHelper.computeFaceNormal(normal, polygon);
+			int packedNormal = NormalHelper.packNormal(normal, 0.0f);
+			int tangent = NormalHelper.computeTangent(normal.x, normal.y, normal.z, polygon);
+
+			for (int vertex = 0; vertex < vertexAmount; vertex++) {
+				buffer.putFloat(nextElementByte - midUOffset - stride * vertex, midU);
+				buffer.putFloat(nextElementByte - midVOffset - stride * vertex, midV);
+				buffer.putInt(nextElementByte - normalOffset - stride * vertex, packedNormal);
+				buffer.putInt(nextElementByte - tangentOffset - stride * vertex, tangent);
+			}
 		}
 	}