From 1315d8971a965ff801ffce97695d1a6dca347db6 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Fri, 2 Aug 2024 12:51:30 -0400 Subject: [PATCH] More AO Fixes (#578) * Only use sodium AO for standard blocks and disable flat pipeline optimization * Option for sodium smooth lighting. Currently default to true * Remove tessellator ignore from renderQuadList * Add back cull and sodium lighting check in renderQuadList * Disable sodium AO by default * fix culling --------- Co-authored-by: Caedis --- .../early/sodium/MixinRenderBlocks.java | 28 ++++++++++++++++++- .../client/gui/SodiumGameOptionPages.java | 8 ++++++ .../sodium/client/gui/SodiumGameOptions.java | 1 + .../client/render/pipeline/BlockRenderer.java | 14 +++++----- .../resources/assets/angelica/lang/en_US.lang | 2 ++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderBlocks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderBlocks.java index 1ceea6de5..a28b2b940 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderBlocks.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderBlocks.java @@ -1,14 +1,40 @@ package com.gtnewhorizons.angelica.mixins.early.sodium; +import com.gtnewhorizons.angelica.config.AngelicaConfig; +import me.jellysquid.mods.sodium.client.SodiumClientMod; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(RenderBlocks.class) public abstract class MixinRenderBlocks { + + @Unique + private boolean isRenderingByType = false; + + @Inject(method = "renderBlockByRenderType", at = @At("HEAD")) + private void renderingByTypeEnable(CallbackInfoReturnable ci) { + this.isRenderingByType = true; + } + + @Inject(method = "renderBlockByRenderType", at = @At("TAIL")) + private void renderingByTypeDisable(CallbackInfoReturnable ci) { + this.isRenderingByType = false; + } + @Redirect(method = "renderStandardBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z")) private boolean checkAOEnabled() { - return false; + if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && SodiumClientMod.options().quality.useSodiumAO) || + (AngelicaConfig.enableIris && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo())) { + return false; // Force sodium pipeline with Iris or for standard blocks rendered from renderBlockByRenderType when using AO + } + + return Minecraft.isAmbientOcclusionEnabled(); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index 8475100cf..9130c87ab 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -204,6 +204,14 @@ public class SodiumGameOptionPages { .setImpact(OptionImpact.MEDIUM) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.sodium_smooth_lighting.name")) + .setTooltip(I18n.format("sodium.options.sodium_smooth_lighting.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.quality.useSodiumAO = value, opts -> opts.quality.useSodiumAO) + .setImpact(OptionImpact.LOW) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) // TODO /*.add(OptionImpl.createBuilder(int.class, vanillaOpts) .setName(new TranslatableText("options.biomeBlendRadius")) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java index 67227815b..033603653 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java @@ -56,6 +56,7 @@ public class SodiumGameOptions { } public static class QualitySettings { public GraphicsQuality grassQuality = GraphicsQuality.DEFAULT; + public boolean useSodiumAO = false; } private static final Gson GSON = new GsonBuilder() diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java index dad9f4507..1a77a1534 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java @@ -42,6 +42,7 @@ public class BlockRenderer { private final QuadLightData cachedQuadLightData = new QuadLightData(); private final boolean useAmbientOcclusion; + private final boolean useSodiumAO; private boolean useSeparateAo; private final LightPipelineProvider lighters; @@ -55,11 +56,12 @@ public class BlockRenderer { this.lighters = lighters; // TODO: Sodium - AO Setting this.useAmbientOcclusion = Minecraft.getMinecraft().gameSettings.ambientOcclusion > 0; + this.useSodiumAO = SodiumClientMod.options().quality.useSodiumAO; this.occlusionCache = new BlockOcclusionCache(); } public boolean renderModel(IBlockAccess world, RenderBlocks renderBlocks, Block block, int meta, BlockPosImpl pos, ChunkModelBuffers buffers, boolean cull, long seed) { - final LightMode mode = this.getLightingMode(block); + final LightMode mode = LightMode.SMOOTH; // TODO: this.getLightingMode(block); is what was previously used. The flat pipeline is busted and was only an optimization for very few blocks. final LightPipeline lighter = this.lighters.getLighter(mode); this.useSeparateAo = AngelicaConfig.enableIris && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo(); @@ -102,7 +104,7 @@ public class BlockRenderer { for (ModelQuadFacing facing : ModelQuadFacing.VALUES) { this.random.setSeed(seed); - this.renderQuadList(pos, lighter, buffers, quads, facing, block.getRenderType() == 0); + this.renderQuadList(pos, lighter, buffers, quads, facing, (this.useAmbientOcclusion && this.useSodiumAO)); } if (!quads.isEmpty()) rendered = true; @@ -127,13 +129,11 @@ public class BlockRenderer { for (int i = 0, quadsSize = quads.size(); i < quadsSize; i++) { final QuadView quad = quads.get(i); - // If we aren't using sodium light (i.e. it's the CapturingTesselator) - // manually filter quads by side - if (!useSodiumLight && quad.getFace() != cullFace) - continue; - final QuadLightData light = this.cachedQuadLightData; + if (quad.getFace() != cullFace) + continue; + if (useSodiumLight || this.useSeparateAo) lighter.calculate(quad, pos, light, cullFace, quad.getLightFace(), quad.isShade()); diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 9257fb6ab..eeac035dc 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -29,6 +29,8 @@ sodium.options.leaves_quality.name=Leaves Quality sodium.options.leaves_quality.tooltip=Controls the quality of leaves. sodium.options.grass_quality.name=Grass Quality sodium.options.grass_quality.tooltip=Controls the quality of grass block sides. +sodium.options.sodium_smooth_lighting.name=Sodium Smooth Lighting +sodium.options.sodium_smooth_lighting.tooltip=If enabled, Sodium's lighting pipeline will be used for smooth lighting. This only has an effect if smooth lighting is enabled. sodium.options.particle_quality.name=Particle Quality sodium.options.particle_quality.tooltip=Controls the maximum number of particles which can be present on screen at any one time. sodium.options.smooth_lighting.tooltip=Controls whether blocks will be smoothly lit and shaded. This slightly increases the amount of time needed to re-build a chunk, but doesn't affect frame rates.