From 5f81f863fd56e2c2b7a7cd75e908b1b8675d5fa4 Mon Sep 17 00:00:00 2001 From: itycodes Date: Mon, 12 May 2025 22:50:55 +0200 Subject: [PATCH] WIP: Working for some reason --- shaders/chunk.frag | 5 +++-- shaders/cube.frag | 1 + shaders/skybox.frag | 2 +- src/render/chunk.rs | 2 +- src/render/cube.rs | 2 +- src/render/in_world.rs | 2 +- src/render/skybox.rs | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/shaders/chunk.frag b/shaders/chunk.frag index 5bcacaa..25d753e 100644 --- a/shaders/chunk.frag +++ b/shaders/chunk.frag @@ -14,12 +14,13 @@ layout(push_constant, std430) uniform pc { }; void main() { - outColor = vec4(vec3(pos_post.z / pos_post.w), 1.0); +//outColor = vec4(vec3(1.0), 1.0); //if(pos_post.z <= 0.0) { // outColor = vec4(1.0); //} //outColor = normal.xyz; - //outColor = vec4(vec3(1.0-gl_FragCoord.z), 1.0); + outColor = vec4(data.rgb*(1.0+dot(normal.xyz, normalize(vec3(-0.7, -0.5, -0.1))))/2.0, 1.0); //gl_FragDepth = pos_post.z / pos_post.w; + //gl_FragDepth = gl_FragCoord.z; } diff --git a/shaders/cube.frag b/shaders/cube.frag index e9aeb79..2d6a2c5 100644 --- a/shaders/cube.frag +++ b/shaders/cube.frag @@ -26,4 +26,5 @@ void main() { //outColor = normal.xyz; //outColor = vec4(vec3(1.0-gl_FragCoord.z), 1.0); //gl_FragDepth = pos_post.z / pos_post.w; + //gl_FragDepth = gl_FragCoord.z; } diff --git a/shaders/skybox.frag b/shaders/skybox.frag index 91cd42d..45d9233 100644 --- a/shaders/skybox.frag +++ b/shaders/skybox.frag @@ -9,5 +9,5 @@ layout(location = 0) in vec4 pos_pre; void main() { outColor = texture(combined_image, vec3(pos_pre)); - gl_FragDepth = 0.99; + gl_FragDepth = 0.001; } diff --git a/src/render/chunk.rs b/src/render/chunk.rs index 8517ef6..7fac356 100644 --- a/src/render/chunk.rs +++ b/src/render/chunk.rs @@ -221,7 +221,7 @@ fn setup_pipeline( let depth_stencil = vk::PipelineDepthStencilStateCreateInfo::default() .depth_test_enable(true) .depth_write_enable(true) - .depth_compare_op(vk::CompareOp::LESS) + .depth_compare_op(vk::CompareOp::GREATER) .depth_bounds_test_enable(false) .stencil_test_enable(false) .min_depth_bounds(0.0) diff --git a/src/render/cube.rs b/src/render/cube.rs index d34a994..250e275 100644 --- a/src/render/cube.rs +++ b/src/render/cube.rs @@ -344,7 +344,7 @@ fn setup_pipeline( let depth_stencil = vk::PipelineDepthStencilStateCreateInfo::default() .depth_test_enable(true) .depth_write_enable(true) - .depth_compare_op(vk::CompareOp::LESS) + .depth_compare_op(vk::CompareOp::GREATER) .depth_bounds_test_enable(false) .stencil_test_enable(false) .min_depth_bounds(0.0) diff --git a/src/render/in_world.rs b/src/render/in_world.rs index 78d66c5..eda255d 100644 --- a/src/render/in_world.rs +++ b/src/render/in_world.rs @@ -131,7 +131,7 @@ impl Game { }, vk::ClearValue { depth_stencil: vk::ClearDepthStencilValue { - depth: 1.0, + depth: 0.0, stencil: 0, }, }, diff --git a/src/render/skybox.rs b/src/render/skybox.rs index f133845..43853a4 100644 --- a/src/render/skybox.rs +++ b/src/render/skybox.rs @@ -252,7 +252,7 @@ fn setup_pipeline( let depth_stencil = vk::PipelineDepthStencilStateCreateInfo::default() .depth_test_enable(true) .depth_write_enable(true) - .depth_compare_op(vk::CompareOp::LESS) + .depth_compare_op(vk::CompareOp::GREATER) .depth_bounds_test_enable(true) .stencil_test_enable(false) .min_depth_bounds(0.0)