From 836ea74c4cd0b88f07c2f342185869469e2f26a4 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Thu, 13 Jun 2024 09:03:20 -0700 Subject: [PATCH] 0.5.9 --- .../copyEntity/shadows/EntityRenderDispatcherMixin.java | 2 +- .../sodium/mixin/vertex_format/entity/MixinModelVertex.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java index 6530f58bf3..5e6f873275 100644 --- a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java +++ b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java @@ -100,7 +100,7 @@ private static void renderShadowPart(PoseStack.Pose matrices, VertexBufferWriter var matPosition = matrices.pose(); var color = ColorABGR.withAlpha(SHADOW_COLOR, alpha); - var normal = MatrixHelper.transformNormal(matNormal, Direction.UP); + var normal = MatrixHelper.transformNormal(matNormal, true, Direction.UP); try (MemoryStack stack = MemoryStack.stackPush()) { long buffer = stack.nmalloc(4 * ModelVertex.STRIDE); diff --git a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/vertex_format/entity/MixinModelVertex.java b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/vertex_format/entity/MixinModelVertex.java index a08c5e8fb9..d2dceb73cb 100644 --- a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/vertex_format/entity/MixinModelVertex.java +++ b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/vertex_format/entity/MixinModelVertex.java @@ -35,7 +35,7 @@ private static void redirect2(VertexBufferWriter writer, PoseStack.Pose matrices * @reason Rewrite */ @Overwrite - public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose matrices, ModelQuadView quad, float r, float g, float b, float[] brightnessTable, boolean colorize, int[] light, int overlay) { + public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose matrices, ModelQuadView quad, float r, float g, float b, float a, float[] brightnessTable, boolean colorize, int[] light, int overlay) { Matrix3f matNormal = matrices.normal(); Matrix4f matPosition = matrices.pose(); MemoryStack stack = MemoryStack.stackPush(); @@ -43,7 +43,7 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m try { long buffer = stack.nmalloc(144); long ptr = buffer; - int normal = MatrixHelper.transformNormal(matNormal, quad.getLightFace()); + int normal = MatrixHelper.transformNormal(matNormal, true, quad.getLightFace()); for (int i = 0; i < 4; ++i) { float x = quad.getX(i); @@ -71,7 +71,7 @@ public static void writeQuadVertices(VertexBufferWriter writer, PoseStack.Pose m fB = brightness * b; } - color = ColorABGR.pack(fR, fG, fB, 1.0F); + color = ColorABGR.pack(fR, fG, fB, a); ModelVertex.write(ptr, xt, yt, zt, color, quad.getTexU(i), quad.getTexV(i), overlay, light[i], normal); ptr += 36L; }