+ * Register a custom bloom render callback for subsequent world render. The render call persists until the + * {@code blockEntity} is invalidated, or the world associated with {@code blockEntity} or the ticket is + * manually freed by calling {@link BloomRenderTicket#invalidate()}. + *
+ *+ * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * returned instead. + *
+ * + * @param setup Render setup, if exists + * @param bloomType Type of the bloom + * @param render Rendering callback + * @param blockEntity Meta tile entity instance + * @return Ticket for the registered bloom render callback + * @throws NullPointerException if {@code bloomType == null || render == null || blockEntity == null} + */ + @NotNull + public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup, + @NotNull BloomType bloomType, + @NotNull IBloomEffect render, + @NotNull BlockEntity blockEntity) { + Objects.requireNonNull(blockEntity, "blockEntity == null"); + return registerBloomRender(setup, bloomType, + new IBloomEffect() { + + @Override + public void renderBloomEffect(@NotNull PoseStack poseStack, @NotNull BufferBuilder buffer, @NotNull EffectRenderContext context) { + render.renderBloomEffect(poseStack, buffer, context); + } + + @Override + public boolean shouldRenderBloomEffect(@NotNull EffectRenderContext context) { + return blockEntity.getLevel() == context.renderViewEntity().level() && + render.shouldRenderBloomEffect(context); + } + }, + t -> !blockEntity.isRemoved(), + blockEntity::getLevel); + } + + /** + *+ * Register a custom bloom render callback for subsequent world render. The render call persists until the + * {@code particle} is invalidated, or the ticket is manually freed by calling + * {@link BloomRenderTicket#invalidate()}. + *
+ *+ * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * returned instead. + *
+ * + * @param setup Render setup, if exists + * @param bloomType Type of the bloom + * @param render Rendering callback + * @param particle Particle instance + * @return Ticket for the registered bloom render callback + * @throws NullPointerException if {@code bloomType == null || render == null || metaTileEntity == null} + */ + @NotNull + public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup, + @NotNull BloomType bloomType, + @NotNull IBloomEffect render, + @NotNull GTParticle particle) { + Objects.requireNonNull(particle, "particle == null"); + return registerBloomRender(setup, bloomType, render, t -> particle.isAlive()); + } + + /** + *+ * Register a custom bloom render callback for subsequent world render. The render call persists until it is + * manually freed by calling {@link BloomRenderTicket#invalidate()}, or invalidated by validity checker. + *
+ *+ * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * returned instead. + *
+ * + * @param setup Render setup, if exists + * @param bloomType Type of the bloom + * @param render Rendering callback + * @param validityChecker Optional validity checker; returning {@code false} causes the ticket to be invalidated. + * Checked on both pre-/post-render each frame. + * @return Ticket for the registered bloom render callback + * @throws NullPointerException if {@code bloomType == null || render == null} + * @see #registerBloomRender(IRenderSetup, BloomType, IBloomEffect, BlockEntity) + * @see #registerBloomRender(IRenderSetup, BloomType, IBloomEffect, GTParticle) + * @see #registerBloomRender(IRenderSetup, BloomType, IBloomEffect, Predicate, Supplier) + */ + @NotNull + public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup, + @NotNull BloomType bloomType, + @NotNull IBloomEffect render, + @Nullable Predicate+ * Register a custom bloom render callback for subsequent world render. The render call persists until it is + * manually freed by calling {@link BloomRenderTicket#invalidate()}, or invalidated by validity checker. + *
+ *+ * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * returned instead. + *
+ * + * @param setup Render setup, if exists + * @param bloomType Type of the bloom + * @param render Rendering callback + * @param validityChecker Optional validity checker; returning {@code false} causes the ticket to be invalidated. + * Checked on both pre/post render each frame. + * @param worldContext Optional world bound to the ticket. If the world returned is not null, the bloom ticket + * will be automatically invalidated on world unload. If world context returns {@code null}, + * it will not be affected by aforementioned automatic invalidation. + * @return Ticket for the registered bloom render callback + * @throws NullPointerException if {@code bloomType == null || render == null} + * @see #registerBloomRender(IRenderSetup, BloomType, IBloomEffect, BlockEntity) + * @see #registerBloomRender(IRenderSetup, BloomType, IBloomEffect, GTParticle) + */ + @NotNull + public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup, + @NotNull BloomType bloomType, + @NotNull IBloomEffect render, + @Nullable Predicate+ * 1 - Unity Bloom + *
+ *+ * 2 - Unreal Bloom + *
+ */ + int customBloomStyle(); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/BloomUtils.java b/src/main/java/com/gregtechceu/gtceu/client/util/BloomUtils.java deleted file mode 100644 index 6325e1f7086..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/client/util/BloomUtils.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gregtechceu.gtceu.client.util; - -import com.lowdragmc.shimmer.client.postprocessing.PostProcessing; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.function.Consumer; - -@OnlyIn(Dist.CLIENT) -public class BloomUtils { - - public static void entityBloom(Consumer- * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * This method does not register bloom render ticket when Iris/Oculus is present, and an invalid ticket will be * returned instead. *
* @@ -179,7 +182,7 @@ public boolean shouldRenderBloomEffect(@NotNull EffectRenderContext context) { * {@link BloomRenderTicket#invalidate()}. * *- * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * This method does not register bloom render ticket when Iris/Oculus is present, and an invalid ticket will be * returned instead. *
* @@ -205,7 +208,7 @@ public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup * manually freed by calling {@link BloomRenderTicket#invalidate()}, or invalidated by validity checker. * *- * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * This method does not register bloom render ticket when Iris/Oculus is present, and an invalid ticket will be * returned instead. *
* @@ -234,7 +237,7 @@ public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup * manually freed by calling {@link BloomRenderTicket#invalidate()}, or invalidated by validity checker. * *- * This method does not register bloom render ticket when Optifine is present, and an invalid ticket will be + * This method does not register bloom render ticket when Iris/Oculus is present, and an invalid ticket will be * returned instead. *
* @@ -257,7 +260,7 @@ public static BloomRenderTicket registerBloomRender(@Nullable IRenderSetup setup @NotNull IBloomEffect render, @Nullable Predicate- * 1 - Unity Bloom - *
- *- * 2 - Unreal Bloom - *
- */ - int customBloomStyle(); - } } diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/DepthTextureUtil.java b/src/main/java/com/gregtechceu/gtceu/client/util/DepthTextureUtil.java deleted file mode 100644 index 767f73209fc..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/client/util/DepthTextureUtil.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.gregtechceu.gtceu.client.util; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.config.ConfigHolder; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.platform.TextureUtil; -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.entity.Entity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.RenderLevelStageEvent; -import net.minecraftforge.event.TickEvent; -import org.lwjgl.opengl.*; - -/** - * Created with IntelliJ IDEA. - * - * @author KilaBash - * @date 2021/09/11 - * @implNote You'll need it when you need to get deep textures to do more cool things. - * The default FBO is used, unfortunately, sometimes we have to abandon native way to create a new fbo. - * But generally not. - */ -@OnlyIn(Dist.CLIENT) -public class DepthTextureUtil { - - public static int framebufferObject; - public static int framebufferDepthTexture; - private static boolean useDefaultFBO = true; - private static boolean lastBind; - private static int lastWidth, lastHeight; - - private static boolean shouldRenderDepthTexture() { - return lastBind && !GTCEu.isOptifineLoaded() && ConfigHolder.INSTANCE.client.hookDepthTexture; - } - - public static void onPreWorldRender(TickEvent.RenderTickEvent event) { - Minecraft mc = Minecraft.getInstance(); - if (event.phase == TickEvent.Phase.START && mc.level != null) { - if (shouldRenderDepthTexture()) { - if (useDefaultFBO && GL11.glGetError() != 0) { // if we can't use the vanilla fbo.... okay, why not - // create our own fbo? - useDefaultFBO = false; - if (framebufferDepthTexture != 0) { - disposeDepthTexture(); - createDepthTexture(); - } - } - if (framebufferDepthTexture == 0) { - createDepthTexture(); - } else if (lastWidth != mc.getMainRenderTarget().width || - lastHeight != mc.getMainRenderTarget().height) { - disposeDepthTexture(); - createDepthTexture(); - } - } else { - disposeDepthTexture(); - } - lastBind = false; - } - } - - public static void renderWorld(RenderLevelStageEvent event) { // re-render world in our own fbo. - if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_BLOCK_ENTITIES) { - return; - } - Minecraft mc = Minecraft.getInstance(); - Entity viewer = mc.getCameraEntity(); - if (DepthTextureUtil.framebufferDepthTexture != 0 && mc.level != null && viewer != null && - !DepthTextureUtil.useDefaultFBO) { - int lastFBO = GlStateManager.getBoundFramebuffer(); - GlStateManager._glBindFramebuffer(GL30.GL_FRAMEBUFFER, framebufferObject); - RenderSystem.clear(GL11.GL_DEPTH_BUFFER_BIT, Minecraft.ON_OSX); - var projectionMatrix = RenderSystem.getProjectionMatrix(); - mc.levelRenderer.renderChunkLayer(RenderType.solid(), event.getPoseStack(), - viewer.getX(), viewer.getY(), viewer.getZ(), projectionMatrix); - mc.levelRenderer.renderChunkLayer(RenderType.solid(), event.getPoseStack(), - viewer.getX(), viewer.getY(), viewer.getZ(), projectionMatrix); - GlStateManager._glBindFramebuffer(GL30.GL_FRAMEBUFFER, lastFBO); - } - } - - public static void createDepthTexture() { - int lastFBO = GlStateManager._getInteger(GL30.GL_FRAMEBUFFER_BINDING); - RenderTarget framebuffer = Minecraft.getInstance().getMainRenderTarget(); - boolean stencil = framebuffer.isStencilEnabled() && useDefaultFBO; - - if (useDefaultFBO) { - framebufferObject = framebuffer.frameBufferId; - } else { - framebufferObject = GlStateManager.glGenFramebuffers(); - } - - framebufferDepthTexture = TextureUtil.generateTextureId(); // gen texture - RenderSystem.bindTexture(framebufferDepthTexture); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL14.GL_DEPTH_TEXTURE_MODE, GL11.GL_LUMINANCE); - RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL14.GL_TEXTURE_COMPARE_FUNC, GL11.GL_LEQUAL); - GlStateManager._texImage2D(GL11.GL_TEXTURE_2D, 0, - stencil ? GL30.GL_DEPTH24_STENCIL8 : GL14.GL_DEPTH_COMPONENT24, - framebuffer.viewWidth, - framebuffer.viewHeight, 0, - stencil ? GL30.GL_DEPTH_STENCIL : GL11.GL_DEPTH_COMPONENT, - stencil ? GL30.GL_UNSIGNED_INT_24_8 : GL11.GL_UNSIGNED_INT, null); - RenderSystem.bindTexture(0); - - lastWidth = framebuffer.viewWidth; - lastHeight = framebuffer.viewHeight; - - GlStateManager._glBindFramebuffer(GL30.GL_FRAMEBUFFER, framebufferObject); // bind buffer then bind depth texture - GlStateManager._glFramebufferTexture2D(GL30.GL_FRAMEBUFFER, - stencil ? GL30.GL_DEPTH_STENCIL_ATTACHMENT : GL30.GL_DEPTH_ATTACHMENT, - GL11.GL_TEXTURE_2D, - framebufferDepthTexture, 0); - - if (BloomEffectUtil.getBloomFBO() != null && useDefaultFBO) { - RenderUtil.hookDepthTexture(BloomEffectUtil.getBloomFBO(), framebufferDepthTexture); - } - - GlStateManager._glBindFramebuffer(GL30.GL_FRAMEBUFFER, lastFBO); - } - - public static void disposeDepthTexture() { - if (framebufferDepthTexture != 0 || framebufferObject != 0) { - if (useDefaultFBO) { - RenderTarget framebuffer = Minecraft.getInstance().getMainRenderTarget(); - RenderTarget bloomFBO = BloomEffectUtil.getBloomFBO(); - if (bloomFBO != null) { - RenderUtil.hookDepthBuffer(bloomFBO, framebuffer.getDepthTextureId()); - } - RenderUtil.hookDepthBuffer(framebuffer, framebuffer.getDepthTextureId()); - } else { - RenderSystem.glDeleteBuffers(framebufferObject); - } - RenderSystem.deleteTexture(framebufferDepthTexture); - framebufferObject = 0; - framebufferDepthTexture = 0; - } - } - - public static void bindDepthTexture() { - lastBind = true; - if (useDefaultFBO && framebufferDepthTexture != 0) { - RenderTarget mainTarget = Minecraft.getInstance().getMainRenderTarget(); - RenderUtil.hookDepthBuffer(mainTarget, mainTarget.getDepthTextureId()); - } - RenderSystem.bindTexture(framebufferDepthTexture); - } - - public static void unBindDepthTexture() { - RenderSystem.bindTexture(0); - if (useDefaultFBO) { - RenderTarget framebuffer = Minecraft.getInstance().getMainRenderTarget(); - RenderUtil.hookDepthTexture(framebuffer, framebufferDepthTexture); - } - } - - public static boolean isUseDefaultFBO() { - return useDefaultFBO; - } - - public static boolean isLastBind() { - return framebufferObject != 0; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java b/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java index d6a4e59a0db..617416705a6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.client.util; -import com.gregtechceu.gtceu.client.shader.PostTarget; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; @@ -11,7 +10,7 @@ @OnlyIn(Dist.CLIENT) public class RenderUtil { - public static boolean updateFBOSize(PostTarget fbo, int width, int height) { + public static boolean updateFBOSize(RenderTarget fbo, int width, int height) { if (fbo.width != width || fbo.height != height) { fbo.createBuffers(width, height, Minecraft.ON_OSX); return true; diff --git a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java index d2fa24339e4..b780d97378c 100644 --- a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java +++ b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java @@ -672,7 +672,7 @@ public static class ShaderOptions { public boolean emissiveTexturesBloom = true; @Configurable - @Configurable.Comment({ "Bloom Algorithm", "0 - Simple Gaussian Blur Bloom (Fast)", "1 - Unity Bloom", + @Configurable.Comment({ "Bloom Algorithm", "0 - Simple Gaussian Blur Bloom (Fast) NYI: WILL ERROR", "1 - Unity Bloom", "2 - Unreal Bloom", "Default: 2" }) @Configurable.Range(min = 0, max = 2) public int bloomStyle = 2; @@ -719,7 +719,7 @@ public static class ShaderOptions { @Configurable @Configurable.Comment({ "Blur Step (bloom range)", "Default: 1" }) @Configurable.DecimalRange(min = 0) - public float step = 1; + public float step = 1.0f; public static class FusionBloom { diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelRendererMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelRendererMixin.java index 9c94b09bb7d..1ecd9fc9354 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelRendererMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/LevelRendererMixin.java @@ -103,26 +103,20 @@ public abstract class LevelRendererMixin { } } - @WrapOperation(method = "renderLevel", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V") - ) - private void gtceu$renderBloomLayer(LevelRenderer instance, RenderType renderType, PoseStack poseStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, Operation
* Register a custom bloom render callback for subsequent world render. The render call persists until the
@@ -287,38 +206,7 @@ public static void invalidateLevelTickets(@NotNull LevelAccessor level) {
}
}
- public static Supplier