Merge branch '1.19.3/dev' into 1.19.4/dev

gradle.properties

@@ -9,6 +9,6 @@ loader_version=0.14.19
 fabric_version=0.79.0+1.19.4
 
 # Mod Properties
-mod_version=0.4.10
+mod_version=0.4.11
 maven_group=me.jellysquid.mods
 archives_base_name=sodium-fabric

src/api/java/net/caffeinemc/mods/sodium/api/util/ColorU8.java

@@ -36,6 +36,15 @@ static int normalizedFloatToByte(float value) {
      * @return The floating point value of the integer component in the range of 0.0..1.0
      */
     static float byteToNormalizedFloat(byte value) {
+        return (float) Byte.toUnsignedInt(value) * COMPONENT_RANGE_INVERSE;
+    }
+
+    /**
+     * Converts an integer component to a normalized floating point value.
+     * @param value The integer component in 0..255 range
+     * @return The floating point value of the integer component in the range of 0.0..1.0
+     */
+    static float byteToNormalizedFloat(int value) {
         return (float) value * COMPONENT_RANGE_INVERSE;
     }
 }

src/main/java/me/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderData.java

@@ -4,7 +4,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import me.jellysquid.mods.sodium.client.render.chunk.RenderSectionFlags;
 import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
-import me.jellysquid.mods.sodium.client.render.texture.SpriteExtended;
+import me.jellysquid.mods.sodium.client.render.texture.SpriteContentsExtended;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.render.chunk.ChunkOcclusionData;
 import net.minecraft.client.texture.Sprite;
@@ -98,7 +98,7 @@ public void setOcclusionData(ChunkOcclusionData data) {
          * @param sprite The sprite
          */
         public void addSprite(Sprite sprite) {
-            if (((SpriteExtended) sprite.getContents()).hasAnimation()) {
+            if (((SpriteContentsExtended) sprite.getContents()).hasAnimation()) {
                 this.animatedSprites.add(sprite);
             }
         }

src/main/java/me/jellysquid/mods/sodium/client/render/immediate/model/BakedModelEncoder.java

@@ -1,17 +1,19 @@
 package me.jellysquid.mods.sodium.client.render.immediate.model;
 
 import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
-import net.caffeinemc.mods.sodium.api.vertex.format.common.ModelVertex;
 import net.caffeinemc.mods.sodium.api.math.MatrixHelper;
 import net.caffeinemc.mods.sodium.api.render.immediate.RenderImmediate;
+import net.caffeinemc.mods.sodium.api.util.ColorABGR;
+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.ModelVertex;
 import net.minecraft.client.util.math.MatrixStack;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
 import org.lwjgl.system.MemoryStack;
 
 public class BakedModelEncoder {
-    public static void writeQuadVertices(VertexBufferWriter writer, MatrixStack.Entry matrices, ModelQuadView quad, int light, int overlay, int color) {
+    public static void writeQuadVertices(VertexBufferWriter writer, MatrixStack.Entry matrices, ModelQuadView quad, int color, int light, int overlay) {
         Matrix3f matNormal = matrices.getNormalMatrix();
         Matrix4f matPosition = matrices.getPositionMatrix();
 
@@ -40,4 +42,58 @@ public static void writeQuadVertices(VertexBufferWriter writer, MatrixStack.Entr
             writer.push(stack, buffer, 4, ModelVertex.FORMAT);
         }
     }
+
+    public static void writeQuadVertices(VertexBufferWriter writer, MatrixStack.Entry matrices, ModelQuadView quad, float r, float g, float b, float[] brightnessTable, boolean colorize, int[] light, int overlay) {
+        Matrix3f matNormal = matrices.getNormalMatrix();
+        Matrix4f matPosition = matrices.getPositionMatrix();
+
+        try (MemoryStack stack = RenderImmediate.VERTEX_DATA.push()) {
+            long buffer = stack.nmalloc(4 * ModelVertex.STRIDE);
+            long ptr = buffer;
+
+            // The packed transformed normal vector
+            var normal = MatrixHelper.transformNormal(matNormal, quad.getNormal());
+
+            for (int i = 0; i < 4; i++) {
+                // The position vector
+                float x = quad.getX(i);
+                float y = quad.getY(i);
+                float z = quad.getZ(i);
+
+                // The transformed position vector
+                float xt = MatrixHelper.transformPositionX(matPosition, x, y, z);
+                float yt = MatrixHelper.transformPositionY(matPosition, x, y, z);
+                float zt = MatrixHelper.transformPositionZ(matPosition, x, y, z);
+
+                float fR;
+                float fG;
+                float fB;
+
+                float brightness = brightnessTable[i];
+
+                if (colorize) {
+                    int color = quad.getColor(i);
+
+                    float oR = ColorU8.byteToNormalizedFloat(ColorABGR.unpackRed(color));
+                    float oG = ColorU8.byteToNormalizedFloat(ColorABGR.unpackGreen(color));
+                    float oB = ColorU8.byteToNormalizedFloat(ColorABGR.unpackBlue(color));
+
+                    fR = oR * brightness * r;
+                    fG = oG * brightness * g;
+                    fB = oB * brightness * b;
+                } else {
+                    fR = brightness * r;
+                    fG = brightness * g;
+                    fB = brightness * b;
+                }
+
+                int color = ColorABGR.pack(fR, fG, fB, 1.0F);
+
+                ModelVertex.write(ptr, xt, yt, zt, color, quad.getTexU(i), quad.getTexV(i), overlay, light[i], normal);
+                ptr += ModelVertex.STRIDE;
+            }
+
+            writer.push(stack, buffer, 4, ModelVertex.FORMAT);
+        }
+    }
 }

src/main/java/me/jellysquid/mods/sodium/client/render/texture/SpriteExtended.java → src/main/java/me/jellysquid/mods/sodium/client/render/texture/SpriteContentsExtended.java

@@ -1,6 +1,6 @@
 package me.jellysquid.mods.sodium.client.render.texture;
 
-public interface SpriteExtended {
+public interface SpriteContentsExtended {
     void setActive(boolean b);
 
     boolean hasAnimation();

src/main/java/me/jellysquid/mods/sodium/client/render/texture/SpriteUtil.java

@@ -4,8 +4,8 @@
 
 public class SpriteUtil {
     public static void markSpriteActive(Sprite sprite) {
-        if (sprite.getContents() instanceof SpriteExtended) {
-            ((SpriteExtended) sprite.getContents()).setActive(true);
+        if (sprite.getContents() instanceof SpriteContentsExtended) {
+            ((SpriteContentsExtended) sprite.getContents()).setActive(true);
         }
     }
 }

src/main/java/me/jellysquid/mods/sodium/mixin/features/block/MixinBlockModelRenderer.java

@@ -1,11 +1,11 @@
 package me.jellysquid.mods.sodium.mixin.features.block;
 
-import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
+import me.jellysquid.mods.sodium.client.model.quad.BakedQuadView;
 import me.jellysquid.mods.sodium.client.render.immediate.model.BakedModelEncoder;
-import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
 import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
-import net.caffeinemc.mods.sodium.api.util.ColorABGR;
 import me.jellysquid.mods.sodium.common.util.DirectionUtil;
+import net.caffeinemc.mods.sodium.api.util.ColorABGR;
+import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.block.BlockModelRenderer;
@@ -18,6 +18,7 @@
 import net.minecraft.util.math.random.Random;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Unique;
 
 import java.util.List;
 
@@ -31,10 +32,10 @@ public class MixinBlockModelRenderer {
      */
     @Overwrite
     public void render(MatrixStack.Entry entry, VertexConsumer vertexConsumer, BlockState blockState, BakedModel bakedModel, float red, float green, float blue, int light, int overlay) {
-        Random random = this.random;
-
         var writer = VertexBufferWriter.of(vertexConsumer);
 
+        Random random = this.random;
+
         // Clamp color ranges
         red = MathHelper.clamp(red, 0.0F, 1.0F);
         green = MathHelper.clamp(green, 0.0F, 1.0F);
@@ -47,27 +48,28 @@ public void render(MatrixStack.Entry entry, VertexConsumer vertexConsumer, Block
             List<BakedQuad> quads = bakedModel.getQuads(blockState, direction, random);
 
             if (!quads.isEmpty()) {
-                renderQuad(entry, writer, defaultColor, quads, light, overlay);
+                renderQuads(entry, writer, defaultColor, quads, light, overlay);
             }
         }
 
         random.setSeed(42L);
         List<BakedQuad> quads = bakedModel.getQuads(blockState, null, random);
 
         if (!quads.isEmpty()) {
-            renderQuad(entry, writer, defaultColor, quads, light, overlay);
+            renderQuads(entry, writer, defaultColor, quads, light, overlay);
         }
     }
 
+    @Unique
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    private static void renderQuad(MatrixStack.Entry matrices, VertexBufferWriter writer, int defaultColor, List<BakedQuad> list, int light, int overlay) {
-        for (int j = 0; j < list.size(); j++) {
-            BakedQuad bakedQuad = list.get(j);
-            int color = bakedQuad.hasColor() ? defaultColor : 0xFFFFFFFF;
+    private static void renderQuads(MatrixStack.Entry matrices, VertexBufferWriter writer, int defaultColor, List<BakedQuad> quads, int light, int overlay) {
+        for (int i = 0; i < quads.size(); i++) {
+            BakedQuad bakedQuad = quads.get(i);
+            BakedQuadView quad = (BakedQuadView) bakedQuad;
 
-            ModelQuadView quad = ((ModelQuadView) bakedQuad);
+            int color = quad.hasColor() ? defaultColor : 0xFFFFFFFF;
 
-            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, light, overlay, color);
+            BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
 
             SpriteUtil.markSpriteActive(quad.getSprite());
         }

src/main/java/me/jellysquid/mods/sodium/mixin/features/buffer_builder/intrinsics/MixinBufferBuilder.java

@@ -1,8 +1,14 @@
 package me.jellysquid.mods.sodium.mixin.features.buffer_builder.intrinsics;
 
+import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
+import me.jellysquid.mods.sodium.client.render.immediate.model.BakedModelEncoder;
+import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
+import net.caffeinemc.mods.sodium.api.util.ColorABGR;
+import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.FixedColorVertexConsumer;
-
+import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -12,81 +18,50 @@ public abstract class MixinBufferBuilder extends FixedColorVertexConsumer {
     @Shadow
     private boolean canSkipElementChecks;
 
-//    @Override
-//    public void quad(MatrixStack.Entry matrices, BakedQuad quad, float[] brightnessTable, float r, float g, float b, int[] light, int overlay, boolean colorize) {
-//        if (!this.canSkipElementChecks) {
-//            super.quad(matrices, quad, brightnessTable, r, g, b, light, overlay, colorize);
-//
-//            return;
-//        }
-//
-//        if (this.colorFixed) {
-//            throw new IllegalStateException();
-//        }
-//
-//        ModelQuadView quadView = (ModelQuadView) quad;
-//
-//        Matrix4f positionMatrix = matrices.getPositionMatrix();
-//        Matrix3f normalMatrix = matrices.getNormalMatrix();
-//
-//        int norm = this.computeNormal(normalMatrix, quad.getFace());
-//
-//        QuadVertexSink drain = VertexDrain.of(this)
-//                .createSink(VanillaVertexTypes.QUADS);
-//        drain.ensureCapacity(4);
-//
-//        for (int i = 0; i < 4; i++) {
-//            float x = quadView.getX(i);
-//            float y = quadView.getY(i);
-//            float z = quadView.getZ(i);
-//
-//            float fR;
-//            float fG;
-//            float fB;
-//
-//            float brightness = brightnessTable[i];
-//
-//            if (colorize) {
-//                int color = quadView.getColor(i);
-//
-//                float oR = ColorU8.normalize(ColorABGR.unpackRed(color));
-//                float oG = ColorU8.normalize(ColorABGR.unpackGreen(color));
-//                float oB = ColorU8.normalize(ColorABGR.unpackBlue(color));
-//
-//                fR = oR * brightness * r;
-//                fG = oG * brightness * g;
-//                fB = oB * brightness * b;
-//            } else {
-//                fR = brightness * r;
-//                fG = brightness * g;
-//                fB = brightness * b;
-//            }
-//
-//            float u = quadView.getTexU(i);
-//            float v = quadView.getTexV(i);
-//
-//            int color = ColorABGR.pack(fR, fG, fB, 1.0F);
-//
-//            Vector4f pos = new Vector4f(x, y, z, 1.0F);
-//            positionMatrix.transform(pos);
-//
-//            drain.writeQuad(pos.x(), pos.y(), pos.z(), color, u, v, light[i], overlay, norm);
-//        }
-//
-//        drain.flush();
-//    }
-//
-//    private int computeNormal(Matrix3f normalMatrix, Direction face) {
-//        Vec3i faceNorm = face.getVector();
-//
-//        float x = faceNorm.getX();
-//        float y = faceNorm.getY();
-//        float z = faceNorm.getZ();
-//
-//        float x2 = normalMatrix.m00 * x + normalMatrix.m01 * y + normalMatrix.m02 * z;
-//        float y2 = normalMatrix.m10 * x + normalMatrix.m11 * y + normalMatrix.m12 * z;
-//        float z2 = normalMatrix.m20 * x + normalMatrix.m21 * y + normalMatrix.m22 * z;
-//
-//        return Norm3b.pack(x2, y2, z2);
-//    }
+    @Override
+    public void quad(MatrixStack.Entry matrices, BakedQuad bakedQuad, float r, float g, float b, int light, int overlay) {
+        if (!this.canSkipElementChecks) {
+            super.quad(matrices, bakedQuad, r, g, b, light, overlay);
+
+            SpriteUtil.markSpriteActive(bakedQuad.getSprite());
+
+            return;
+        }
+
+        if (this.colorFixed) {
+            throw new IllegalStateException();
+        }
+
+        VertexBufferWriter writer = VertexBufferWriter.of(this);
+
+        ModelQuadView quad = (ModelQuadView) bakedQuad;
+
+        int color = ColorABGR.pack(r, g, b, 1.0F);
+        BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);
+
+        SpriteUtil.markSpriteActive(quad.getSprite());
+    }
+
+    @Override
+    public void quad(MatrixStack.Entry matrices, BakedQuad bakedQuad, float[] brightnessTable, float r, float g, float b, int[] light, int overlay, boolean colorize) {
+        if (!this.canSkipElementChecks) {
+            super.quad(matrices, bakedQuad, brightnessTable, r, g, b, light, overlay, colorize);
+
+            SpriteUtil.markSpriteActive(bakedQuad.getSprite());
+
+            return;
+        }
+
+        if (this.colorFixed) {
+            throw new IllegalStateException();
+        }
+
+        VertexBufferWriter writer = VertexBufferWriter.of(this);
+
+        ModelQuadView quad = (ModelQuadView) bakedQuad;
+
+        BakedModelEncoder.writeQuadVertices(writer, matrices, quad, r, g, b, brightnessTable, colorize, light, overlay);
+
+        SpriteUtil.markSpriteActive(quad.getSprite());
+    }
 }