Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public static void onMainChunkLoaded(ChunkPos chunkPos) {
}
}

public static void renderBeforeMain(GameRenderer gameRenderer, DeltaTracker deltaTracker) {
public static void renderBeforeMain(GameRenderer gameRenderer, DeltaTracker deltaTracker, Matrix4f levelProjection) {
if (ProjectionRenderContext.isActive()) {
return;
}
Expand All @@ -418,7 +418,7 @@ public static void renderBeforeMain(GameRenderer gameRenderer, DeltaTracker delt
RenderTarget mainTarget = gameRenderer.mainRenderTarget();
Camera viewerCamera = gameRenderer.mainCamera();
Vec3 viewerPosition = viewerCamera.position();
Matrix4f mainProjection = new Matrix4f(gameRenderer.gameRenderState().levelRenderState.cameraRenderState.projectionMatrix);
Matrix4f mainProjection = new Matrix4f(levelProjection);
Matrix4f mainModelView = RenderSystem.getModelViewMatrixCopy();
boolean initializedFeedThisFrame = false;
for (ProjectionFeed feed : List.copyOf(FEEDS.values())) {
Expand Down
8 changes: 5 additions & 3 deletions glass/src/main/java/dev/imb11/mixins/GameRendererMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import net.minecraft.client.renderer.GameRenderer;
import dev.imb11.client.renderer.projection.ProjectionLightmap;
import com.mojang.blaze3d.textures.GpuTextureView;
import com.llamalad7.mixinextras.sugar.Local;
import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand Down Expand Up @@ -50,9 +52,9 @@ abstract class GameRendererMixin {
}
}

@Inject(method = "renderLevel", at = @At("HEAD"))
private void glass$renderProjectionBeforeMain(DeltaTracker deltaTracker, CallbackInfo callbackInfo) {
ProjectionRenderManager.renderBeforeMain((GameRenderer) (Object) this, deltaTracker);
@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;setProjectionMatrix(Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lcom/mojang/blaze3d/ProjectionType;)V", ordinal = 0))
private void glass$renderProjectionBeforeMain(DeltaTracker deltaTracker, CallbackInfo callbackInfo, @Local Matrix4f projectionMatrix) {
ProjectionRenderManager.renderBeforeMain((GameRenderer) (Object) this, deltaTracker, projectionMatrix);
}

@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;render(Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/renderer/state/level/CameraRenderState;Lorg/joml/Matrix4fc;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V", shift = At.Shift.AFTER))
Expand Down
Loading