From d53a85e0130d12804d01669a5169bbce0ab28fc3 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Thu, 18 Jan 2024 14:55:52 -0800 Subject: [PATCH] Remove silly early initial implementation and fix star VBO (#206) * Remove silly early initial implementation and fix star VBO --- .../early/angelica/vbo/MixinRenderGlobal.java | 12 ++---------- .../mixins/interfaces/IRenderGlobalVBOCapture.java | 14 -------------- src/main/java/jss/notfine/render/RenderStars.java | 9 +++++---- 3 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalVBOCapture.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java index e03ec8a8c..0250ae4f7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/vbo/MixinRenderGlobal.java @@ -4,7 +4,6 @@ import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.glsm.TessellatorManager; import com.gtnewhorizons.angelica.glsm.VBOManager; -import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalVBOCapture; import com.gtnewhorizons.angelica.render.CloudRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; @@ -20,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = RenderGlobal.class) -public class MixinRenderGlobal implements IRenderGlobalVBOCapture { +public class MixinRenderGlobal { @Shadow public int starGLCallList; @Shadow private int glSkyList; @Shadow private int glSkyList2; @@ -38,13 +37,10 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture { return VBOManager.generateDisplayLists(range); } - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 0), remap = false) public void startStarsVBO(int list, int mode) { TessellatorManager.startCapturing(); } - - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 0), remap = false) public void finishStarsVBO() { VBOManager.registerVBO(starGLCallList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION)); @@ -56,25 +52,21 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture { return TessellatorManager.get(); } - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 1), remap = false) public void startSkyVBO(int list, int mode) { - // Do nothing, we'll be making a VBO instead. + // Do nothing, we'll be making a VBO instead and already started the capturing above } - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 1), remap = false) public void finishSkyVBO() { VBOManager.registerVBO(glSkyList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION)); } - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 2), remap = false) public void startSky2VBO(int list, int mode) { TessellatorManager.startCapturing(); } - @Override @Redirect(method="", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 2), remap = false) public void finishSky2VBO() { VBOManager.registerVBO(glSkyList2, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION)); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalVBOCapture.java b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalVBOCapture.java deleted file mode 100644 index 4cea94ae2..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalVBOCapture.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; - -public interface IRenderGlobalVBOCapture { - void startStarsVBO(int list, int mode); - void finishStarsVBO(); - - void startSkyVBO(int list, int mode); - void finishSkyVBO(); - - void startSky2VBO(int list, int mode); - void finishSky2VBO(); - - -} diff --git a/src/main/java/jss/notfine/render/RenderStars.java b/src/main/java/jss/notfine/render/RenderStars.java index 53104a490..e6206afe6 100644 --- a/src/main/java/jss/notfine/render/RenderStars.java +++ b/src/main/java/jss/notfine/render/RenderStars.java @@ -1,20 +1,21 @@ package jss.notfine.render; -import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalVBOCapture; +import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat; +import com.gtnewhorizons.angelica.glsm.TessellatorManager; +import com.gtnewhorizons.angelica.glsm.VBOManager; import jss.notfine.core.Settings; import jss.util.RandomXoshiro256StarStar; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.Tessellator; -import org.lwjgl.opengl.GL11; public class RenderStars { //private static final ResourceLocation locationStarsPng = new ResourceLocation("textures/colormap/stars.png"); public static void reloadStarRenderList(RenderGlobal render) { - ((IRenderGlobalVBOCapture)render).startStarsVBO(render.starGLCallList, GL11.GL_COMPILE); + TessellatorManager.startCapturing(); renderStars(); - ((IRenderGlobalVBOCapture)render).finishStarsVBO(); + VBOManager.registerVBO(render.starGLCallList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION)); } public static void renderStars() {