From 10391c48c771d5010a6de0f023ec3f9f32c9e39e Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:40:51 +1000 Subject: [PATCH] AaAaA --- .../hierachical2/HierarchicalOcclusionTraverser.java | 6 +++--- .../assets/voxy/shaders/lod/hierarchical/screenspace.glsl | 2 +- .../assets/voxy/shaders/lod/hierarchical/traversal_dev.comp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical2/HierarchicalOcclusionTraverser.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical2/HierarchicalOcclusionTraverser.java index c8d2350a..d3694d6a 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical2/HierarchicalOcclusionTraverser.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical2/HierarchicalOcclusionTraverser.java @@ -106,17 +106,17 @@ public class HierarchicalOcclusionTraverser { MemoryUtil.memPutInt(ptr, sy); ptr += 4; MemoryUtil.memPutInt(ptr, sz); ptr += 4; - MemoryUtil.memPutInt(ptr, viewport.width); ptr += 4; + MemoryUtil.memPutFloat(ptr, viewport.width); ptr += 4; var innerTranslation = new Vector3f((float) (viewport.cameraX-(sx<<5)), (float) (viewport.cameraY-(sy<<5)), (float) (viewport.cameraZ-(sz<<5))); innerTranslation.getToAddress(ptr); ptr += 4*3; - MemoryUtil.memPutInt(ptr, viewport.height); ptr += 4; + MemoryUtil.memPutFloat(ptr, viewport.height); ptr += 4; MemoryUtil.memPutInt(ptr, (int) (this.renderList.size()/4-1)); ptr += 4; //Screen space size for descending - MemoryUtil.memPutFloat(ptr, 128*128); ptr += 4; + MemoryUtil.memPutFloat(ptr, 150*150); ptr += 4; } private void bindings() { diff --git a/src/main/resources/assets/voxy/shaders/lod/hierarchical/screenspace.glsl b/src/main/resources/assets/voxy/shaders/lod/hierarchical/screenspace.glsl index 776352ab..a969f5ed 100644 --- a/src/main/resources/assets/voxy/shaders/lod/hierarchical/screenspace.glsl +++ b/src/main/resources/assets/voxy/shaders/lod/hierarchical/screenspace.glsl @@ -82,7 +82,7 @@ bool isCulledByHiz() { if (minBB.z < 0) {//Minpoint is behind the camera, its always going to pass return false; } - vec2 ssize = size.xy * vec2(ivec2(screenW, screenH)); + vec2 ssize = size.xy * vec2(screenW, screenH); float miplevel = ceil(log2(max(max(ssize.x, ssize.y),1))); vec2 midpoint = (maxBB.xy + minBB.xy)*0.5f; // printf("HiZ sample point culled: (%f,%f)@%f against %f", midpoint.x, midpoint.y, miplevel, minBB.z); diff --git a/src/main/resources/assets/voxy/shaders/lod/hierarchical/traversal_dev.comp b/src/main/resources/assets/voxy/shaders/lod/hierarchical/traversal_dev.comp index e5635e16..c3062d7a 100644 --- a/src/main/resources/assets/voxy/shaders/lod/hierarchical/traversal_dev.comp +++ b/src/main/resources/assets/voxy/shaders/lod/hierarchical/traversal_dev.comp @@ -8,9 +8,9 @@ layout(local_size_x=LOCAL_SIZE) in;//, local_size_y=1 layout(binding = SCENE_UNIFORM_BINDING, std140) uniform SceneUniform { mat4 VP; ivec3 camSecPos; - uint screenW; + float screenW; vec3 camSubSecPos; - uint screenH; + float screenH; uint renderQueueMaxSize; float minSSS; };