From 78334717e7e48ebaffa7ebf9e2b3741eabc9eb04 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Wed, 5 Nov 2025 09:58:05 -0800 Subject: [PATCH] Fix TAA: * Return an immutable view of the underlying camera position to avoid mutating it * Update Camera Uniforms to utilize the view instead of mutating in place --- .../coderbot/iris/pipeline/ShadowRenderer.java | 18 +++++++++--------- .../coderbot/iris/uniforms/CameraUniforms.java | 7 ++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java index 6643abedb..4e5fe5ad6 100644 --- a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java +++ b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java @@ -44,7 +44,7 @@ import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; import org.joml.Matrix4f; -import org.joml.Vector3d; +import org.joml.Vector3dc; import org.joml.Vector3f; import org.joml.Vector4f; import org.lwjgl.BufferUtils; @@ -141,11 +141,11 @@ public class ShadowRenderer { public static MatrixStack createShadowModelView(float sunPathRotation, float intervalSize) { // Determine the camera position - final Vector3d cameraPos = CameraUniforms.getUnshiftedCameraPosition(); + final Vector3dc cameraPos = CameraUniforms.getUnshiftedCameraPosition(); - final double cameraX = cameraPos.x; - final double cameraY = cameraPos.y; - final double cameraZ = cameraPos.z; + final double cameraX = cameraPos.x(); + final double cameraY = cameraPos.y(); + final double cameraZ = cameraPos.z(); // Set up our modelview matrix stack final MatrixStack modelView = new MatrixStack(); @@ -461,7 +461,7 @@ public class ShadowRenderer { MODELVIEW_BUFFER.clear().rewind(); modelView.peek().getModel().get(MODELVIEW_BUFFER); GL11.glLoadMatrix(MODELVIEW_BUFFER); - + for (TileEntity tileEntity : visibleTileEntities) { if (hasEntityFrustum && (culler.isCulled(tileEntity.xCoord - 1, tileEntity.yCoord - 1, tileEntity.zCoord - 1, tileEntity.xCoord + 1, tileEntity.yCoord + 1, tileEntity.zCoord + 1))) { continue; @@ -475,10 +475,10 @@ public class ShadowRenderer { continue; } renderTileEntity(tileEntity, cameraX, cameraY, cameraZ, partialTicks); - + shadowTileEntities++; } - + GLStateManager.glPopMatrix(); renderedShadowTileEntities = shadowTileEntities; @@ -530,7 +530,7 @@ public class ShadowRenderer { terrainFrustumHolder = createShadowFrustum(renderDistanceMultiplier, terrainFrustumHolder); // Determine the player camera position - final Vector3d cameraPos = CameraUniforms.getUnshiftedCameraPosition(); + final Vector3dc cameraPos = CameraUniforms.getUnshiftedCameraPosition(); final double cameraX = cameraPos.x(); final double cameraY = cameraPos.y(); diff --git a/src/main/java/net/coderbot/iris/uniforms/CameraUniforms.java b/src/main/java/net/coderbot/iris/uniforms/CameraUniforms.java index a7c7f5062..866171cbc 100644 --- a/src/main/java/net/coderbot/iris/uniforms/CameraUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/CameraUniforms.java @@ -5,6 +5,7 @@ import lombok.Getter; import net.coderbot.iris.gl.uniform.UniformHolder; import net.minecraft.client.Minecraft; import org.joml.Vector3d; +import org.joml.Vector3dc; import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.ONCE; import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_FRAME; @@ -34,7 +35,7 @@ public class CameraUniforms { return client.gameSettings.renderDistanceChunks * 16; } - public static Vector3d getUnshiftedCameraPosition() { + public static Vector3dc getUnshiftedCameraPosition() { return RenderingState.INSTANCE.getCameraPosition(); } @@ -59,8 +60,8 @@ public class CameraUniforms { } private void update() { - previousCameraPosition = currentCameraPosition; - currentCameraPosition = getUnshiftedCameraPosition().add(shift); + previousCameraPosition.set(currentCameraPosition); + currentCameraPosition.set(getUnshiftedCameraPosition()).add(shift); updateShift(); }