From d051a9d9907b05bd00df4a9be56cc2fbef36fbed Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Fri, 2 Feb 2024 20:41:43 +1000 Subject: [PATCH] Tinkering --- .../mixin/sodium/MixinOcclusionCuller.java | 2 +- .../mixin/sodium/MixinSodiumWorldRender.java | 2 +- .../assets/voxy/shaders/lod/gl46/quads.vert | 2 +- .../assets/voxy/shaders/post/ssao.comp | 19 +++++++++---------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java index b842b753..8fbf95ac 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = OcclusionCuller.class, remap = false) public class MixinOcclusionCuller { - @Redirect(method = "isOutsideRenderDistance", at = @At(value = "INVOKE", target = "Ljava/lang/Math;abs(F)F")) + @Redirect(method = "isOutsideRenderDistance", at = @At(value = "INVOKE", target = "Ljava/lang/Math;abs(F)F"), require = 0) private static float redirectAbs(float a) { return 0; } diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java index e6c97b6c..7bf9baee 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(value = SodiumWorldRenderer.class, remap = false) public class MixinSodiumWorldRender { - @Inject(method = "drawChunkLayer", at = @At("HEAD"), cancellable = true) + @Inject(method = "drawChunkLayer", at = @At("HEAD"), cancellable = true, require = 0) private void cancelRender(RenderLayer renderLayer, MatrixStack matrixStack, double x, double y, double z, CallbackInfo ci) { //ci.cancel(); } diff --git a/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert index 3421cfb4..6502cfa9 100644 --- a/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert @@ -112,7 +112,7 @@ void main() { if (face == 0) { tinting.xyz *= vec3(0.75, 0.75, 0.75); } else if (face != 1) { - tinting.xyz *= vec3((float(face-2)/4)*0.7 + 0.3); + tinting.xyz *= vec3((float(face-2)/4)*0.3 + 0.7); } diff --git a/src/main/resources/assets/voxy/shaders/post/ssao.comp b/src/main/resources/assets/voxy/shaders/post/ssao.comp index 0917f1f4..13f640e3 100644 --- a/src/main/resources/assets/voxy/shaders/post/ssao.comp +++ b/src/main/resources/assets/voxy/shaders/post/ssao.comp @@ -1,5 +1,4 @@ #version 460 -#extension GL_NV_compute_shader_derivatives : require layout(local_size_x = 32, local_size_y = 32, local_size_x = 1) in; @@ -67,23 +66,23 @@ void main() { vec3 pos = rev3d(vec3(point, depth)); //TODO: TODO: only encode the axis, then use then it as as a mask along with pos and multiply by the -sign of everything - vec3 viewNormal = vec3(uint((face>>1)==2), uint((face>>1)==0), uint((face>>1)==1)) * (float(int(face)&1)*2-1);//normalize(cross(dFdx(pos), dFdy(pos))); - //vec3 viewNormal = vec3(uint((face>>1)==2), uint((face>>1)==0), uint((face>>1)==1)) * (-sign(pos));//normalize(cross(dFdx(pos), dFdy(pos))); + vec3 viewNormal = vec3(uint((face>>1)==2), uint((face>>1)==0), uint((face>>1)==1)) * (float(int(face)&1)*2-1); + //vec3 viewNormal = vec3(uint((face>>1)==2), uint((face>>1)==0), uint((face>>1)==1)) * (-sign(pos)); float d = computeAOAngle(pos, 0.75*(1<