From 0ac2062431a2b7af5da3acf65ba470a4b82d5cf6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 20 Feb 2020 21:44:33 -0600 Subject: [PATCH] Fix bound block renders being faint and not depth ignoring --- .../core/handler/BoundTileRenderer.java | 20 ++++++------ .../client/core/helper/RenderHelper.java | 31 +++++++++---------- .../render/tile/RenderTileRedString.java | 4 --- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index fd5d1f839..2a681f42f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -11,6 +11,7 @@ package vazkii.botania.client.core.handler; import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -18,10 +19,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.RenderState; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; @@ -36,12 +35,10 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; @@ -59,10 +56,10 @@ import java.util.Map; public final class BoundTileRenderer { private static final IRenderTypeBuffer.Impl LINE_BUFFERS = IRenderTypeBuffer.immediate(Util.make(() -> { Map ret = new IdentityHashMap<>(); - ret.put(RenderHelper.LINE_1, new BufferBuilder(RenderHelper.LINE_1.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_4, new BufferBuilder(RenderHelper.LINE_4.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_5, new BufferBuilder(RenderHelper.LINE_5.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_8, new BufferBuilder(RenderHelper.LINE_8.getExpectedBufferSize())); + ret.put(RenderHelper.LINE_1_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_1_NO_DEPTH.getExpectedBufferSize())); + ret.put(RenderHelper.LINE_4_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_4_NO_DEPTH.getExpectedBufferSize())); + ret.put(RenderHelper.LINE_5_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_5_NO_DEPTH.getExpectedBufferSize())); + ret.put(RenderHelper.LINE_8_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_8_NO_DEPTH.getExpectedBufferSize())); return ret; }), Tessellator.getInstance().getBuffer()); private BoundTileRenderer() {} @@ -76,7 +73,7 @@ public final class BoundTileRenderer { ms.push(); PlayerEntity player = Minecraft.getInstance().player; - int color = MathHelper.hsvToRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); + int color = 0xFF000000 | MathHelper.hsvToRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); if(!player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); @@ -112,6 +109,7 @@ public final class BoundTileRenderer { }); ms.pop(); + RenderSystem.disableDepthTest(); LINE_BUFFERS.draw(); } @@ -147,13 +145,13 @@ public final class BoundTileRenderer { ms.scale(1F, 1F, 1F); - IVertexBuilder buffer = buffers.getBuffer(thick ? RenderHelper.LINE_5 : RenderHelper.LINE_1); + IVertexBuilder buffer = buffers.getBuffer(thick ? RenderHelper.LINE_5_NO_DEPTH : RenderHelper.LINE_1_NO_DEPTH); for(AxisAlignedBB axis : list) { axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); renderBlockOutline(ms.peek().getModel(), buffer, axis, color); } - buffer = buffers.getBuffer(thick ? RenderHelper.LINE_8 : RenderHelper.LINE_4); + buffer = buffers.getBuffer(thick ? RenderHelper.LINE_8_NO_DEPTH : RenderHelper.LINE_4_NO_DEPTH); int alpha = 64; color = (color & ~0xff000000) | (alpha << 24); for(AxisAlignedBB axis : list) { diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 0aec96522..fc44ca29a 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -16,7 +16,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; @@ -45,16 +44,13 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTilePylon; -import vazkii.botania.common.Botania; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nullable; import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.List; -import java.util.Objects; import java.util.OptionalDouble; import java.util.Random; @@ -63,9 +59,10 @@ public final class RenderHelper { public static final RenderType RECTANGLE; public static final RenderType CIRCLE; public static final RenderType LINE_1; - public static final RenderType LINE_4; - public static final RenderType LINE_5; - public static final RenderType LINE_8; + public static final RenderType LINE_1_NO_DEPTH; + public static final RenderType LINE_4_NO_DEPTH; + public static final RenderType LINE_5_NO_DEPTH; + public static final RenderType LINE_8_NO_DEPTH; public static final RenderType SPARK; public static final RenderType LIGHT_RELAY; public static final RenderType SPINNING_CUBE; @@ -82,20 +79,20 @@ public final class RenderHelper { public static final RenderType ASTROLABE_PREVIEW; public static final RenderType ENTITY_TRANSLUCENT_GOLD; - // todo 1.15 AT's for necessary fields static { RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_"); RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_"); - RenderState.TextureState mipmapBlockAtlasTexture = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228521_m_"); + RenderState.TextureState mipmapBlockAtlasTexture = new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, true); RenderState.CullState disableCull = new RenderState.CullState(false); RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_"); - RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_"); + RenderState.WriteMaskState colorMask = new RenderState.WriteMaskState(true, false); RenderType.ShadeModelState smoothShade = new RenderState.ShadeModelState(true); RenderState.LightmapState enableLightmap = new RenderState.LightmapState(true); RenderState.OverlayState enableOverlay = new RenderState.OverlayState(true); RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true); RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0); RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F); + RenderState.DepthTestState noDepth = new RenderState.DepthTestState(GL11.GL_ALWAYS); RenderType.State glState = RenderType.State.builder().shadeModel(smoothShade) .writeMaskState(colorMask) @@ -109,12 +106,14 @@ public final class RenderHelper { glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false); LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState); - glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(4))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false); - LINE_4 = RenderType.of(LibResources.PREFIX_MOD + "line_4", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState); - glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(5))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false); - LINE_5 = RenderType.of(LibResources.PREFIX_MOD + "line_5", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState); - glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(8))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false); - LINE_8 = RenderType.of(LibResources.PREFIX_MOD + "line_8", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState); + glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).depthTest(noDepth).build(false); + LINE_1_NO_DEPTH = RenderType.of(LibResources.PREFIX_MOD + "line_1_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState); + glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(4))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).depthTest(noDepth).build(false); + LINE_4_NO_DEPTH = RenderType.of(LibResources.PREFIX_MOD + "line_4_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState); + glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(5))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).depthTest(noDepth).build(false); + LINE_5_NO_DEPTH = RenderType.of(LibResources.PREFIX_MOD + "line_5_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState); + glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(8))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).depthTest(noDepth).build(false); + LINE_8_NO_DEPTH = RenderType.of(LibResources.PREFIX_MOD + "line_8_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState); glState = RenderType.State.builder().texture(mipmapBlockAtlasTexture).transparency(translucentTransparency).alpha(new RenderState.AlphaState(0.05F)).lightmap(enableLightmap).build(true); // todo 1.15: need normals? diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 3799e7b01..96ff16107 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -11,18 +11,14 @@ package vazkii.botania.client.render.tile; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.block.tile.string.TileRedString;