From 4e908b5b156e338f18589d20574ddc654d1bea97 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 10 Mar 2026 17:20:19 -0500 Subject: [PATCH] Make render interfaces consistent --- .../core/api/internal/ClientApi.java | 8 +++++--- .../core/render/renderer/LodRenderer.java | 14 ++++---------- .../render/renderPass/IDhFogRenderer.java | 4 ++-- .../render/renderPass/IDhMetaRenderer.java | 2 +- .../render/renderPass/IDhSsaoRenderer.java | 3 ++- .../render/renderPass/IDhTestTriangleRenderer.java | 3 ++- .../render/renderPass/IDhVanillaFadeRenderer.java | 3 ++- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java index de413fa23..4d2be380d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java @@ -633,7 +633,7 @@ public class ClientApi // for setup on some APIs (IE openGL) metaRenderer.runRenderPassSetup(renderParams); - testRenderer.render(); + testRenderer.render(renderParams); metaRenderer.runRenderPassCleanup(renderParams); } @@ -695,7 +695,8 @@ public class ClientApi // don't fade when Iris shaders are active, otherwise the rendering can get weird && !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering()) { - fadeRenderer.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.clientLevelWrapper); + RenderParams renderParams = new RenderParams(EDhApiRenderPass.OPAQUE, RENDER_STATE); + fadeRenderer.render(renderParams); } } /** @@ -725,7 +726,8 @@ public class ClientApi && !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering(); if (renderFade) { - fadeRenderer.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.clientLevelWrapper); + RenderParams renderParams = new RenderParams(EDhApiRenderPass.TRANSPARENT, RENDER_STATE); + fadeRenderer.render(renderParams); } } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java index 750c3a0ad..63c7e5675 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java @@ -215,7 +215,7 @@ public class LodRenderer if (Config.Client.Advanced.Graphics.Ssao.enableSsao.get()) { profiler.popPush("LOD SSAO"); - this.ssaoRenderer.render(renderParams.dhProjectionMatrix); + this.ssaoRenderer.render(renderParams); } // custom objects without SSAO @@ -248,10 +248,7 @@ public class LodRenderer { profiler.popPush("LOD Fog"); - Mat4f combinedMatrix = new Mat4f(renderParams.dhProjectionMatrix); - combinedMatrix.multiply(renderParams.dhModelViewMatrix); - - this.fogRenderer.render(combinedMatrix, renderParams.partialTicks); + this.fogRenderer.render(renderParams); } @@ -278,7 +275,7 @@ public class LodRenderer if (!cancelApplyShader) { profiler.popPush("Apply to MC"); - this.metaRenderer.applyToMcTexture(); + this.metaRenderer.applyToMcTexture(renderParams); } } @@ -300,10 +297,7 @@ public class LodRenderer { profiler.popPush("LOD Fog"); - Mat4f combinedMatrix = new Mat4f(renderParams.dhProjectionMatrix); - combinedMatrix.multiply(renderParams.dhModelViewMatrix); - - this.fogRenderer.render(combinedMatrix, renderParams.partialTicks); + this.fogRenderer.render(renderParams); } } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhFogRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhFogRenderer.java index ec978c782..f3420ab9a 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhFogRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhFogRenderer.java @@ -19,12 +19,12 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass; -import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; +import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; public interface IDhFogRenderer extends IBindable { - void render(DhApiMat4f modelViewProjectionMatrix, float partialTicks); + void render(RenderParams renderParams); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhMetaRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhMetaRenderer.java index fd471a312..9bae6f931 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhMetaRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhMetaRenderer.java @@ -11,7 +11,7 @@ public interface IDhMetaRenderer extends IBindable { void runRenderPassSetup(RenderParams renderParams); void runRenderPassCleanup(RenderParams renderParams); - void applyToMcTexture(); + void applyToMcTexture(RenderParams renderParams); void clearDhDepthAndColorTextures(RenderParams renderParams); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhSsaoRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhSsaoRenderer.java index 8eed4daca..f51e0e5ee 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhSsaoRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhSsaoRenderer.java @@ -20,11 +20,12 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass; import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; +import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; public interface IDhSsaoRenderer extends IBindable { - void render(DhApiMat4f dhProjectionMatrix); + void render(RenderParams renderParams); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhTestTriangleRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhTestTriangleRenderer.java index 29eac010e..ea2392432 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhTestTriangleRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhTestTriangleRenderer.java @@ -19,11 +19,12 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass; +import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; public interface IDhTestTriangleRenderer extends IBindable { - void render(); + void render(RenderParams renderParams); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhVanillaFadeRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhVanillaFadeRenderer.java index 1e13f0301..7bb325a0c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhVanillaFadeRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/renderPass/IDhVanillaFadeRenderer.java @@ -19,6 +19,7 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass; +import com.seibel.distanthorizons.core.render.RenderParams; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; @@ -26,6 +27,6 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab public interface IDhVanillaFadeRenderer extends IBindable { - void render(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, IClientLevelWrapper level); + void render(RenderParams renderParams); }