diff --git a/core/src/main/resources/assets/distanthorizons/shaders/apply/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/apply/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/apply/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/apply/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/copy/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/copy/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/copy/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/copy/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/debug/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/debug/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/debug/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/debug/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fade/dh_fade.fsh b/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/dh_fade.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/fade/dh_fade.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/dh_fade.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fade/vanilla_fade.fsh b/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vanilla_fade.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/fade/vanilla_fade.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vanilla_fade.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fade/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/fade/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fog/apply.fsh b/core/src/main/resources/assets/distanthorizons/shaders/fog/apply.fsh deleted file mode 100644 index c9316b8ee..000000000 --- a/core/src/main/resources/assets/distanthorizons/shaders/fog/apply.fsh +++ /dev/null @@ -1,27 +0,0 @@ -#version 150 core - -in vec2 TexCoord; - -out vec4 fragColor; - -uniform sampler2D uColorTexture; -uniform sampler2D uDhDepthTexture; - - -/** - * Fog application shader - * - * This merges the rendered fog onto DH's rendered LODs - */ -void main() -{ - fragColor = vec4(0.0); - - // a fragment depth of "1" means the fragment wasn't drawn to, - // only update fragments that were drawn to - float fragmentDepth = textureLod(uDhDepthTexture, TexCoord, 0).r; - if (fragmentDepth != 1) - { - fragColor = texture(uColorTexture, TexCoord); - } -} diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fog/fog.fsh b/core/src/main/resources/assets/distanthorizons/shaders/fog/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/fog/fog.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/fog/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fog/quad_apply.vsh b/core/src/main/resources/assets/distanthorizons/shaders/fog/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/fog/quad_apply.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/fog/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/generic/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/generic/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/generic/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/generic/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/lod/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/lod/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/lod/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/lod/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/ssao/apply.fsh b/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/apply.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/ssao/apply.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/apply.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/ssao/ao.fsh b/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/ssao/ao.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/quadApply.vsh b/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/quadApply.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/vert.vsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/ssao/quad_apply.vsh b/core/src/main/resources/assets/distanthorizons/shaders/ssao/quad_apply.vsh deleted file mode 100644 index 3f614c123..000000000 --- a/core/src/main/resources/assets/distanthorizons/shaders/ssao/quad_apply.vsh +++ /dev/null @@ -1,15 +0,0 @@ -#version 150 core - -in vec2 vPosition; - -out vec2 TexCoord; - -/** - * This is specifically used by application shaders. - * IE post process or pixel transfer shaders, anything that is rendered using a single rectangle. - */ -void main() -{ - gl_Position = vec4(vPosition, 1.0, 1.0); - TexCoord = vPosition.xy * 0.5 + 0.5; -} \ No newline at end of file diff --git a/core/src/main/resources/assets/distanthorizons/shaders/test/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/test/frag.fsh rename to core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh diff --git a/core/src/main/resources/assets/distanthorizons/shaders/test/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/vert.vsh similarity index 100% rename from core/src/main/resources/assets/distanthorizons/shaders/test/vert.vsh rename to core/src/main/resources/assets/distanthorizons/shaders/test/blaze/vert.vsh