From 678e669d5d7da974a4afdc31d198e222d168b7d4 Mon Sep 17 00:00:00 2001 From: Uko Koknevics Date: Tue, 19 Nov 2024 01:50:17 +0200 Subject: Silence Sodium's error --- .../minecraft/shaders/core/rendertype_cutout.fsh | 33 ----------------- .../minecraft/shaders/core/rendertype_cutout.vsh | 41 ---------------------- .../shaders/core/rendertype_cutout_mipped.fsh | 33 ----------------- .../shaders/core/rendertype_cutout_mipped.vsh | 41 ---------------------- assets/minecraft/shaders/core/rendertype_solid.fsh | 33 ----------------- assets/minecraft/shaders/core/rendertype_solid.vsh | 41 ---------------------- .../shaders/core/rendertype_translucent.fsh | 30 ---------------- .../shaders/core/rendertype_translucent.vsh | 41 ---------------------- 8 files changed, 293 deletions(-) delete mode 100755 assets/minecraft/shaders/core/rendertype_cutout.fsh delete mode 100755 assets/minecraft/shaders/core/rendertype_cutout.vsh delete mode 100755 assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh delete mode 100755 assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh delete mode 100755 assets/minecraft/shaders/core/rendertype_solid.fsh delete mode 100755 assets/minecraft/shaders/core/rendertype_solid.vsh delete mode 100755 assets/minecraft/shaders/core/rendertype_translucent.fsh delete mode 100755 assets/minecraft/shaders/core/rendertype_translucent.vsh (limited to 'assets') diff --git a/assets/minecraft/shaders/core/rendertype_cutout.fsh b/assets/minecraft/shaders/core/rendertype_cutout.fsh deleted file mode 100755 index 8db7346c..00000000 --- a/assets/minecraft/shaders/core/rendertype_cutout.fsh +++ /dev/null @@ -1,33 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in float dimension; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 maxLightColor; -in vec2 texCoord0; -in vec3 faceLightingNormal; -in vec4 normal; - -out vec4 fragColor; - -void main() { - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, maxLightColor, vertexDistance, alpha) / face_lighting_check(faceLightingNormal, alpha, dimension); - color.a = remap_alpha(alpha) / 255.0; - if (color.a < 0.1) { - discard; - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout.vsh b/assets/minecraft/shaders/core/rendertype_cutout.vsh deleted file mode 100755 index 66307ce4..00000000 --- a/assets/minecraft/shaders/core/rendertype_cutout.vsh +++ /dev/null @@ -1,41 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out float dimension; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 maxLightColor; -out vec2 texCoord0; -out vec3 faceLightingNormal; -out vec4 normal; - -void main() { - vec3 pos = Position + ChunkOffset; - gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - - vertexDistance = fog_distance(ModelViewMat, pos, FogShape); - dimension = get_dimension(minecraft_sample_lightmap(Sampler2, ivec2(0.0, 0.0))); - vertexColor = Color; - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - maxLightColor = minecraft_sample_lightmap(Sampler2, ivec2(240.0, 240.0)); - texCoord0 = UV0; - faceLightingNormal = Normal; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh b/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh deleted file mode 100755 index 5f085b1e..00000000 --- a/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh +++ /dev/null @@ -1,33 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in float dimension; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 maxLightColor; -in vec2 texCoord0; -in vec3 faceLightingNormal; -in vec4 normal; - -out vec4 fragColor; - -void main() { - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, maxLightColor, vertexDistance, alpha) / face_lighting_check(faceLightingNormal, alpha, dimension); - color.a = remap_alpha(alpha) / 255.0; - if (color.a < 0.5) { - discard; - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh b/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh deleted file mode 100755 index 66307ce4..00000000 --- a/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh +++ /dev/null @@ -1,41 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out float dimension; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 maxLightColor; -out vec2 texCoord0; -out vec3 faceLightingNormal; -out vec4 normal; - -void main() { - vec3 pos = Position + ChunkOffset; - gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - - vertexDistance = fog_distance(ModelViewMat, pos, FogShape); - dimension = get_dimension(minecraft_sample_lightmap(Sampler2, ivec2(0.0, 0.0))); - vertexColor = Color; - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - maxLightColor = minecraft_sample_lightmap(Sampler2, ivec2(240.0, 240.0)); - texCoord0 = UV0; - faceLightingNormal = Normal; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); -} diff --git a/assets/minecraft/shaders/core/rendertype_solid.fsh b/assets/minecraft/shaders/core/rendertype_solid.fsh deleted file mode 100755 index d51f5041..00000000 --- a/assets/minecraft/shaders/core/rendertype_solid.fsh +++ /dev/null @@ -1,33 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in float dimension; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 maxLightColor; -in vec2 texCoord0; -in vec3 faceLightingNormal; -in vec4 normal; - -out vec4 fragColor; - -void main() { - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - if (color.a < 0.1) { - discard; - } - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, maxLightColor, vertexDistance, alpha) / face_lighting_check(faceLightingNormal, alpha, dimension); - color.a = remap_alpha(alpha) / 255.0; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_solid.vsh b/assets/minecraft/shaders/core/rendertype_solid.vsh deleted file mode 100755 index 66307ce4..00000000 --- a/assets/minecraft/shaders/core/rendertype_solid.vsh +++ /dev/null @@ -1,41 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out float dimension; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 maxLightColor; -out vec2 texCoord0; -out vec3 faceLightingNormal; -out vec4 normal; - -void main() { - vec3 pos = Position + ChunkOffset; - gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - - vertexDistance = fog_distance(ModelViewMat, pos, FogShape); - dimension = get_dimension(minecraft_sample_lightmap(Sampler2, ivec2(0.0, 0.0))); - vertexColor = Color; - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - maxLightColor = minecraft_sample_lightmap(Sampler2, ivec2(240.0, 240.0)); - texCoord0 = UV0; - faceLightingNormal = Normal; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); -} diff --git a/assets/minecraft/shaders/core/rendertype_translucent.fsh b/assets/minecraft/shaders/core/rendertype_translucent.fsh deleted file mode 100755 index 2491aecf..00000000 --- a/assets/minecraft/shaders/core/rendertype_translucent.fsh +++ /dev/null @@ -1,30 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in float dimension; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 maxLightColor; -in vec2 texCoord0; -in vec3 faceLightingNormal; -in vec4 normal; - -out vec4 fragColor; - -void main() { - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, maxLightColor, vertexDistance, alpha) / face_lighting_check(faceLightingNormal, alpha, dimension); - color.a = remap_alpha(alpha) / 255.0; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_translucent.vsh b/assets/minecraft/shaders/core/rendertype_translucent.vsh deleted file mode 100755 index 66307ce4..00000000 --- a/assets/minecraft/shaders/core/rendertype_translucent.vsh +++ /dev/null @@ -1,41 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform int FogShape; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out float dimension; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 maxLightColor; -out vec2 texCoord0; -out vec3 faceLightingNormal; -out vec4 normal; - -void main() { - vec3 pos = Position + ChunkOffset; - gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); - - vertexDistance = fog_distance(ModelViewMat, pos, FogShape); - dimension = get_dimension(minecraft_sample_lightmap(Sampler2, ivec2(0.0, 0.0))); - vertexColor = Color; - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - maxLightColor = minecraft_sample_lightmap(Sampler2, ivec2(240.0, 240.0)); - texCoord0 = UV0; - faceLightingNormal = Normal; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); -} -- cgit v1.2.3