diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java index 4a4f4b04b..1d65a5e9a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java @@ -57,7 +57,7 @@ public class GlDhApplyShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/shared/gl/apply.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java index 83e30f08e..306959f43 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java @@ -59,7 +59,7 @@ public class GlDhFarFadeApplyShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/fade/gl/apply.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java index ae9a511ff..d2cbda827 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java @@ -69,8 +69,8 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", - "assets/distanthorizons/shaders/fade/gl/dhFade.frag", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", + "assets/distanthorizons/shaders/fade/gl/dh_fade.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java index 15a1ba43c..9ad70522b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java @@ -77,8 +77,8 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", - "assets/distanthorizons/shaders/fade/gl/vanillaFade.frag", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", + "assets/distanthorizons/shaders/fade/gl/vanilla_fade.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java index affbce795..b62fc058f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogApplyShader.java @@ -57,7 +57,7 @@ public class GlDhFogApplyShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/fog/gl/apply.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java index 05efafdfb..ec9af37e4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java @@ -109,7 +109,7 @@ public class GlDhFogShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/fog/gl/fog.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java index d12663de2..f85924273 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOApplyShader.java @@ -62,7 +62,7 @@ public class GlDhSSAOApplyShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/ssao/gl/apply.frag", "vPosition" ); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java index 77cd454af..5d006cbf6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/ssao/GlDhSSAOShader.java @@ -70,7 +70,7 @@ public class GlDhSSAOShader extends GlAbstractShaderRenderer public void onInit() { this.shader = new GlShaderProgram( - "assets/distanthorizons/shaders/shared/gl/quadApply.vert", + "assets/distanthorizons/shaders/shared/gl/quad_apply.vert", "assets/distanthorizons/shaders/ssao/gl/ao.frag", "vPosition" ); diff --git a/coreSubProjects b/coreSubProjects index b9984c772..5933ef824 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit b9984c7723695b74e67298b117e71e84590c9679 +Subproject commit 5933ef82458c45e9dd896aa60e7a9064b895ee36