Fix blocks not rendering below Y 0 (i.e. In Negative bounds)

(Hopefully won't cause performance regressions due to the Int to Float Casts + Mixed Integer + Float Workloads)
xCollateral · Nov 20, 2023 · dcff864 · dcff864
1 parent ed50187
commit dcff864
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/net/vulkanmod/render/chunk/DrawBuffers.java b/src/main/java/net/vulkanmod/render/chunk/DrawBuffers.java
@@ -90,10 +90,9 @@ private AreaBuffer getAreaBuffer(TerrainRenderType r) {
     }
 
     private static int encodeSectionOffset(int xOffset, int yOffset, int zOffset) {
-        final int xOffset1 = (xOffset & 127)>>4;
-        final int zOffset1 = (zOffset & 127)>>4;
-        final int yOffset1 = yOffset >> 4;
-        return zOffset1 << 16 | yOffset1 << 8 | xOffset1;
+        final int xOffset1 = (xOffset & 127);
+        final int zOffset1 = (zOffset & 127);
+        return yOffset << 18 | zOffset1 << 9 | xOffset1;
     }
 
     private void updateChunkAreaOrigin(double camX, double camY, double camZ, VkCommandBuffer commandBuffer, long ptr) {

diff --git a/src/main/resources/assets/vulkanmod/shaders/basic/terrain/terrain.vsh b/src/main/resources/assets/vulkanmod/shaders/basic/terrain/terrain.vsh
@@ -30,11 +30,12 @@ const vec4 UNPACK_FACTOR = vec4(127.*16.);
 const vec3 POSITION_INV = vec3(1.0 / 1900.0);
 
 void main() {
-    const vec4 baseOffset = vec4(fma(Position,POSITION_INV,ChunkOffset), 1);
-    const vec4 xyz = fma(unpackSnorm4x8(gl_InstanceIndex),UNPACK_FACTOR,baseOffset);
-    gl_Position = MVP * xyz;
+    const vec3 baseOffset = bitfieldExtract(ivec3(gl_InstanceIndex)>> ivec3(0, 18, 9), 0, 9);
+    const vec3 pos = baseOffset+fma(Position, vec3(POSITION_INV), ChunkOffset);
+    const vec4 a = vec4(pos, 1);
+    gl_Position = MVP * a;
 
-    vertexDistance = length((ModelViewMat * xyz).xyz);
+    vertexDistance = length((ModelViewMat * a).xyz);
     vertexColor = Color * sample_lightmap(Sampler2, UV2);
     texCoord0 = UV0 * UV_INV;
 //    normal = MVP * vec4(Normal, 0.0);