From f2425a693a1c557725b27c276228c7cd7f3d3be1 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 6 Mar 2022 14:07:03 +0100 Subject: [PATCH] DRY (Iris)ODSFrameCapturer --- .../render/capturer/IrisODSFrameCapturer.java | 26 +------------------ .../render/capturer/ODSFrameCapturer.java | 26 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/replaymod/render/capturer/IrisODSFrameCapturer.java b/src/main/java/com/replaymod/render/capturer/IrisODSFrameCapturer.java index 2dd2d269..0f581d99 100644 --- a/src/main/java/com/replaymod/render/capturer/IrisODSFrameCapturer.java +++ b/src/main/java/com/replaymod/render/capturer/IrisODSFrameCapturer.java @@ -1,7 +1,6 @@ //#if MC>=11600 package com.replaymod.render.capturer; -import com.mojang.blaze3d.platform.GlStateManager; import com.replaymod.render.RenderSettings; import com.replaymod.render.frame.CubicOpenGlFrame; import com.replaymod.render.frame.ODSOpenGlFrame; @@ -16,12 +15,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static com.replaymod.core.versions.MCVer.popMatrix; -import static com.replaymod.core.versions.MCVer.pushMatrix; -import static com.replaymod.core.versions.MCVer.resizeMainWindow; -import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; -import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; - public class IrisODSFrameCapturer implements FrameCapturer { public static final String SHADER_PACK_NAME = "assets/replaymod/iris/ods"; @@ -135,25 +128,8 @@ public class IrisODSFrameCapturer implements FrameCapturer { @Override protected OpenGlFrame renderFrame(int frameId, float partialTicks, CubicOpenGlFrameCapturer.Data captureData) { - resizeMainWindow(mc, getFrameWidth(), getFrameHeight()); - - pushMatrix(); - frameBuffer().beginWrite(true); - - GlStateManager.clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT - //#if MC>=11400 - , false - //#endif - ); - GlStateManager.enableTexture(); - direction = captureData.ordinal(); - worldRenderer.renderWorld(partialTicks, null); - - frameBuffer().endWrite(); - popMatrix(); - - return captureFrame(frameId, captureData); + return super.renderFrame(frameId, partialTicks, null); } } } diff --git a/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java b/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java index 4df2fa18..c0ec8c3d 100644 --- a/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java +++ b/src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java @@ -1,6 +1,5 @@ package com.replaymod.render.capturer; -import com.mojang.blaze3d.platform.GlStateManager; import com.replaymod.render.rendering.Channel; import de.johni0702.minecraft.gui.utils.EventRegistrations; import com.replaymod.render.RenderSettings; @@ -20,12 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static com.replaymod.core.versions.MCVer.popMatrix; -import static com.replaymod.core.versions.MCVer.pushMatrix; -import static com.replaymod.core.versions.MCVer.resizeMainWindow; -import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; -import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; - public class ODSFrameCapturer implements FrameCapturer { private static final Identifier vertexResource = new Identifier("replaymod", "shader/ods.vert"); private static final Identifier fragmentResource = new Identifier("replaymod", "shader/ods.frag"); @@ -166,25 +159,8 @@ public class ODSFrameCapturer implements FrameCapturer { @Override protected OpenGlFrame renderFrame(int frameId, float partialTicks, CubicOpenGlFrameCapturer.Data captureData) { - resizeMainWindow(mc, getFrameWidth(), getFrameHeight()); - - pushMatrix(); - frameBuffer().beginWrite(true); - - GlStateManager.clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT - //#if MC>=11400 - , false - //#endif - ); - GlStateManager.enableTexture(); - directionVariable.set(captureData.ordinal()); - worldRenderer.renderWorld(partialTicks, null); - - frameBuffer().endWrite(); - popMatrix(); - - return captureFrame(frameId, captureData); + return super.renderFrame(frameId, partialTicks, null); } } }