Correctly handle colorization on NeoForge

CaffeineMC · Sep 14, 2024 · 152f499 · 152f499
1 parent b758900
commit 152f499
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/...main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java b/...main/java/net/caffeinemc/mods/sodium/client/render/immediate/model/BakedModelEncoder.java
@@ -7,6 +7,7 @@
 import net.caffeinemc.mods.sodium.api.util.ColorU8;
 import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
 import net.caffeinemc.mods.sodium.api.vertex.format.common.EntityVertex;
+import net.caffeinemc.mods.sodium.client.render.frapi.helper.ColorHelper;
 import net.caffeinemc.mods.sodium.client.services.PlatformRuntimeInformation;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
@@ -23,7 +24,7 @@ private static int mergeLighting(int stored, int calculated) {
 
     private static final boolean MULTIPLY_ALPHA = PlatformRuntimeInformation.getInstance().usesAlphaMultiplication();
 
-    public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose matrices, ModelQuadView quad, int color, int light, int overlay) {
+    public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose matrices, ModelQuadView quad, int color, int light, int overlay, boolean colorize) {
         Matrix3f matNormal = matrices.normal();
         Matrix4f matPosition = matrices.pose();
 
@@ -39,6 +40,12 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m
 
                 int newLight = mergeLighting(quad.getLight(i), light);
 
+                int newColor = color;
+
+                if (colorize) {
+                    newColor = ColorHelper.multiplyColor(newColor, quad.getColor(i));
+                }
+
                 // The packed transformed normal vector
                 int normal = MatrixHelper.transformNormal(matNormal, matrices.trustedNormals, quad.getAccurateNormal(i));
 
@@ -47,7 +54,7 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m
                 float yt = MatrixHelper.transformPositionY(matPosition, x, y, z);
                 float zt = MatrixHelper.transformPositionZ(matPosition, x, y, z);
 
-                EntityVertex.write(ptr, xt, yt, zt, color, quad.getTexU(i), quad.getTexV(i), overlay, newLight, normal);
+                EntityVertex.write(ptr, xt, yt, zt, newColor, quad.getTexU(i), quad.getTexV(i), overlay, newLight, normal);
                 ptr += EntityVertex.STRIDE;
             }
 
@@ -116,4 +123,8 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m
             writer.push(stack, buffer, 4, EntityVertex.FORMAT);
         }
     }
+
+    public static boolean shouldMultiplyAlpha() {
+        return MULTIPLY_ALPHA;
+    }
 }
diff --git a/.../sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java b/.../sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java
@@ -39,7 +39,7 @@ public void putBulkData(PoseStack.Pose matrices, BakedQuad bakedQuad, float r, f
         ModelQuadView quad = (ModelQuadView) bakedQuad;
 
         int color = ColorABGR.pack(r, g, b, a);
-        BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
+        BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay, false);
 
         SpriteUtil.markSpriteActive(quad.getSprite());
     }

diff --git a/...n/java/net/caffeinemc/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java b/...n/java/net/caffeinemc/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java
@@ -92,7 +92,7 @@ private void renderBakedItemQuads(PoseStack.Pose matrices, VertexBufferWriter wr
                 color = ColorARGB.toABGR((colorProvider.getColor(itemStack, quad.getColorIndex())));
             }
 
-            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
+            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay, BakedModelEncoder.shouldMultiplyAlpha());
 
             SpriteUtil.markSpriteActive(quad.getSprite());
         }

diff --git a/...feinemc/mods/sodium/mixin/fabric/features/render/model/block/ModelBlockRendererMixin.java b/...feinemc/mods/sodium/mixin/fabric/features/render/model/block/ModelBlockRendererMixin.java
@@ -44,7 +44,7 @@ private static void renderQuads(PoseStack.Pose matrices, VertexBufferWriter writ
 
             int color = quad.hasColor() ? defaultColor : 0xFFFFFFFF;
 
-            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
+            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay, false);
 
             SpriteUtil.markSpriteActive(quad.getSprite());
         }

diff --git a/...inemc/mods/sodium/neoforge/mixin/features/render/model/block/ModelBlockRendererMixin.java b/...inemc/mods/sodium/neoforge/mixin/features/render/model/block/ModelBlockRendererMixin.java
@@ -46,7 +46,7 @@ private static void renderQuads(PoseStack.Pose matrices, VertexBufferWriter writ
 
             int color = quad.hasColor() ? defaultColor : 0xFFFFFFFF;
 
-            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
+            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay, false);
 
             SpriteUtil.markSpriteActive(quad.getSprite());
         }