Fix some frustum issues

IrisShaders · Aug 14, 2023 · d4f16ce · d4f16ce
1 parent 7d0d4e0
commit d4f16ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/...java/net/coderbot/iris/shadows/frustum/advanced/ReversedAdvancedShadowCullingFrustum.java b/...java/net/coderbot/iris/shadows/frustum/advanced/ReversedAdvancedShadowCullingFrustum.java
@@ -28,4 +28,8 @@ public int fastAabbTest(float minX, float minY, float minZ, float maxX, float ma
 
 		return isVisible(minX, minY, minZ, maxX, maxY, maxZ);
 	}
+
+	public boolean testAab(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) {
+		return !boxCuller.isCulledSodium(minX, minY, minZ, maxX, maxY, maxZ) || this.checkCornerVisibility(minX, minY, minZ, maxX, maxY, maxZ) > 0;
+	}
 }
diff --git a/...lity/java/net/coderbot/iris/compat/sodium/mixin/shadow_map/MixinDefaultChunkRenderer.java b/...lity/java/net/coderbot/iris/compat/sodium/mixin/shadow_map/MixinDefaultChunkRenderer.java
@@ -9,7 +9,7 @@
 
 @Mixin(DefaultChunkRenderer.class)
 public class MixinDefaultChunkRenderer {
-    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/gui/SodiumGameOptions$PerformanceSettings;useBlockFaceCulling:Z"))
+    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/gui/SodiumGameOptions$PerformanceSettings;useBlockFaceCulling:Z"), remap = false)
     private boolean iris$disableBlockFaceCullingInShadowPass(SodiumGameOptions.PerformanceSettings instance) {
         if (ShadowRenderingState.areShadowsCurrentlyBeingRendered()) return false;
         return instance.useBlockFaceCulling;

diff --git a/...lity/java/net/coderbot/iris/compat/sodium/mixin/shadow_map/MixinRenderSectionManager.java b/...lity/java/net/coderbot/iris/compat/sodium/mixin/shadow_map/MixinRenderSectionManager.java
@@ -38,14 +38,14 @@ private void cancelIfShadow(Camera camera, Viewport viewport, int frame, boolean
             "getRenderLists",
             "getVisibleChunkCount",
             "renderLayer"
-    }, at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSectionManager;renderLists:Lme/jellysquid/mods/sodium/client/render/chunk/lists/SortedRenderLists;"))
+    }, at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSectionManager;renderLists:Lme/jellysquid/mods/sodium/client/render/chunk/lists/SortedRenderLists;"), remap = false)
     private SortedRenderLists useShadowRenderList2(RenderSectionManager instance) {
         return ShadowRenderingState.areShadowsCurrentlyBeingRendered() ? shadowRenderLists : renderLists;
     }
 
     @Redirect(method = {
             "resetRenderLists"
-    }, at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSectionManager;renderLists:Lme/jellysquid/mods/sodium/client/render/chunk/lists/SortedRenderLists;"))
+    }, at = @At(value = "FIELD", target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSectionManager;renderLists:Lme/jellysquid/mods/sodium/client/render/chunk/lists/SortedRenderLists;"), remap = false)
     private void useShadowRenderList3(RenderSectionManager instance, SortedRenderLists value) {
         if (ShadowRenderingState.areShadowsCurrentlyBeingRendered()) shadowRenderLists = value;
          else renderLists = value;

diff --git a/...derbot/iris/compat/sodium/mixin/shadow_map/frustum/MixinAdvancedShadowCullingFrustum.java b/...derbot/iris/compat/sodium/mixin/shadow_map/frustum/MixinAdvancedShadowCullingFrustum.java
@@ -3,9 +3,11 @@
 import me.jellysquid.mods.sodium.client.render.viewport.Viewport;
 import me.jellysquid.mods.sodium.client.render.viewport.ViewportProvider;
 import me.jellysquid.mods.sodium.client.render.viewport.frustum.Frustum;
+import net.coderbot.iris.shadows.frustum.BoxCuller;
 import net.coderbot.iris.shadows.frustum.advanced.AdvancedShadowCullingFrustum;
 import org.joml.FrustumIntersection;
 import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -24,9 +26,13 @@ public abstract class MixinAdvancedShadowCullingFrustum implements ViewportProvi
 	@Shadow
 	public double z;
 
+	@Shadow
+	@Final
+	protected BoxCuller boxCuller;
+
 	@Override
 	public boolean testAab(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) {
-		return this.checkCornerVisibility(minX, minY, minZ, maxX, maxY, maxZ) > 0;
+		return (boxCuller == null || !boxCuller.isCulledSodium(minX, minY, minZ, maxX, maxY, maxZ)) && this.checkCornerVisibility(minX, minY, minZ, maxX, maxY, maxZ) > 0;
 	}
 
 	@Unique