wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename fade renderer -> Vanilla Fade renderer

Browse Source
This commit is contained in:
James Seibel
2025-10-25 09:36:11 -05:00
parent 8f99117066
commit e33fa3cb5e
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
+3 -3
View File
@@ -29,7 +29,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
import com.seibel.distanthorizons.core.pos.DhChunkPos;
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
import com.seibel.distanthorizons.core.render.renderer.VanillaFadeRenderer;
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
import com.seibel.distanthorizons.core.render.renderer.RenderParams;
import com.seibel.distanthorizons.core.util.TimerUtil;
@@ -575,7 +575,7 @@ public class ClientApi
// don't fade when Iris shaders are active, otherwise the rendering can get weird
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
{
FadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
}
}
/**
@@ -599,7 +599,7 @@ public class ClientApi
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
if (renderFade)
{
FadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
}
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/FadeRenderer.java → core/src/main/java/com/seibel/distanthorizons/core/render/renderer/VanillaFadeRenderer.java
+18 -18
View File
@@ -22,8 +22,8 @@ package com.seibel.distanthorizons.core.render.renderer;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.render.glObject.GLState;
import com.seibel.distanthorizons.core.render.renderer.shaders.FadeApplyShader;
import com.seibel.distanthorizons.core.render.renderer.shaders.FadeShader;
import com.seibel.distanthorizons.core.render.renderer.shaders.VanillaFadeApplyShader;
import com.seibel.distanthorizons.core.render.renderer.shaders.VanillaFadeShader;
import com.seibel.distanthorizons.core.util.math.Mat4f;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
@@ -36,14 +36,14 @@ import org.lwjgl.opengl.GL32;
import java.nio.ByteBuffer;
/**
* Handles fading MC and DH together via {@link FadeShader} and {@link FadeApplyShader}. <br><br>
* Handles fading MC and DH together via {@link VanillaFadeShader} and {@link VanillaFadeApplyShader}. <br><br>
*
* {@link FadeShader} - draws the Fade to a texture. <br>
* {@link FadeApplyShader} - draws the Fade texture to MC's FrameBuffer. <br>
* {@link VanillaFadeShader} - draws the Fade to a texture. <br>
* {@link VanillaFadeApplyShader} - draws the Fade texture to MC's FrameBuffer. <br>
*/
public class FadeRenderer
public class VanillaFadeRenderer
{
public static FadeRenderer INSTANCE = new FadeRenderer();
public static VanillaFadeRenderer INSTANCE = new VanillaFadeRenderer();
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
@@ -66,15 +66,15 @@ public class FadeRenderer
// constructor //
//=============//
private FadeRenderer() { }
private VanillaFadeRenderer() { }
public void init()
{
if (this.init) return;
this.init = true;
FadeShader.INSTANCE.init();
FadeApplyShader.INSTANCE.init();
VanillaFadeShader.INSTANCE.init();
VanillaFadeApplyShader.INSTANCE.init();
}
private void createFramebuffer(int width, int height)
@@ -144,10 +144,10 @@ public class FadeRenderer
}
FadeShader.INSTANCE.frameBuffer = this.fadeFramebuffer;
FadeShader.INSTANCE.setProjectionMatrix(mcModelViewMatrix, mcProjectionMatrix, partialTicks);
FadeShader.INSTANCE.setLevelMaxHeight(level.getMaxHeight());
FadeShader.INSTANCE.render(partialTicks);
VanillaFadeShader.INSTANCE.frameBuffer = this.fadeFramebuffer;
VanillaFadeShader.INSTANCE.setProjectionMatrix(mcModelViewMatrix, mcProjectionMatrix, partialTicks);
VanillaFadeShader.INSTANCE.setLevelMaxHeight(level.getMaxHeight());
VanillaFadeShader.INSTANCE.render(partialTicks);
// restored so we can write the fade texture to the main frame buffer
//mcState.restore();
@@ -158,8 +158,8 @@ public class FadeRenderer
// otherwise we can directly render to their texture
if (MC_RENDER.mcRendersToFrameBuffer())
{
FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
FadeApplyShader.INSTANCE.render(partialTicks);
VanillaFadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
VanillaFadeApplyShader.INSTANCE.render(partialTicks);
}
profiler.pop();
@@ -178,8 +178,8 @@ public class FadeRenderer
public void free()
{
FadeShader.INSTANCE.free();
FadeApplyShader.INSTANCE.free();
VanillaFadeShader.INSTANCE.free();
VanillaFadeApplyShader.INSTANCE.free();
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java → core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeApplyShader.java
+7 -7
View File
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.render.renderer.shaders;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
import com.seibel.distanthorizons.core.render.renderer.VanillaFadeRenderer;
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
import com.seibel.distanthorizons.core.render.renderer.ScreenQuad;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
@@ -32,12 +32,12 @@ import org.lwjgl.opengl.GL32;
* Draws the Fade texture onto Minecraft's FrameBuffer. <br><br>
*
* See Also: <br>
* {@link FadeRenderer} - Parent to this shader. <br>
* {@link FadeShader} - draws the Fade texture. <br>
* {@link VanillaFadeRenderer} - Parent to this shader. <br>
* {@link VanillaFadeShader} - draws the Fade texture. <br>
*/
public class FadeApplyShader extends AbstractShaderRenderer
public class VanillaFadeApplyShader extends AbstractShaderRenderer
{
public static FadeApplyShader INSTANCE = new FadeApplyShader();
public static VanillaFadeApplyShader INSTANCE = new VanillaFadeApplyShader();
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
@@ -62,7 +62,7 @@ public class FadeApplyShader extends AbstractShaderRenderer
{
this.shader = new ShaderProgram(
"shaders/normal.vert",
"shaders/fade/apply.frag",
"shaders/vanillaFade/apply.frag",
"fragColor",
new String[]{ "vPosition" });
@@ -119,7 +119,7 @@ public class FadeApplyShader extends AbstractShaderRenderer
// apply the rendered Fade to Minecraft's framebuffer
GLMC.glBindFramebuffer(GL32.GL_READ_FRAMEBUFFER, FadeShader.INSTANCE.frameBuffer);
GLMC.glBindFramebuffer(GL32.GL_READ_FRAMEBUFFER, VanillaFadeShader.INSTANCE.frameBuffer);
GLMC.glBindFramebuffer(GL32.GL_DRAW_FRAMEBUFFER, MC_RENDER.getTargetFramebuffer());
ScreenQuad.INSTANCE.render();
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeShader.java → core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/VanillaFadeShader.java
+4 -7
View File
@@ -21,21 +21,18 @@ package com.seibel.distanthorizons.core.render.renderer.shaders;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.render.glObject.GLState;
import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
import com.seibel.distanthorizons.core.render.renderer.ScreenQuad;
import com.seibel.distanthorizons.core.util.LodUtil;
import com.seibel.distanthorizons.core.util.RenderUtil;
import com.seibel.distanthorizons.core.util.math.Mat4f;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import org.lwjgl.opengl.GL32;
public class FadeShader extends AbstractShaderRenderer
public class VanillaFadeShader extends AbstractShaderRenderer
{
public static FadeShader INSTANCE = new FadeShader();
public static VanillaFadeShader INSTANCE = new VanillaFadeShader();
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
@@ -70,13 +67,13 @@ public class FadeShader extends AbstractShaderRenderer
// constructor //
//=============//
public FadeShader() { }
public VanillaFadeShader() { }
@Override
public void onInit()
{
this.shader = new ShaderProgram(
"shaders/normal.vert", "shaders/fade/fade.frag",
"shaders/normal.vert", "shaders/vanillaFade/fade.frag",
"fragColor", new String[]{"vPosition"}
);
core/src/main/resources/shaders/fade/apply.frag → core/src/main/resources/shaders/vanillaFade/apply.frag
View File
core/src/main/resources/shaders/fade/fade.frag → core/src/main/resources/shaders/vanillaFade/fade.frag
View File