Skip to content

Fix overlay rendering #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CrystalMageX wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix overlay rendering #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8177502
Fix Rendering Order
CrystalMageX May 11, 2016
3485ba4
Let "literally nothing else render" when washout is active
CrystalMageX May 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Auxiliary/ChromaHelpHUD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import Reika.DragonAPI.Libraries.ReikaPlayerAPI;
import Reika.DragonAPI.Libraries.IO.ReikaRenderHelper;
import Reika.DragonAPI.Libraries.IO.ReikaTextureHelper;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
Expand Down Expand Up @@ -54,8 +55,8 @@ private ChromaHelpHUD() {

}

@SubscribeEvent
public void renderHUD(RenderGameOverlayEvent evt) {
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void renderHUD(RenderGameOverlayEvent.Post evt) {
if (evt.type == ElementType.HELMET) {
EntityPlayer ep = Minecraft.getMinecraft().thePlayer;
boolean recalc = ep.ticksExisted%8 == 0; //Only update 1/8 ticks, to help FPS
Expand Down
118 changes: 72 additions & 46 deletions Auxiliary/ChromaOverlays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public class ChromaOverlays {

private static final RenderItem itemRender = new RenderItem();

private boolean holding = false;
private int tick = 0;

private final EnumMap<CrystalElement, Float> factors = new EnumMap(CrystalElement.class);
Expand Down Expand Up @@ -152,66 +151,85 @@ public void renderInWorld(EntityRenderingLoopEvent evt) {
*/
}

@SubscribeEvent(priority = EventPriority.HIGH, receiveCanceled = true) //Not highest because of Dualhotbar
public void renderHUD(RenderGameOverlayEvent.Pre evt) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();
@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void renderWashoutHook(RenderGameOverlayEvent.Pre evt) {
tick++;

if ((washout > 0) && (evt.type == ElementType.HELMET)) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();

this.renderWashout(evt);
evt.setCanceled(true); // Let literally nothing else render

GL11.glPopMatrix();
GL11.glPopAttrib();
}
}

@SubscribeEvent(priority = EventPriority.HIGH) //Not highest because of Dualhotbar
public void renderBackground(RenderGameOverlayEvent.Pre evt) {
EntityPlayer ep = Minecraft.getMinecraft().thePlayer;
ItemStack is = ep.getCurrentEquippedItem();
if (evt.type == ElementType.HEALTH && Chromabilities.HEALTH.enabledOn(ep)) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();

if (evt.type == ElementType.HELMET) {
if (washout > 0) {
this.renderWashout(evt);
//evt.setCanceled(true);
this.renderBoostedHealthBar(evt, ep);

return;
GL11.glPopMatrix();
GL11.glPopAttrib();
} else {
int gsc = evt.resolution.getScaleFactor();
ItemStack is = ep.getCurrentEquippedItem();

if (evt.type == ElementType.HELMET) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();

if (ChromaItems.TOOL.matchWith(is)) {
this.syncBuffer(ep);
this.renderElementPie(ep, gsc);
this.renderTileOverlays(ep, gsc);
}
if (ChromaItems.OREPICK.matchWith(is)) {
this.renderOreHUD(ep, evt.resolution, is);
} else if (ChromaItems.TRANSITION.matchWith(is)) {
this.renderTransitionHUD(ep, evt.resolution, is);
}
if (PylonGenerator.instance.canGenerateIn(ep.worldObj)) {
this.renderPylonAura(ep, gsc);
}
this.renderPingOverlays(ep, gsc);

GL11.glPopMatrix();
GL11.glPopAttrib();
} else if (evt.type == ElementType.CROSSHAIRS) {
if (ChromaItems.TOOL.matchWith(is)) {
this.renderCustomCrosshair(evt);
} else if (ChromaItems.KILLAURAGUN.matchWith(is)) {
this.renderKillAuraCrosshair(evt, gsc);
}
}
}
}

int gsc = evt.resolution.getScaleFactor();
@SubscribeEvent(priority = EventPriority.HIGH)
public void renderForeground(RenderGameOverlayEvent.Post evt) {
if (evt.type == ElementType.HELMET) {
if (ChromaItems.TOOL.matchWith(is)) {
if (!holding)
this.syncBuffer(ep);
holding = true;
this.renderElementPie(ep, gsc);
this.renderTileOverlays(ep, gsc);
}
else {
holding = false;
}
if (ChromaItems.OREPICK.matchWith(is)) {
this.renderOreHUD(ep, evt.resolution, is);
}
else if (ChromaItems.TRANSITION.matchWith(is)) {
this.renderTransitionHUD(ep, evt.resolution, is);
}
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();
GL11.glTranslated(0, 0, FRONT_TRANSLATE);

EntityPlayer ep = Minecraft.getMinecraft().thePlayer;
int gsc = evt.resolution.getScaleFactor();

this.renderAbilityStatus(ep, gsc);
GL11.glPopMatrix();
if (PylonGenerator.instance.canGenerateIn(ep.worldObj))
this.renderPylonAura(ep, gsc);
this.renderPingOverlays(ep, gsc);
GL11.glPushMatrix();
GL11.glTranslated(0, 0, FRONT_TRANSLATE);
this.renderProgressOverlays(ep, gsc);
this.renderStructureText(ep, gsc);
this.renderFlareMessages(gsc);

GL11.glPopMatrix();
GL11.glPopAttrib();
}
else if (evt.type == ElementType.CROSSHAIRS && ChromaItems.TOOL.matchWith(is)) {
this.renderCustomCrosshair(evt);
}
else if (evt.type == ElementType.CROSSHAIRS && ChromaItems.KILLAURAGUN.matchWith(is)) {
this.renderKillAuraCrosshair(evt, gsc);
}
else if (evt.type == ElementType.HEALTH && Chromabilities.HEALTH.enabledOn(ep)) {
this.renderBoostedHealthBar(evt, ep);
}
GL11.glPopMatrix();
GL11.glPopAttrib();
}

public boolean isWashoutActive() {
Expand Down Expand Up @@ -613,6 +631,9 @@ private void renderPylonAura(EntityPlayer ep, int gsc) {
}

private void renderCustomCrosshair(RenderGameOverlayEvent.Pre evt) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();

ReikaTextureHelper.bindFinalTexture(ChromatiCraft.class, "Textures/crosshair.png");
GL11.glEnable(GL11.GL_BLEND);
BlendMode.ADDITIVEDARK.apply();
Expand All @@ -633,10 +654,14 @@ private void renderCustomCrosshair(RenderGameOverlayEvent.Pre evt) {
BlendMode.DEFAULT.apply();
//GL11.glDisable(GL11.GL_BLEND);
evt.setCanceled(true);

GL11.glPopMatrix();
GL11.glPopAttrib();
}

private void renderKillAuraCrosshair(RenderGameOverlayEvent.Pre evt, int gsc) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
GL11.glPushMatrix();

GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_BLEND);
Expand Down Expand Up @@ -695,6 +720,7 @@ private void renderKillAuraCrosshair(RenderGameOverlayEvent.Pre evt, int gsc) {
//GL11.glDisable(GL11.GL_DEPTH_TEST); //turn off depth testing to avoid this occluding other elements

evt.setCanceled(true);
GL11.glPopMatrix();
GL11.glPopAttrib();
}

Expand Down