From 84d1298e1808a15dd8f2b2bd739d719fa43e3302 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 09:57:43 -0500 Subject: [PATCH] move blaze shader files --- .../common/render/blaze/McDebugObjectRenderer.java | 4 ++-- .../common/render/blaze/McGenericObjectRenderer.java | 4 ++-- .../distanthorizons/common/render/blaze/McLodRenderer.java | 6 +++--- .../common/render/blaze/apply/McCopyRenderer.java | 4 ++-- .../render/blaze/postProcessing/McFarFadeRenderer.java | 4 ++-- .../common/render/blaze/postProcessing/McFogRenderer.java | 6 +++--- .../common/render/blaze/postProcessing/McSsaoRenderer.java | 6 +++--- .../render/blaze/postProcessing/McVanillaFadeRenderer.java | 4 ++-- .../common/render/blaze/test/DhTestRenderer.java | 4 ++-- coreSubProjects | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java index 0fc2019a3..2967fe271 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java @@ -159,8 +159,8 @@ public class McDebugObjectRenderer implements IMcDebugRenderer pipelineBuilder.withPolygonMode(PolygonMode.WIREFRAME); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:debug_renderer")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/frag")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/blaze/frag")); pipelineBuilder.withUniform("uniformBlock", UniformType.UNIFORM_BUFFER); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java index 9e1ce1dea..748102a0d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java @@ -151,8 +151,8 @@ public class McGenericObjectRenderer implements IMcGenericRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:generic")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/frag")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/blaze/frag")); pipelineBuilder.withSampler("uLightMap"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java index dcf096a61..0993b4ec8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java @@ -108,7 +108,7 @@ public class McLodRenderer implements IMcLodRenderer this.applyRenderer = new DhApplyRenderer( "dh_apply_to_mc", null, - "apply/vert", "apply/frag" + "apply/blaze/vert", "apply/blaze/frag" ); @@ -121,8 +121,8 @@ public class McLodRenderer implements IMcLodRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:lod_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/frag")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/blaze/frag")); pipelineBuilder.withSampler("uLightMap"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java index 433c11b30..b53364e30 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java @@ -96,8 +96,8 @@ public class McCopyRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:copy_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/frag")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/blaze/frag")); pipelineBuilder.withSampler("uCopyTexture"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java index a05cac1b6..1e61939e0 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java @@ -116,8 +116,8 @@ public class McFarFadeRenderer implements IMcFarFadeRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:far_fade")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/dh_fade")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/dh_fade")); pipelineBuilder.withSampler("uMcColorTexture"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java index 81e762ec8..428bde0c7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java @@ -118,7 +118,7 @@ public class McFogRenderer implements IMcFogRenderer this.applyRenderer = new DhApplyRenderer( "fog_apply_to_dh", new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA), - "apply/vert", "apply/frag" + "apply/blaze/vert", "apply/blaze/frag" ); @@ -137,8 +137,8 @@ public class McFogRenderer implements IMcFogRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:fog_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/quad_apply")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/fog")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/blaze/frag")); pipelineBuilder.withSampler("uDhDepthTexture"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java index 2bac3f00a..aed362df7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java @@ -110,7 +110,7 @@ public class McSsaoRenderer implements IMcSsaoRenderer this.applyRenderer = new DhApplyRenderer( "ssao_apply_to_dh", new BlendFunction(SourceFactor.ZERO, DestFactor.SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE), - "apply/vert", "ssao/apply", + "apply/blaze/vert", "ssao/blaze/apply", /*uniforms*/ new String[] { "applyFragUniformBlock" } ); @@ -129,8 +129,8 @@ public class McSsaoRenderer implements IMcSsaoRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:ssao_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/quad_apply")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/ao")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/blaze/frag")); pipelineBuilder.withSampler("uDhDepthTexture"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java index f45e4e38d..08aca0595 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java @@ -118,8 +118,8 @@ public class McVanillaFadeRenderer implements IMcVanillaFadeRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:mc_vanilla_fade_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/vanilla_fade")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vanilla_fade")); pipelineBuilder.withSampler("uMcDepthTexture"); pipelineBuilder.withSampler("uCombinedMcDhColorTexture"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java index 79942a9da..d15016f8d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java @@ -106,8 +106,8 @@ public class DhTestRenderer implements IMcTestRenderer pipelineBuilder.withPolygonMode(PolygonMode.FILL); pipelineBuilder.withLocation(Identifier.parse("distanthorizons:test_render")); - pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/vert")); - pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/frag")); + pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/blaze/vert")); + pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/blaze/frag")); pipelineBuilder.withVertexFormat(vertexFormat, VertexFormat.Mode.TRIANGLES); } diff --git a/coreSubProjects b/coreSubProjects index a5a9a62e8..bd833ba51 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit a5a9a62e8926be4c18049c0774c9796a31fb2d0f +Subproject commit bd833ba5106e2b1963e64c249b6e606e596d4367