From 6a4f8e9f4b9e1c5ca02843e12a514e175a07d5ce Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jun 2016 10:37:32 -0500 Subject: [PATCH] Switch some things to tessellator --- .../handler/TooltipAdditionDisplayHandler.java | 18 +++++++++++------- .../client/core/helper/RenderHelper.java | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 7c1dcdcc9..344e44df7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -17,6 +17,9 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; @@ -122,19 +125,20 @@ public final class TooltipAdditionDisplayHandler { GlStateManager.shadeModel(GL11.GL_SMOOTH); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glBegin(GL11.GL_TRIANGLE_FAN); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - GlStateManager.color(0F, 0.5F, 0F, a); - GL11.glVertex2i(cx, cy); - GlStateManager.color(0F, 1F, 0F, 1F); + buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); for(float i = angles; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; - GL11.glVertex2d(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r); + buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); } - GL11.glVertex2i(cx, cy); - GL11.glEnd(); + + buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); + Tessellator.getInstance().draw(); GlStateManager.disableBlend(); GlStateManager.enableTexture2D(); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 926cdef19..3db962e08 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; @@ -220,16 +221,19 @@ public final class RenderHelper { GlStateManager.depthMask(true); GL11.glStencilMask(0x00); GL11.glStencilFunc(GL11.GL_EQUAL, 1, 0xFF); - GL11.glBegin(GL11.GL_TRIANGLE_FAN); - GlStateManager.color(0F, 0.5F, 0.5F, a); - GL11.glVertex2i(centerX, centerY); - GlStateManager.color(0F, 1F, 0.5F, a); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + buf.pos(centerX, centerY, 0).color(0, 0.5F, 0.5F, a).endVertex(); + for(int i = degs; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; - GL11.glVertex2d(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r); + buf.pos(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r, 0).color(0F, 1F, 0.5F, a).endVertex(); } - GL11.glVertex2i(centerX, centerY); - GL11.glEnd(); + + buf.pos(centerX, centerY, 0).color(0F, 1F, 0.5F, a).endVertex(); + Tessellator.getInstance().draw(); + GlStateManager.disableBlend(); GlStateManager.enableTexture2D(); GlStateManager.shadeModel(GL11.GL_FLAT);