Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement BEFORE stages for extra control #1857

Draft
wants to merge 1 commit into
base: 1.21.x
Choose a base branch
from
Draft

Implement BEFORE stages for extra control #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion patches/net/minecraft/client/renderer/GameRenderer.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@
} catch (Throwable throwable1) {
CrashReport crashreport1 = CrashReport.forThrowable(throwable1, "Rendering screen");
CrashReportCategory crashreportcategory1 = crashreport1.addCategory("Screen render details");
@@ -689,6 +_,8 @@
@@ -688,7 +_,11 @@
Matrix4f matrix4f2 = new Matrix4f().rotation(quaternionf);
this.minecraft.levelRenderer.prepareCullFrustum(camera.getPosition(), matrix4f2, matrix4f1);
this.minecraft.getMainRenderTarget().bindWrite(true);
+ profilerfiller.popPush("neoforge_render_first");
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_LEVEL, this.minecraft.levelRenderer, null, matrix4f1, matrix4f, this.minecraft.levelRenderer.getTicks(), camera, this.minecraft.levelRenderer.getFrustum());
this.minecraft.levelRenderer.renderLevel(this.resourcePool, p_348589_, flag, camera, this, matrix4f2, matrix4f);
+ profilerfiller.popPush("neoforge_render_last");
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.AFTER_LEVEL, this.minecraft.levelRenderer, null, matrix4f1, matrix4f, this.minecraft.levelRenderer.getTicks(), camera, this.minecraft.levelRenderer.getFrustum());
Expand Down
35 changes: 31 additions & 4 deletions patches/net/minecraft/client/renderer/LevelRenderer.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,20 @@
this.renderSectionLayer(RenderType.cutout(), d0, d1, d2, p_362420_, p_361272_);
if (this.level.effects().constantAmbientLight()) {
Lighting.setupNetherLevel();
@@ -603,6 +_,7 @@
@@ -601,10 +_,13 @@
MultiBufferSource.BufferSource multibuffersource$buffersource = this.renderBuffers.bufferSource();
MultiBufferSource.BufferSource multibuffersource$buffersource1 = this.renderBuffers.crumblingBufferSource();
p_362234_.popPush("entities");
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_ENTITIES, this, posestack, p_362420_, p_361272_, this.ticks, p_363453_, p_366590_);
this.renderEntities(posestack, multibuffersource$buffersource, p_363453_, p_360931_, this.visibleEntities);
multibuffersource$buffersource.endLastBatch();
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.AFTER_ENTITIES, this, posestack, p_362420_, p_361272_, this.ticks, p_363453_, p_366590_);
this.checkPoseStack(posestack);
p_362234_.popPush("blockentities");
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_BLOCK_ENTITIES, this, posestack, p_362420_, p_361272_, this.ticks, p_363453_, p_366590_);
this.renderBlockEntities(posestack, multibuffersource$buffersource, multibuffersource$buffersource1, p_363453_, f);
multibuffersource$buffersource.endLastBatch();
this.checkPoseStack(posestack);
@@ -619,6 +_,7 @@
multibuffersource$buffersource.endBatch(Sheets.hangingSignSheet());
multibuffersource$buffersource.endBatch(Sheets.chestSheet());
Expand Down Expand Up @@ -91,6 +97,14 @@
FramePass framepass = p_363357_.addPass("particles");
if (this.targets.particles != null) {
this.targets.particles = framepass.readsAndWrites(this.targets.particles);
@@ -671,6 +_,7 @@
ResourceHandle<RenderTarget> resourcehandle = this.targets.main;
ResourceHandle<RenderTarget> resourcehandle1 = this.targets.particles;
framepass.executes(() -> {
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_PARTICLES, this, null, modelViewMatrix, projectionMatrix, this.ticks, p_365299_, getFrustum());
RenderSystem.setShaderFog(p_362149_);
if (resourcehandle1 != null) {
resourcehandle1.get().setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
@@ -678,7 +_,8 @@
resourcehandle1.get().copyDepthFrom(resourcehandle.get());
}
Expand Down Expand Up @@ -122,7 +136,11 @@
int i = this.minecraft.options.getEffectiveRenderDistance() * 16;
float f = this.minecraft.gameRenderer.getDepthFar();
FramePass framepass = p_364025_.addPass("weather");
@@ -724,6 +_,7 @@
@@ -721,9 +_,11 @@
}

framepass.executes(() -> {
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_PARTICLES, this, null, modelViewMatrix, projectionMatrix, this.ticks, camera, getFrustum());
RenderSystem.setShaderFog(p_360974_);
MultiBufferSource.BufferSource multibuffersource$buffersource = this.renderBuffers.bufferSource();
this.weatherEffectRenderer.render(this.minecraft.level, multibuffersource$buffersource, this.ticks, p_362434_, p_360771_);
Expand Down Expand Up @@ -190,11 +208,19 @@
if (flag != p_361698_) {
return;
}
@@ -984,6 +_,7 @@
ObjectListIterator<SectionRenderDispatcher.RenderSection> objectlistiterator = this.visibleSections
.listIterator(flag ? 0 : this.visibleSections.size());
p_294513_.setupRenderState();
+ net.neoforged.neoforge.client.ClientHooks.dispatchBeforeRenderStage(p_294513_, this, p_294782_, p_324517_, this.ticks, this.minecraft.gameRenderer.getMainCamera(), this.getFrustum());
CompiledShaderProgram compiledshaderprogram = RenderSystem.getShader();
if (compiledshaderprogram == null) {
p_294513_.clearRenderState();
@@ -1019,6 +_,7 @@
compiledshaderprogram.clear();
VertexBuffer.unbind();
zone.close();
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(p_294513_, this, p_294782_, p_324517_, this.ticks, this.minecraft.gameRenderer.getMainCamera(), this.getFrustum());
+ net.neoforged.neoforge.client.ClientHooks.dispatchAfterRenderStage(p_294513_, this, p_294782_, p_324517_, this.ticks, this.minecraft.gameRenderer.getMainCamera(), this.getFrustum());
p_294513_.clearRenderState();
}
}
Expand All @@ -214,10 +240,11 @@
FogType fogtype = p_362177_.getFluidInCamera();
if (fogtype != FogType.POWDER_SNOW && fogtype != FogType.LAVA && !this.doesMobEffectBlockSky(p_362177_)) {
DimensionSpecialEffects dimensionspecialeffects = this.level.effects();
@@ -1068,6 +_,7 @@
@@ -1068,6 +_,8 @@
FramePass framepass = p_362870_.addPass("sky");
this.targets.main = framepass.readsAndWrites(this.targets.main);
framepass.executes(() -> {
+ net.neoforged.neoforge.client.ClientHooks.dispatchRenderStage(net.neoforged.neoforge.client.event.RenderLevelStageEvent.Stage.BEFORE_SKY, this, null, modelViewMatrix, projectionMatrix, this.ticks, p_362177_, getFrustum());
+ if (!level.effects().renderSky(level, ticks, p_363799_, modelViewMatrix, p_362177_, projectionMatrix, () -> RenderSystem.setShaderFog(p_364999_))) {
RenderSystem.setShaderFog(p_364999_);
if (dimensionspecialeffects$skytype == DimensionSpecialEffects.SkyType.END) {
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/net/neoforged/neoforge/client/ClientHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,19 @@ public static void dispatchRenderStage(RenderLevelStageEvent.Stage stage, LevelR
profiler.pop();
}

@Deprecated(forRemoval = true, since = "21.4")
public static void dispatchRenderStage(RenderType renderType, LevelRenderer levelRenderer, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
RenderLevelStageEvent.Stage stage = RenderLevelStageEvent.Stage.fromRenderType(renderType);
dispatchAfterRenderStage(renderType, levelRenderer, modelViewMatrix, projectionMatrix, renderTick, camera, frustum);
}

public static void dispatchBeforeRenderStage(RenderType renderType, LevelRenderer levelRenderer, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
RenderLevelStageEvent.Stage stage = RenderLevelStageEvent.Stage.stageBeforeRenderType(renderType);
if (stage != null)
dispatchRenderStage(stage, levelRenderer, null, modelViewMatrix, projectionMatrix, renderTick, camera, frustum);
}

public static void dispatchAfterRenderStage(RenderType renderType, LevelRenderer levelRenderer, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, int renderTick, Camera camera, Frustum frustum) {
RenderLevelStageEvent.Stage stage = RenderLevelStageEvent.Stage.stageAfterRenderType(renderType);
if (stage != null)
dispatchRenderStage(stage, levelRenderer, null, modelViewMatrix, projectionMatrix, renderTick, camera, frustum);
}
Expand Down
Loading
Loading