From dff762055d442ba5ddc5318a0d02a08b076a5d75 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 15 Jul 2020 10:32:34 -0500 Subject: [PATCH] Give up on lightning fixing for now --- .../client/core/handler/LightningHandler.java | 12 ++-- .../vazkii/botania/client/fx/FXLightning.java | 72 ++++++++++++++----- 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 4d6399fe1..e372b0a44 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -64,12 +64,12 @@ public class LightningHandler { render.bindTexture(outsideResource); int counter = 0; - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LIGHTMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP); for (FXLightning bolt : queuedLightningBolts) { - bolt.renderBolt(ms, 0, false); + bolt.renderBolt(ms, tessellator.getBuffer(), 0, false); if (counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { tessellator.draw(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LIGHTMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP); } counter++; } @@ -78,12 +78,12 @@ public class LightningHandler { render.bindTexture(insideResource); counter = 0; - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LIGHTMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP); for (FXLightning bolt : queuedLightningBolts) { - bolt.renderBolt(ms, 1, true); + bolt.renderBolt(ms, tessellator.getBuffer(), 1, true); if (counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { tessellator.draw(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LIGHTMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP); } counter++; } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 7cf874d08..be7af4c35 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -9,6 +9,7 @@ package vazkii.botania.client.fx; import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.datafixers.util.Pair; @@ -19,16 +20,22 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3f; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; import javax.annotation.Nonnull; @@ -43,8 +50,8 @@ public class FXLightning extends Particle { private final int colorOuter; private final int colorInner; - private List segments; - private int segmentCount; + private final List segments; + private final int segmentCount; public FXLightning(ClientWorld world, Vector3 sourcevec, Vector3 targetvec, float speed, long seed, int colorOuter, int colorInner) { super(world, sourcevec.x, sourcevec.y, sourcevec.z); @@ -63,18 +70,29 @@ public class FXLightning extends Particle { @Override public void renderParticle(IVertexBuilder buffer, ActiveRenderInfo info, float partialTicks) { - LightningHandler.queuedLightningBolts.offer(this); + // todo fix this >.> + + // old way (bad position and too thick) + // LightningHandler.queuedLightningBolts.offer(this); + + // new way (right position but heavy artifacting) + /* + Vector3d cameraPos = info.getProjectedView(); + MatrixStack ms = new MatrixStack(); + ms.translate(-cameraPos.getX(), -cameraPos.getY(), -cameraPos.getZ()); + renderBolt(ms, buffer, 0, false); + renderBolt(ms, buffer, 1, true); + */ } @Nonnull @Override public IParticleRenderType getRenderType() { - return IParticleRenderType.CUSTOM; + return LAYER; } - public void renderBolt(MatrixStack ms, int pass, boolean inner) { + public void renderBolt(MatrixStack ms, IVertexBuilder wr, int pass, boolean inner) { Matrix4f mat = ms.getLast().getMatrix(); - BufferBuilder wr = Tessellator.getInstance().getBuffer(); float boltAge = age < 0 ? 0 : (float) age / (float) maxAge; float mainAlpha; @@ -110,38 +128,38 @@ public class FXLightning extends Particle { int fullbright = 0xF000F0; endvec.subtract(diff2).vertex(mat, wr); - wr.tex(0.5F, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 0).lightmap(fullbright).endVertex(); startvec.subtract(diff1).vertex(mat, wr); - wr.tex(0.5F, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 0).lightmap(fullbright).endVertex(); startvec.add(diff1).vertex(mat, wr); - wr.tex(0.5F, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 1).lightmap(fullbright).endVertex(); endvec.add(diff2).vertex(mat, wr); - wr.tex(0.5F, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 1).lightmap(fullbright).endVertex(); if (rendersegment.next == null) { Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width)); roundend.subtract(diff2).vertex(mat, wr); - wr.tex(0, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0, 0).lightmap(fullbright).endVertex(); endvec.subtract(diff2).vertex(mat, wr); - wr.tex(0.5F, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 0).lightmap(fullbright).endVertex(); endvec.add(diff2).vertex(mat, wr); - wr.tex(0.5F, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 1).lightmap(fullbright).endVertex(); roundend.add(diff2).vertex(mat, wr); - wr.tex(0, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0, 1).lightmap(fullbright).endVertex(); } if (rendersegment.prev == null) { Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width)); startvec.subtract(diff1).vertex(mat, wr); - wr.tex(0.5F, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 0).lightmap(fullbright).endVertex(); roundend.subtract(diff1).vertex(mat, wr); - wr.tex(0, 0).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0, 0).lightmap(fullbright).endVertex(); roundend.add(diff1).vertex(mat, wr); - wr.tex(0, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0, 1).lightmap(fullbright).endVertex(); startvec.add(diff1).vertex(mat, wr); - wr.tex(0.5F, 1).lightmap(fullbright).color(r, g, b, a).endVertex(); + wr.color(r, g, b, a).tex(0.5F, 1).lightmap(fullbright).endVertex(); } } } @@ -151,4 +169,22 @@ public class FXLightning extends Particle { return new Vector3((float) renderEntity.getPosX() - pos.x, (float) renderEntity.getPosY() - pos.y, (float) renderEntity.getPosZ() - pos.z); } + private static final IParticleRenderType LAYER = new IParticleRenderType() { + @Override + public void beginRender(BufferBuilder buffer, TextureManager textureManager) { + RenderSystem.depthMask(false); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.disableTexture(); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP); + } + + @Override + public void finishRender(Tessellator tess) { + tess.draw(); + RenderSystem.disableBlend(); + RenderSystem.depthMask(true); + } + }; + }