-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
45 changed files
with
460 additions
and
468 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 5 additions & 14 deletions
19
common/src/shaders/java/net/coderbot/iris/mixin/MixinEntityRenderDispatcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,21 @@ | ||
| package net.coderbot.iris.mixin; | ||
|
|
||
| import com.mojang.blaze3d.vertex.PoseStack; | ||
| import net.coderbot.iris.Iris; | ||
| import net.coderbot.iris.pipeline.WorldRenderingPipeline; | ||
| import net.minecraft.client.render.entity.EntityRenderDispatcher; | ||
| import net.minecraft.client.render.entity.EntityRenderer; | ||
| import net.minecraft.entity.Entity; | ||
| 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.callback.CallbackInfo; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| @Mixin(EntityRenderer.class) | ||
| @Mixin(EntityRenderDispatcher.class) | ||
| public class MixinEntityRenderDispatcher { | ||
| @Inject(method = "renderShadow", at = @At("HEAD"), cancellable = true) | ||
| private void iris$maybeSuppressEntityShadow(Entity entity, double x, double y, double z, float f, float tickDelta, CallbackInfo ci) { | ||
| iris$maybeSuppressShadow(ci); | ||
| } | ||
|
|
||
| @Unique | ||
| private static void iris$maybeSuppressShadow(CallbackInfo ci) { | ||
| @Inject(method = "shouldRenderShadows", at = @At("RETURN"), cancellable = true) | ||
| private void iris$shouldRenderShadows(CallbackInfoReturnable<Boolean> cir) { | ||
| WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable(); | ||
|
|
||
| if (pipeline != null && pipeline.shouldDisableVanillaEntityShadows()) { | ||
| ci.cancel(); | ||
| cir.setReturnValue(false); | ||
| } | ||
| } | ||
| } |
198 changes: 92 additions & 106 deletions
198
common/src/shaders/java/net/coderbot/iris/mixin/MixinGameRenderer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,141 +1,127 @@ | ||
| package net.coderbot.iris.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.wrapoperation.Operation; | ||
| import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; | ||
| import com.llamalad7.mixinextras.sugar.Share; | ||
| import com.llamalad7.mixinextras.sugar.ref.LocalRef; | ||
| import com.mojang.blaze3d.platform.GLX; | ||
| import com.mojang.blaze3d.vertex.PoseStack; | ||
| import net.coderbot.iris.Iris; | ||
| import net.coderbot.iris.gl.program.Program; | ||
| import net.coderbot.iris.pipeline.HandRenderer; | ||
| import net.coderbot.iris.pipeline.WorldRenderingPhase; | ||
| import net.coderbot.iris.pipeline.WorldRenderingPipeline; | ||
| import net.coderbot.iris.uniforms.CapturedRenderingState; | ||
| import net.coderbot.iris.uniforms.SystemTimeUniforms; | ||
| import net.coderbot.iris.vendored.joml.Matrix4f; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.option.GameOptions; | ||
| import net.minecraft.client.render.Camera; | ||
| import net.minecraft.client.render.GameRenderer; | ||
| import net.minecraft.client.render.WorldRenderer; | ||
| import net.minecraft.client.render.item.HeldItemRenderer; | ||
| import net.minecraft.resource.ResourceManager; | ||
| import net.coderbot.iris.vendored.joml.Matrix4f; | ||
| import org.lwjgl.opengl.GL11; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.*; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(GameRenderer.class) | ||
| public class MixinGameRenderer { | ||
| @Shadow | ||
| private MinecraftClient client; | ||
| @Shadow | ||
| public float fogRed; | ||
| @Shadow | ||
| public float fogBlue; | ||
| @Shadow | ||
| public float fogGreen; | ||
| @Unique | ||
| private WorldRenderingPipeline pipeline; | ||
|
|
||
| @Inject(method = "<init>", at = @At("TAIL")) | ||
| @Inject(method = "<init>", at = @At("TAIL")) | ||
| private void iris$logSystem(MinecraftClient minecraftClient, ResourceManager resourceManager, CallbackInfo ci) { | ||
| Iris.logger.info("Hardware information:"); | ||
| Iris.logger.info("CPU: " + GLX.getProcessor()); | ||
| Iris.logger.info("GPU: " + GL11.glGetString(7937) + " (Supports OpenGL " + GL11.glGetString(7938) + ")"); | ||
| Iris.logger.info("GPU: " + GL11.glGetString(GL11.GL_RENDERER) + " (Supports OpenGL " + GL11.glGetString(GL11.GL_VERSION) + ")"); | ||
| Iris.logger.info("OS: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ")"); | ||
| } | ||
|
|
||
| @Redirect(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderArmHoldingItem(F)V")) | ||
| private void disableVanillaHandRendering(HeldItemRenderer instance, float tickDelta) { | ||
| if (Iris.getCurrentPack().isPresent()) { | ||
| return; | ||
| } | ||
|
|
||
| instance.renderArmHoldingItem(tickDelta); | ||
| } | ||
|
|
||
| @Unique | ||
| private WorldRenderingPipeline pipeline; | ||
|
|
||
|
|
||
| // Begin shader rendering after buffers have been cleared. | ||
| // At this point we've ensured that Minecraft's main framebuffer is cleared. | ||
| // This is important or else very odd issues will happen with shaders that have a final pass that doesn't write to | ||
| // all pixels. | ||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;clear(I)V", shift = At.Shift.AFTER)) | ||
| private void iris$beginLevelRender(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| if (Iris.isSodiumInvalid()) { | ||
| throw new IllegalStateException("An invalid version of Sodium is installed, and the warning screen somehow" + | ||
| " didn't work. This is a bug! Please report it to the Iris developers."); | ||
| } | ||
|
|
||
| CapturedRenderingState.INSTANCE.setGbufferModelView(new Matrix4f(Camera.MODEL_MATRIX)); | ||
| CapturedRenderingState.INSTANCE.setGbufferProjection(new Matrix4f(Camera.PROJECTION_MATRIX)); | ||
| CapturedRenderingState.INSTANCE.setTickDelta(tickDelta); | ||
| SystemTimeUniforms.COUNTER.beginFrame(); | ||
| SystemTimeUniforms.TIMER.beginFrame(limitTime); | ||
|
|
||
| Program.unbind(); | ||
|
|
||
| pipeline = Iris.getPipelineManager().preparePipeline(Iris.getCurrentDimension()); | ||
|
|
||
| pipeline.beginLevelRendering(); | ||
| } | ||
|
|
||
| // Inject a bit early so that we can end our rendering before mods like VoxelMap (which inject at RETURN) | ||
| // render their waypoint beams. | ||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "RETURN", shift = At.Shift.BEFORE)) | ||
| private void iris$endLevelRender(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| HandRenderer.INSTANCE.renderTranslucent(tickDelta, (GameRenderer) (Object) this, pipeline); | ||
| MinecraftClient.getInstance().profiler.swap("iris_final"); | ||
| pipeline.finalizeLevelRendering(); | ||
| pipeline = null; | ||
| Program.unbind(); | ||
| } | ||
|
|
||
| // Setup shadow terrain & render shadows before the main terrain setup. We need to do things in this order to | ||
| // avoid breaking other mods such as Light Overlay: https://github.com/IrisShaders/Iris/issues/1356 | ||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;setupCamera(FI)V")) | ||
| private void iris$renderTerrainShadows(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| pipeline.renderShadows((LevelRendererAccessor) MinecraftClient.getInstance().worldRenderer); | ||
| } | ||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;renderSky(FI)V")) | ||
| private void iris$beginSky(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| // Use CUSTOM_SKY until levelFogColor is called as a heuristic to catch FabricSkyboxes. | ||
| pipeline.setPhase(WorldRenderingPhase.CUSTOM_SKY); | ||
| } | ||
|
|
||
| @Redirect(method = "renderWorld(IFJ)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;viewDistance:I")) | ||
| private int iris$alwaysRenderSky(GameOptions instance) { | ||
| return Math.max(instance.viewDistance, 4); | ||
| } | ||
|
|
||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderWeather(F)V")) | ||
| private void iris$beginWeather(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| Iris.getPipelineManager().getPipelineNullable().setPhase(WorldRenderingPhase.RAIN_SNOW); | ||
| } | ||
|
|
||
| @ModifyArg(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;depthMask(Z)V", ordinal = 0)) | ||
| private boolean iris$writeRainAndSnowToDepthBuffer(boolean depthMaskEnabled) { | ||
| if (Iris.getPipelineManager().getPipelineNullable().shouldWriteRainAndSnowToDepthBuffer()) { | ||
| return true; | ||
| } | ||
|
|
||
| return depthMaskEnabled; | ||
| } | ||
|
|
||
| // Begin shader rendering after buffers have been cleared. | ||
| // At this point we've ensured that Minecraft's main framebuffer is cleared. | ||
| // This is important or else very odd issues will happen with shaders that have a final pass that doesn't write to | ||
| // all pixels. | ||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/CameraView;setPos(DDD)V", shift = At.Shift.AFTER)) | ||
| private void iris$beginLevelRender(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| if (Iris.isSodiumInvalid()) { | ||
| throw new IllegalStateException("An invalid version of Sodium is installed, and the warning screen somehow" + | ||
| " didn't work. This is a bug! Please report it to the Iris developers."); | ||
| } | ||
|
|
||
| CapturedRenderingState.INSTANCE.setGbufferModelView(new Matrix4f(Camera.MODEL_MATRIX)); | ||
| CapturedRenderingState.INSTANCE.setGbufferProjection(new Matrix4f(Camera.PROJECTION_MATRIX)); | ||
| CapturedRenderingState.INSTANCE.setTickDelta(tickDelta); | ||
| CapturedRenderingState.INSTANCE.setFogColor(this.fogRed, this.fogGreen, this.fogBlue); | ||
| SystemTimeUniforms.COUNTER.beginFrame(); | ||
| SystemTimeUniforms.TIMER.beginFrame(limitTime); | ||
|
|
||
| Program.unbind(); | ||
|
|
||
| pipeline = Iris.getPipelineManager().preparePipeline(Iris.getCurrentDimension()); | ||
|
|
||
| pipeline.beginLevelRendering(); | ||
| } | ||
|
|
||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "RETURN")) | ||
| private void iris$endLevelRender(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| // TODO: Iris | ||
| HandRenderer.INSTANCE.renderTranslucent(tickDelta, this.client.gameRenderer, pipeline); | ||
| MinecraftClient.getInstance().profiler.swap("iris_final"); | ||
| pipeline.finalizeLevelRendering(); | ||
| Program.unbind(); | ||
| } | ||
|
|
||
| @WrapOperation(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderArmHoldingItem(F)V")) | ||
| private void iris$disableVanillaRenderHand(HeldItemRenderer instance, float tickDelta, Operation<Void> original) { | ||
| if (Iris.getCurrentPack().isEmpty()) { | ||
| original.call(instance, tickDelta); | ||
| } | ||
| } | ||
|
|
||
| @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;setupTerrain(Lnet/minecraft/entity/Entity;DLnet/minecraft/client/render/CameraView;IZ)V", shift = At.Shift.AFTER), method = "renderWorld(IFJ)V") | ||
| private void iris$beginEntities(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| pipeline.renderShadows((LevelRendererAccessor) this.client.worldRenderer); | ||
| } | ||
|
|
||
|
|
||
| @Redirect(method = "renderWorld(IFJ)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;viewDistance:I")) | ||
| private int iris$alwaysRenderSky(GameOptions instance) { | ||
| return Math.max(instance.viewDistance, 4); | ||
| } | ||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;renderSky(FI)V")) | ||
| private void iris$beginSky(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| // Use CUSTOM_SKY until levelFogColor is called as a heuristic to catch FabricSkyboxes. | ||
| pipeline.setPhase(WorldRenderingPhase.CUSTOM_SKY); | ||
| } | ||
|
|
||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;renderSky(FI)V", shift = At.Shift.AFTER)) | ||
| private void iris$endSky(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| pipeline.setPhase(WorldRenderingPhase.NONE); | ||
| } | ||
|
|
||
| @WrapOperation(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderClouds(Lnet/minecraft/client/render/WorldRenderer;FI)V")) | ||
| private void iris$clouds(GameRenderer instance, WorldRenderer worldRenderer, float tickDelta, int anaglyphFilter, Operation<Void> original) { | ||
| pipeline.setPhase(WorldRenderingPhase.CLOUDS); | ||
| original.call(instance, worldRenderer, tickDelta, anaglyphFilter); | ||
| pipeline.setPhase(WorldRenderingPhase.NONE); | ||
| } | ||
|
|
||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderWeather(F)V")) | ||
| private void iris$beginWeatherAndwriteRainAndSnowToDepthBuffer(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| pipeline.setPhase(WorldRenderingPhase.RAIN_SNOW); | ||
| if (pipeline.shouldWriteRainAndSnowToDepthBuffer()) { | ||
| GL11.glDepthMask(true); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderWeather(F)V", shift = At.Shift.AFTER)) | ||
| private void iris$endWeather(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| pipeline.setPhase(WorldRenderingPhase.NONE); | ||
| } | ||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderWeather(F)V", shift = At.Shift.AFTER)) | ||
| private void iris$endWeather(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| Iris.getPipelineManager().getPipelineNullable().setPhase(WorldRenderingPhase.NONE); | ||
| } | ||
|
|
||
| @Inject(method = "renderWorld(IFJ)V", at = @At(value = "CONSTANT", args = "stringValue=translucent")) | ||
| private void iris$beginTranslucents(int anaglyphFilter, float tickDelta, long limitTime, CallbackInfo ci) { | ||
| Iris.getPipelineManager().getPipelineNullable().beginHand(); | ||
| HandRenderer.INSTANCE.renderSolid(tickDelta, (GameRenderer) (Object) this, pipeline); | ||
| MinecraftClient.getInstance().profiler.swap("iris_pre_translucent"); | ||
| Iris.getPipelineManager().getPipelineNullable().beginTranslucents(); | ||
| } | ||
| } |
Oops, something went wrong.