diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java index 61b89b469..0fb5eaa28 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java @@ -52,7 +52,7 @@ public class DhApplyShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/apply.frag", "fragColor", new String[]{"vPosition"}); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhFadeShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhFadeShader.java index 065b95821..28a9fc5a7 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhFadeShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhFadeShader.java @@ -66,7 +66,7 @@ public class DhFadeShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/fade/dhFade.frag", "fragColor", new String[]{"vPosition"} diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java index b2f3bfd56..e38ec56e6 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java @@ -61,7 +61,7 @@ public class FadeApplyShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/fade/apply.frag", "fragColor", new String[]{ "vPosition" }); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogApplyShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogApplyShader.java index 2e824a5ac..04209d135 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogApplyShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogApplyShader.java @@ -57,7 +57,7 @@ public class FogApplyShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/fog/apply.frag", "fragColor", new String[]{ "vPosition" }); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java index 975b524ef..73b6899ee 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java @@ -102,7 +102,7 @@ public class FogShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", "shaders/fog/fog.frag", + "shaders/quadApply.vert", "shaders/fog/fog.frag", "fragColor", new String[]{"vPosition"} ); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOApplyShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOApplyShader.java index 7f81e21c1..fe3216160 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOApplyShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOApplyShader.java @@ -63,7 +63,7 @@ public class SSAOApplyShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/ssao/apply.frag", "fragColor", new String[]{"vPosition"}); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOShader.java index 27a85edc4..8d1a0267b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOShader.java @@ -71,7 +71,7 @@ public class SSAOShader extends AbstractShaderRenderer @Override public void onInit() { - this.shader = new ShaderProgram("shaders/normal.vert", "shaders/ssao/ao.frag", + this.shader = new ShaderProgram("shaders/quadApply.vert", "shaders/ssao/ao.frag", "fragColor", new String[]{ "vPosition" } ); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeShader.java index e7129d12e..699c989aa 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeShader.java @@ -73,7 +73,7 @@ public class VanillaFadeShader extends AbstractShaderRenderer public void onInit() { this.shader = new ShaderProgram( - "shaders/normal.vert", + "shaders/quadApply.vert", "shaders/fade/vanillaFade.frag", "fragColor", new String[]{"vPosition"} diff --git a/core/src/main/resources/shaders/normal.vert b/core/src/main/resources/shaders/quadApply.vert similarity index 82% rename from core/src/main/resources/shaders/normal.vert rename to core/src/main/resources/shaders/quadApply.vert index a7fc6cd33..3f614c123 100644 --- a/core/src/main/resources/shaders/normal.vert +++ b/core/src/main/resources/shaders/quadApply.vert @@ -7,8 +7,6 @@ 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. - * - * TODO rename this shader to better denote the above message. */ void main() {