mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 12:29:40 +00:00
Remove silly early initial implementation and fix star VBO (#206)
* Remove silly early initial implementation and fix star VBO
This commit is contained in:
1 parent
5f6c418315
commit
d53a85e013
3 files changed
+7
-28
No files matched your search
+2
-10
@@ -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="<init>", 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="<init>", 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="<init>", 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="<init>", 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="<init>", 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="<init>", 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));
|
||||
|
||||
-14
@@ -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();
|
||||
|
||||
|
||||
}
|
||||
@@ -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() {
|
||||
|
||||
Reference in new issue
Block a user