aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-10-05 10:53:26 -0400
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-10-22 23:20:34 -0400
commitcd3ebd6e9411bdd909bcd68ab6c33aad5b52f07e (patch)
treee07c630974b3bf52b59851239215cc2342f8bf2d
parent594f1d34b51cc49cea90003262f77e0974e5b62d (diff)
downloadSkyblocker-cd3ebd6e9411bdd909bcd68ab6c33aad5b52f07e.tar.gz
Skyblocker-cd3ebd6e9411bdd909bcd68ab6c33aad5b52f07e.tar.bz2
Skyblocker-cd3ebd6e9411bdd909bcd68ab6c33aad5b52f07e.zip
Fix RenderHelper#renderQuad
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java11
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/diana/MythologicalRitual.java6
2 files changed, 7 insertions, 10 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
index 14e6d103..ec03b05f 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
@@ -1,7 +1,5 @@
package de.hysky.skyblocker.utils.render;
-import com.mojang.blaze3d.platform.GlStateManager.DstFactor;
-import com.mojang.blaze3d.platform.GlStateManager.SrcFactor;
import com.mojang.blaze3d.systems.RenderSystem;
import de.hysky.skyblocker.mixin.accessor.BeaconBlockEntityRendererInvoker;
import me.x150.renderer.render.Renderer3d;
@@ -138,7 +136,7 @@ public class RenderHelper {
RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
RenderSystem.lineWidth(lineWidth);
RenderSystem.enableBlend();
- RenderSystem.blendFunc(SrcFactor.SRC_ALPHA, DstFactor.ONE_MINUS_SRC_ALPHA);
+ RenderSystem.defaultBlendFunc();
RenderSystem.disableCull();
RenderSystem.enableDepthTest();
@@ -158,10 +156,7 @@ public class RenderHelper {
matrices.pop();
GL11.glDisable(GL11.GL_LINE_SMOOTH);
RenderSystem.lineWidth(1f);
- RenderSystem.disableBlend();
- RenderSystem.defaultBlendFunc();
RenderSystem.enableCull();
- RenderSystem.disableDepthTest();
}
public static void renderQuad(WorldRenderContext context, Vec3d[] points, float[] colorComponents, float alpha, boolean throughWalls) {
@@ -177,6 +172,9 @@ public class RenderHelper {
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ RenderSystem.disableCull();
RenderSystem.depthFunc(throughWalls ? GL11.GL_ALWAYS : GL11.GL_LEQUAL);
buffer.begin(DrawMode.QUADS, VertexFormats.POSITION_COLOR);
@@ -185,6 +183,7 @@ public class RenderHelper {
}
tessellator.draw();
+ RenderSystem.enableCull();
RenderSystem.depthFunc(GL11.GL_LEQUAL);
matrices.pop();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/diana/MythologicalRitual.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/diana/MythologicalRitual.java
index 72607037..f17d4195 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/diana/MythologicalRitual.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/diana/MythologicalRitual.java
@@ -123,8 +123,6 @@ public class MythologicalRitual {
}
public static void render(WorldRenderContext context) {
- RenderHelper.renderLinesFromPoints(context, new Vec3d[]{new Vec3d(0, 96, -100), new Vec3d(0, 96, 100)}, ORANGE_COLOR_COMPONENTS, 0.25F, 5); // TODO debug
- RenderHelper.renderQuad(context, new Vec3d[]{new Vec3d(0, 100, -100), new Vec3d(0, 100, 100), new Vec3d(0, 200, 100), new Vec3d(0, 200, -100)}, ORANGE_COLOR_COMPONENTS, 0.25F, true); // TODO debug
if (isActive()) {
for (Map.Entry<BlockPos, GriffinBurrow> burrowEntry : griffinBurrows.entrySet()) {
GriffinBurrow burrow = burrowEntry.getValue();
@@ -133,10 +131,10 @@ public class MythologicalRitual {
}
if (burrow.confirmed != TriState.FALSE) {
if (burrow.nextBurrowPlane != null) {
- RenderHelper.renderLinesFromPoints(context, burrow.nextBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, 5);
+ RenderHelper.renderQuad(context, burrow.nextBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true);
}
if (burrow.echoBurrowPlane != null) {
- RenderHelper.renderLinesFromPoints(context, burrow.echoBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, 5);
+ RenderHelper.renderQuad(context, burrow.echoBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true);
}
}
}