From 601b6ce550361a1392b67dfbd3d1f5bb95cd53f3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 13 Jan 2020 22:07:11 -0600 Subject: [PATCH] put all rendertypes together in one place, create explicit buffers for boundtiles so they actually can be batched --- .../handler/BlockHighlightRenderHandler.java | 39 ++++++------- .../core/handler/BoundTileRenderer.java | 51 ++++++++++------- .../client/core/helper/RenderHelper.java | 55 ++++++++++++++----- .../client/core/proxy/ClientProxy.java | 4 -- 4 files changed, 87 insertions(+), 62 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index e1ff81a1b..a7ce60a71 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -35,6 +35,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityMagicLandmine; @@ -43,21 +44,13 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; -import java.awt.*; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class BlockHighlightRenderHandler { - private static final RenderType RECTANGLE; - private static final RenderType CIRCLE; - static { - // todo 1.15 check GL state, AT's for the fields - RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_"); - RenderState.CullState disableCull = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228491_A_"); - RenderType.State glState = RenderType.State.builder().transparency(translucentTransparency).cull(disableCull).build(false); - RECTANGLE = RenderType.of("botania:rectangle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState); - CIRCLE = RenderType.of("botania:circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLE_FAN, 256, false, true, glState); - } private BlockHighlightRenderHandler() {} @@ -133,7 +126,7 @@ public final class BlockHighlightRenderHandler { float x = (float) (aabb.maxX - aabb.minX - f); float z = (float) (aabb.maxZ - aabb.minZ - f); - IVertexBuilder buffer = buffers.getBuffer(RECTANGLE); + IVertexBuilder buffer = buffers.getBuffer(RenderHelper.RECTANGLE); Matrix4f mat = ms.peek().getModel(); buffer.vertex(mat, x, f, f).color(color.getRed(), color.getGreen(), color.getBlue(), alpha).endVertex(); buffer.vertex(mat, f, f, f).color(color.getRed(), color.getGreen(), color.getBlue(), alpha).endVertex(); @@ -175,30 +168,32 @@ public final class BlockHighlightRenderHandler { int step = totalAngles / drawAngles; radius -= f; - IVertexBuilder buffer = buffers.getBuffer(CIRCLE); - // todo 1.15 ! TRIANGLE_FAN GL draw mode means we can't batch up everything like we're doing right now--they'll all run together - // todo 1.15 we must either draw between each circle or use a different draw mode (probably switch to GL_TRIANGLES) + IVertexBuilder buffer = buffers.getBuffer(RenderHelper.CIRCLE); Matrix4f mat = ms.peek().getModel(); - buffer.vertex(mat, 0, f, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + + Runnable centerFunc = () -> buffer.vertex(mat, 0, f, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + List vertexFuncs = new ArrayList<>(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; float xp = (float) (Math.cos(rad) * radius); float zp = (float) (Math.sin(rad) * radius); - buffer.vertex(mat, xp, f, zp).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + vertexFuncs.add(() -> buffer.vertex(mat, xp, f, zp).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex()); } - buffer.vertex(mat, 0, f, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + RenderHelper.triangleFan(centerFunc, vertexFuncs); radius += f; float f1 = f + f / 4F; - alpha = 64; - buffer.vertex(mat, 0, f1, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + int alpha2 = 64; + + centerFunc = () -> buffer.vertex(mat, 0, f1, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha2).endVertex(); + vertexFuncs.clear(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; float xp = (float) (Math.cos(rad) * radius); float zp = (float) (Math.sin(rad) * radius); - buffer.vertex(mat, xp, f1, zp).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + vertexFuncs.add(() -> buffer.vertex(mat, xp, f1, zp).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha2).endVertex()); } - buffer.vertex(mat, 0, f1, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); + RenderHelper.triangleFan(centerFunc, vertexFuncs); ms.pop(); } 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 1d5883229..b3e69816e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -15,6 +15,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.block.BlockState; 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; @@ -24,13 +25,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; +import net.minecraft.util.Util; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; 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; @@ -41,29 +45,34 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; import java.awt.*; import java.util.Collections; +import java.util.IdentityHashMap; import java.util.List; -import java.util.OptionalDouble; -import java.util.stream.Collectors; +import java.util.Map; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public final class BoundTileRenderer { - private static RenderType lineWidth(double width) { - // todo 1.15 AT for these once confirmed working, also make static final cached rendertypes - RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_"); - RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_"); - RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_"); - - return RenderType.of("lines", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(width))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false)); - } - + 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())); + return ret; + }), Tessellator.getInstance().getBuffer()); private BoundTileRenderer() {} @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { + if (!ConfigHandler.CLIENT.boundBlockWireframe.get()) + return; + MatrixStack ms = event.getMatrixStack(); - IRenderTypeBuffer.Impl buffers = IRenderTypeBuffer.immediate(Tessellator.getInstance().getBuffer()); ms.push(); PlayerEntity player = Minecraft.getInstance().player; @@ -72,13 +81,13 @@ public final class BoundTileRenderer { if(!player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); if(coords != null) - renderBlockOutlineAt(ms, buffers, coords, color); + renderBlockOutlineAt(ms, LINE_BUFFERS, coords, color); } if(!player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemOffhand().getItem()).getBinding(player.getHeldItemOffhand()); if(coords != null) - renderBlockOutlineAt(ms, buffers, coords, color); + renderBlockOutlineAt(ms, LINE_BUFFERS, coords, color); } LazyOptional mainInvCap = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP); @@ -93,24 +102,24 @@ public final class BoundTileRenderer { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); List coordsList = provider.getWireframesToDraw(player, stackInSlot); for (BlockPos coords : coordsList) - renderBlockOutlineAt(ms, buffers, coords, color); + renderBlockOutlineAt(ms, LINE_BUFFERS, coords, color); BlockPos coords = provider.getSourceWireframe(player, stackInSlot); if (coords != null && coords.getY() > -1) - renderBlockOutlineAt(ms, buffers, coords, color, 5F); + renderBlockOutlineAt(ms, LINE_BUFFERS, coords, color, true); } } }); ms.pop(); - buffers.draw(); + LINE_BUFFERS.draw(); } private static void renderBlockOutlineAt(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos pos, int color) { - renderBlockOutlineAt(ms, buffers, pos, color, 1F); + renderBlockOutlineAt(ms, buffers, pos, color, false); } - private static void renderBlockOutlineAt(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos pos, int color, float thickness) { + private static void renderBlockOutlineAt(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos pos, int color, boolean thick) { double renderPosX = Minecraft.getInstance().getRenderManager().info.getProjectedView().getX(); double renderPosY = Minecraft.getInstance().getRenderManager().info.getProjectedView().getY(); double renderPosZ = Minecraft.getInstance().getRenderManager().info.getProjectedView().getZ(); @@ -138,13 +147,13 @@ public final class BoundTileRenderer { ms.scale(1F, 1F, 1F); - IVertexBuilder buffer = buffers.getBuffer(lineWidth(thickness)); + IVertexBuilder buffer = buffers.getBuffer(thick ? RenderHelper.LINE_5 : RenderHelper.LINE_1); for(AxisAlignedBB axis : list) { axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); renderBlockOutline(ms.peek().getModel(), buffer, axis, color); } - buffer = buffers.getBuffer(lineWidth(thickness + 3)); + buffer = buffers.getBuffer(thick ? RenderHelper.LINE_8 : RenderHelper.LINE_4); 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 3bd5b93d9..12afc1557 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -33,10 +33,41 @@ import vazkii.botania.client.lib.LibResources; import java.util.Arrays; import java.util.List; +import java.util.OptionalDouble; import java.util.Random; -import java.util.function.Consumer; public final class RenderHelper { + private static final RenderType STAR_LAYER; + 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; + + // todo 1.15 AT's for necessary fields + static { + RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_"); + RenderType.State glState = RenderType.State.builder().shadeModel(new RenderState.ShadeModelState(true)) + .writeMaskState(new RenderState.WriteMaskState(true, false)) + .transparency(lightningTransparency) + .build(false); + STAR_LAYER = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState); + + RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_"); + RenderState.CullState disableCull = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228491_A_"); + glState = RenderType.State.builder().transparency(translucentTransparency).cull(disableCull).build(false); + RECTANGLE = RenderType.of(LibResources.PREFIX_MOD + "rectangle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState); + CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState); + + RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_"); + RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_"); + + LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false)); + LINE_4 = RenderType.of(LibResources.PREFIX_MOD + "line_4", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(4))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false)); + LINE_5 = RenderType.of(LibResources.PREFIX_MOD + "line_5", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(5))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false)); + LINE_8 = RenderType.of(LibResources.PREFIX_MOD + "line_8", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(8))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false)); + } public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { drawTexturedModalRect(par1, par2, z, par3, par4, par5, par6, 0.00390625F, 0.00390625F); @@ -52,16 +83,6 @@ public final class RenderHelper { tessellator.draw(); } - private static final RenderType STAR_LAYER; - static { - RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_"); - RenderType.State glState = RenderType.State.builder().shadeModel(new RenderState.ShadeModelState(true)) - .writeMaskState(new RenderState.WriteMaskState(true, false)) - .transparency(lightningTransparency) - .build(false); - STAR_LAYER = RenderType.of("botania:star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState); - } - public static void renderStar(MatrixStack ms, IRenderTypeBuffer buffers, int color, float xScale, float yScale, float zScale, long seed) { IVertexBuilder buffer = buffers.getBuffer(STAR_LAYER); @@ -103,16 +124,20 @@ public final class RenderHelper { ms.pop(); } + public static void triangleFan(Runnable center, Runnable... vertices) { + triangleFan(center, Arrays.asList(vertices)); + } + /** * With a buffer in GL_TRIANGLES mode, emulates GL_TRIANGLE_FAN on the CPU. * This is because batching of GL_TRIANGLE_FAN makes no sense (the vertices would bleed into one massive fan) * Primitive restart would also work but it's not easy to use in Minecraft */ - public static void triangleFan(Runnable center, Runnable... vertices) { - for (int i = 0; i < vertices.length - 1; i++) { + public static void triangleFan(Runnable center, List vertices) { + for (int i = 0; i < vertices.size() - 1; i++) { center.run(); - vertices[i].run(); - vertices[i + 1].run(); + vertices.get(i).run(); + vertices.get(i + 1).run(); } } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 7466f44be..f1dd6b709 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -38,7 +38,6 @@ import org.lwjgl.glfw.GLFW; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.BossBarHandler; -import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ColorHandler; import vazkii.botania.client.core.handler.ContributorFancinessHandler; @@ -106,9 +105,6 @@ public class ClientProxy implements IProxy { Botania.LOGGER.fatal("Persistent Variables couldn't load!!"); } - if(ConfigHandler.CLIENT.boundBlockWireframe.get()) - MinecraftForge.EVENT_BUS.register(BoundTileRenderer.class); - if(ConfigHandler.CLIENT.enableSeasonalFeatures.get()) { LocalDateTime now = LocalDateTime.now(); if (now.getMonth() == Month.DECEMBER && now.getDayOfMonth() >= 16 || now.getMonth() == Month.JANUARY && now.getDayOfMonth() <= 2)