From b00abc10ad94e60885f44dfecfcb6c516b2d706a Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sat, 3 Feb 2024 09:04:57 +1000 Subject: [PATCH] A --- gradle.properties | 2 +- .../resources/assets/voxy/shaders/lod/gl46/quads.frag | 2 +- .../resources/assets/voxy/shaders/lod/gl46/quads.vert | 8 ++++---- src/main/resources/assets/voxy/shaders/post/ssao.comp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index ff2dcb1a..85748b9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.20.4+build.1 loader_version=0.15.0 # Mod Properties -mod_version = 0.0.3-alpha +mod_version = 0.0.4-alpha maven_group = me.cortex archives_base_name = voxy diff --git a/src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag index 8fe53dbf..3b4b5f4f 100644 --- a/src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag @@ -12,7 +12,7 @@ layout(location = 4) in flat uint flags; layout(location = 0) out vec4 outColour; void main() { - vec2 uv = mod(uv, vec2(1))*(1f/(vec2(3,2)*256f)); + vec2 uv = mod(uv, vec2(1f))*(1f/(vec2(3f,2f)*256f)); vec4 colour = texture(blockModelAtlas, uv + baseUV); if ((flags&1) == 1 && colour.a <= 0.25f) { discard; 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 6502cfa9..885d9562 100644 --- a/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert @@ -102,17 +102,17 @@ void main() { tintColour = colourData[tintColour + extractBiomeId(quad)]; } tinting *= uint2vec4RGBA(tintColour).yzwx; - addin = vec4(0); + addin = vec4(0.0); if (!modelIsTranslucent(model)) { - tinting.w = 0; - addin.w = float(face|(lodLevel<<3))/255; + tinting.w = 0.0; + addin.w = float(face|(lodLevel<<3))/255.0; } //Apply face tint if (face == 0) { tinting.xyz *= vec3(0.75, 0.75, 0.75); } else if (face != 1) { - tinting.xyz *= vec3((float(face-2)/4)*0.3 + 0.7); + tinting.xyz *= vec3((float(face-2)/4.0)*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 13f640e3..b52da946 100644 --- a/src/main/resources/assets/voxy/shaders/post/ssao.comp +++ b/src/main/resources/assets/voxy/shaders/post/ssao.comp @@ -60,7 +60,7 @@ void main() { return; } vec4 colour = imageLoad(colourTex, ivec2(gl_GlobalInvocationID.xy)); - uint metadata = uint(colour.w*255); + uint metadata = uint(colour.w*255f); uint face = metadata&7; uint lod = (metadata>>3)&7; vec3 pos = rev3d(vec3(point, depth)); @@ -76,8 +76,8 @@ void main() { } vec4 ocolour = colour; - ocolour.xyz *= ((1-d)/2+0.5); - ocolour.w = 1; + ocolour.xyz *= ((1f-d)/2f+0.5f); + ocolour.w = 1f; imageStore(colourTex, ivec2(gl_GlobalInvocationID.xy), ocolour); } //vec4 ocolour = vec4(max(0, d), abs(min(0,d)), 0, 1);