fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all calls to GlStateManager.pushAttrib() and pullAttrib() and a few other tweaks to gl calls, fixes #12, #46 and #47

Browse Source
This commit is contained in:
Electroblob
2018-06-03 12:39:25 +01:00
parent ee6f0cfe70
commit d4579b9184
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java
-4
View File
@@ -80,8 +80,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
@Override @Override
public void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY){ public void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY){
GlStateManager.pushAttrib();
GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.color(1F, 1F, 1F, 1F);
Minecraft.getMinecraft().renderEngine.bindTexture(texture); Minecraft.getMinecraft().renderEngine.bindTexture(texture);
@@ -152,8 +150,6 @@ public class GuiArcaneWorkbench extends GuiContainer {
// Fixes the bug that caused the slot hightlight to render opaque. I don't know why it works, it just works! // Fixes the bug that caused the slot hightlight to render opaque. I don't know why it works, it just works!
GlStateManager.disableBlend(); GlStateManager.disableBlend();
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
GlStateManager.popAttrib();
} }
@Override @Override
src/main/java/electroblob/wizardry/client/GuiSpellDisplay.java
+2 -4
View File
@@ -122,8 +122,6 @@ public class GuiSpellDisplay extends Gui {
}else if(event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR){ }else if(event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR){
GlStateManager.pushAttrib();
GlStateManager.enableBlend(); GlStateManager.enableBlend();
GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
GlStateManager.color(1, 1, 1); GlStateManager.color(1, 1, 1);
@@ -146,8 +144,8 @@ public class GuiSpellDisplay extends Gui {
this.mc.renderEngine.bindTexture(discovered ? spell.getIcon() : Spells.none.getIcon()); this.mc.renderEngine.bindTexture(discovered ? spell.getIcon() : Spells.none.getIcon());
WizardryUtilities.drawTexturedRect(mirror ? left + 94 : left + 2, top + 2, 0, 0, 32, 32, 32, 32); WizardryUtilities.drawTexturedRect(mirror ? left + 94 : left + 2, top + 2, 0, 0, 32, 32, 32, 32);
GlStateManager.popAttrib(); // Blend needs to be left enabled here because otherwise the hotbar becomes opaque
} }
} }
src/main/java/electroblob/wizardry/client/particle/ParticleCustomTexture.java
-2
View File
@@ -143,7 +143,6 @@ public abstract class ParticleCustomTexture extends Particle {
float rotationYZ, float rotationXY, float rotationXZ){ float rotationYZ, float rotationXY, float rotationXZ){
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.pushAttrib();
this.applyGLStateChanges(); this.applyGLStateChanges();
@@ -193,7 +192,6 @@ public abstract class ParticleCustomTexture extends Particle {
this.undoGLStateChanges(); this.undoGLStateChanges();
GlStateManager.popAttrib();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }