From 4cca08af799d802b68f64862c886dc966ae66d6e Mon Sep 17 00:00:00 2001 From: marcin212 Date: Fri, 21 Oct 2016 18:06:45 +0200 Subject: [PATCH] Fix flickering GUI --- .../dictionary/ControlBlockIconDisplay.java | 9 +-- .../kitchen/ControlFluidDisplay.java | 72 ++++++++++--------- .../craftgui/minecraft/GuiCraftGUI.java | 38 +++++----- 3 files changed, 62 insertions(+), 57 deletions(-) diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java index b10d0e82..88c4844b 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java @@ -1,20 +1,21 @@ package binnie.craftgui.extratrees.dictionary; import binnie.craftgui.controls.core.Control; +import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; +import binnie.craftgui.core.geometry.IPoint; import net.minecraft.client.renderer.texture.TextureAtlasSprite; public class ControlBlockIconDisplay extends Control { - //IIcon icon; + TextureAtlasSprite icon; public ControlBlockIconDisplay(final IWidget parent, final float x, final float y, final TextureAtlasSprite icon) { super(parent, x, y, 18.0f, 18.0f); - //this.icon = icon; + this.icon = icon; } @Override public void onRenderBackground() { - //TODO RENDERING - //CraftGUI.Render.iconBlock(IPoint.ZERO, this.icon); + CraftGUI.Render.iconBlock(IPoint.ZERO, this.icon); } } diff --git a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java b/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java index da7c8a49..7e7d2a46 100644 --- a/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java +++ b/src/main/java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java @@ -1,11 +1,15 @@ package binnie.craftgui.extratrees.kitchen; import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; +import binnie.craftgui.core.*; +import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.minecraft.Window; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.client.FMLClientHandler; +import org.lwjgl.opengl.GL11; public class ControlFluidDisplay extends Control implements ITooltip { FluidStack itemStack; @@ -36,36 +40,36 @@ public class ControlFluidDisplay extends Control implements ITooltip { @Override public void onRenderForeground() { - //TODO RENDERING -// if (this.itemStack == null) { -// return; -// } -// final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition()); -// if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { -// return; -// } -// if (this.itemStack != null) { -// final Fluid fluid = this.itemStack.getFluid(); -// final int hex = fluid.getColor(this.itemStack); -// final int r = (hex & 0xFF0000) >> 16; -// final int g = (hex & 0xFF00) >> 8; -// final int b = hex & 0xFF; -// final IIcon icon = this.itemStack.getFluid().getIcon(this.itemStack); -// GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); -// GL11.glEnable(3042); -// GL11.glBlendFunc(770, 771); -// if (this.getSize().x() != 16.0f) { -// GL11.glPushMatrix(); -// final float scale = this.getSize().x() / 16.0f; -// GL11.glScalef(scale, scale, 1.0f); -// CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack)); -// GL11.glPopMatrix(); -// } -// else { -// CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack)); -// } -// GL11.glDisable(3042); -// } + if (this.itemStack == null) { + return; + } + final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition()); + if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { + return; + } + if (this.itemStack != null) { + final Fluid fluid = this.itemStack.getFluid(); + final int hex = fluid.getColor(this.itemStack); + final int r = (hex & 0xFF0000) >> 16; + final int g = (hex & 0xFF00) >> 8; + final int b = hex & 0xFF; + final ResourceLocation iconRL = this.itemStack.getFluid().getStill(); + TextureAtlasSprite icon = FMLClientHandler.instance().getClient().getTextureMapBlocks().getAtlasSprite(iconRL.toString()); + GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); + GL11.glEnable(3042); + GL11.glBlendFunc(770, 771); + if (this.getSize().x() != 16.0f) { + GL11.glPushMatrix(); + final float scale = this.getSize().x() / 16.0f; + GL11.glScalef(scale, scale, 1.0f); + CraftGUI.Render.iconBlock(IPoint.ZERO, icon); + GL11.glPopMatrix(); + } + else { + CraftGUI.Render.iconBlock(IPoint.ZERO, icon); + } + GL11.glDisable(3042); + } } public void setItemStack(final FluidStack itemStack) { diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index a8addb62..514e74aa 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -11,6 +11,7 @@ import binnie.craftgui.events.EventKey; import binnie.craftgui.events.EventMouse; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; @@ -80,17 +81,15 @@ public class GuiCraftGUI extends GuiContainer { public void drawScreen(final int mouseX, final int mouseY, final float par3) { this.window.setMousePosition(mouseX - (int) this.window.getPosition().x(), mouseY - (int) this.window.getPosition().y()); this.drawDefaultBackground(); - GL11.glDisable(32826); RenderHelper.disableStandardItemLighting(); GL11.glDisable(2896); GL11.glDisable(2929); this.zLevel = 10.0f; //GuiScreen.itemRender.zLevel = this.zLevel; - this.window.render(); - RenderHelper.enableGUIStandardItemLighting(); + GL11.glPushMatrix(); GL11.glEnable(32826); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f); @@ -98,8 +97,8 @@ public class GuiCraftGUI extends GuiContainer { this.draggedItem = playerInventory.getItemStack(); if (this.draggedItem != null) { this.renderItem(new IPoint(mouseX - 8, mouseY - 8), this.draggedItem, 200, false); - this.renderItem(new IPoint(mouseX - 8, mouseY - 8), this.draggedItem, 200, false); } + RenderHelper.enableGUIStandardItemLighting(); GL11.glDisable(32826); GL11.glPopMatrix(); GL11.glDisable(2896); @@ -364,15 +363,14 @@ public class GuiCraftGUI extends GuiContainer { GL11.glDisable(3008); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glShadeModel(7425); -// final Tessellator tessellator = Tessellator.instance; -// tessellator.startDrawingQuads(); -// tessellator.setColorRGBA_F(f2, f3, f4, f); -// tessellator.addVertex(p_73733_3_, p_73733_2_, this.zLevel); -// tessellator.addVertex(p_73733_1_, p_73733_2_, this.zLevel); -// tessellator.setColorRGBA_F(f6, f7, f8, f5); -// tessellator.addVertex(p_73733_1_, p_73733_4_, this.zLevel); -// tessellator.addVertex(p_73733_3_, p_73733_4_, this.zLevel); -// tessellator.draw(); + final Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer vb = tessellator.getBuffer(); + vb.begin(7, DefaultVertexFormats.POSITION_COLOR); + vb.pos(p_73733_3_, p_73733_2_, this.zLevel).color(f2, f3, f4, f).endVertex(); + vb.pos(p_73733_1_, p_73733_2_, this.zLevel).color(f2, f3, f4, f).endVertex(); + vb.pos(p_73733_1_, p_73733_4_, this.zLevel).color(f6, f7, f8, f5).endVertex(); + vb.pos(p_73733_3_, p_73733_4_, this.zLevel).color(f6, f7, f8, f5).endVertex(); + tessellator.draw(); GL11.glShadeModel(7424); GL11.glDisable(3042); GL11.glEnable(3008); @@ -501,13 +499,15 @@ public class GuiCraftGUI extends GuiContainer { GL11.glDisable(3553); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glColor4f(f4, f5, f6, f3); - tessellator.getBuffer().begin(GL11.GL_QUADS, new VertexFormat()); - tessellator.getBuffer(). - pos(p_73734_0_, p_73734_3_, 0.0) - .pos(p_73734_2_, p_73734_3_, 0.0) - .pos(p_73734_2_, p_73734_1_, 0.0) - .pos(p_73734_0_, p_73734_1_, 0.0).endVertex(); + + VertexBuffer vertexBuffer = tessellator.getBuffer(); + vertexBuffer.begin(7, DefaultVertexFormats.POSITION); + vertexBuffer.pos(p_73734_0_, p_73734_3_, 0.0).endVertex(); + vertexBuffer.pos(p_73734_2_, p_73734_3_, 0.0).endVertex(); + vertexBuffer.pos(p_73734_2_, p_73734_1_, 0.0).endVertex(); + vertexBuffer.pos(p_73734_0_, p_73734_1_, 0.0).endVertex(); tessellator.draw(); + GL11.glEnable(3553); GL11.glDisable(3042); }