From 146c2e6f1ca560159a6d9a92c2c1c068cb3f7940 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sat, 5 Aug 2023 14:58:03 +0930 Subject: [PATCH] Final save commit for another attempt to fix fog, before revert. --- core/src/main/resources/shaders/fog/fog.frag | 21 +++++++------------- core/src/main/resources/shaders/ssao/ao.frag | 1 - 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/shaders/fog/fog.frag b/core/src/main/resources/shaders/fog/fog.frag index ab81122ee..d19f59906 100644 --- a/core/src/main/resources/shaders/fog/fog.frag +++ b/core/src/main/resources/shaders/fog/fog.frag @@ -1,9 +1,7 @@ in vec2 TexCoord; -in float vertexYPos; -//in uvec4 vPosition; -//in vec2 TexCoord; +//in float vertexYPos; out vec4 fragColor; @@ -82,6 +80,7 @@ vec3 calcViewPosition(vec2 coords) { * version: 2023-6-21 */ void main() { + float vertexYPos = 100f; vec3 vertexWorldPos = calcViewPosition(TexCoord); if (fullFogMode != 0) { @@ -103,20 +102,14 @@ void main() { } // Testing - if (fragColor.r != 6969.) { // This line is so that the compiler doesnt delete the previos code +// if (fragColor.r != 6969.) { // This line is so that the compiler doesnt delete the previos code // fragColor = vec4( -// mod(vertexWorldPos.x, 1), -// mod(vertexWorldPos.y, 1), -// mod(vertexWorldPos.z, 1), +// mod(texture(gDepthMap, TexCoord).x, 1), +// mod(texture(gDepthMap, TexCoord).y, 1), +// mod(texture(gDepthMap, TexCoord).z, 1), // 1. // ); -// fragColor = vec4( -// mod(vPosition.x, 1), -// mod(vPosition.y, 1), -// mod(vPosition.z, 1), -// 1. -// ); - } +// } } diff --git a/core/src/main/resources/shaders/ssao/ao.frag b/core/src/main/resources/shaders/ssao/ao.frag index d8d77ccf0..15f648764 100644 --- a/core/src/main/resources/shaders/ssao/ao.frag +++ b/core/src/main/resources/shaders/ssao/ao.frag @@ -1,7 +1,6 @@ #version 150 core in vec2 TexCoord; -in vec2 ViewRay; out vec4 fragColor;