diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/DisplayListManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/DisplayListManager.java index 17f2340be..ca4c2bda4 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/DisplayListManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/DisplayListManager.java @@ -153,6 +153,15 @@ public class DisplayListManager { flushMatrix(); } + + /** + * Allows you to discard any pending matrix transforms. + * Only use this if you are 100% that the transforms will not be of any use after the display list draw call. + */ + public static void discardMatrixTransforms() { + resetRelativeTransform(); + } + /** * Emit accumulated transform as MultMatrix if non-identity, then reset. */ diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/recording/CompiledDisplayList.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/recording/CompiledDisplayList.java index 58b634282..082ecdc22 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/recording/CompiledDisplayList.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/recording/CompiledDisplayList.java @@ -150,8 +150,16 @@ public final class CompiledDisplayList { return DisplayListManager.getCompiledDisplayListString(listId, this, stackTrace); } + public String toString(int listId, StackTraceElement[] stackTrace) { + return getCompiledDisplayListString(listId, stackTrace); + } + + public String toString(int listId) { + return toString(listId, null); + } + @Override public String toString() { - return DisplayListManager.getCompiledDisplayListString(0, this, null); + return toString(0); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 83d529389..dc3e38d7a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -130,7 +130,10 @@ public enum Mixins implements IMixins { ANGELICA_ITEM_RENDERER_OPTIMIZATION(new MixinBuilder("Optimizes in-world item rendering") .setPhase(Phase.EARLY) - .addClientMixins("angelica.itemrenderer.MixinItemRenderer") + .addClientMixins( + "angelica.itemrenderer.MixinItemRenderer", + "angelica.itemrenderer.MixinRenderBlocks" + ) .setApplyIf(() -> AngelicaConfig.optimizeInWorldItemRendering)), ANGELICA_OPTIMIZE_GLALLOCATION(new MixinBuilder("Replace HashMap with fastutil Int2IntMap in GLAllocation") diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/items/BlockRenderListManager.java b/src/main/java/com/gtnewhorizons/angelica/rendering/items/BlockRenderListManager.java new file mode 100644 index 000000000..f4743b71b --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/items/BlockRenderListManager.java @@ -0,0 +1,74 @@ +package com.gtnewhorizons.angelica.rendering.items; + +import com.gtnewhorizons.angelica.glsm.DisplayListManager; +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import net.minecraft.block.Block; +import org.lwjgl.opengl.GL11; + +public class BlockRenderListManager { + private static final BlockMeta key = new BlockMeta(); + + private static final Object2IntOpenHashMap displayListMap = new Object2IntOpenHashMap<>(); + + + private static final int ISBRH_CUTOFF = 40; + + private static final boolean[] notISBRH = new boolean[ISBRH_CUTOFF]; + + static { + for (int i : new int[] + { 0, 31, 39, 16, 26, 1, 19, 23, 13, 6, 2, 10, 27, 11, 21, 32, 35, 34, 38 } + ) { + notISBRH[i] = true; + } + } + + public static boolean isISBRH(int renderType) { + return renderType >= ISBRH_CUTOFF || renderType < 0 || !notISBRH[renderType]; + } + + public static int getDisplayList(Block block, int meta) { + key.block = block; + key.meta = meta; + return displayListMap.getInt(key); + } + + public static int startCompiling() { + final int list = GLStateManager.glGenLists(1); + GLStateManager.glNewList(list, GL11.GL_COMPILE); + return list; + } + + public static void endCompiling(int list, Block block, int meta) { + DisplayListManager.discardMatrixTransforms(); + GLStateManager.glEndList(); + displayListMap.put(new BlockMeta(block, meta), list); + } + + + private static final class BlockMeta { + private Block block; + private int meta; + + public BlockMeta() { + + } + + public BlockMeta(Block block, int meta) { + this.block = block; + this.meta = meta; + } + + @Override + public int hashCode() { + return (block.hashCode() * 31 + meta) * 31; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof BlockMeta other)) return false; + return block == other.block && meta == other.meta; + } + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/ItemRenderListManager.java b/src/main/java/com/gtnewhorizons/angelica/rendering/items/ItemRenderListManager.java similarity index 99% rename from src/main/java/com/gtnewhorizons/angelica/rendering/ItemRenderListManager.java rename to src/main/java/com/gtnewhorizons/angelica/rendering/items/ItemRenderListManager.java index 36fff2069..8dbca3d7b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/ItemRenderListManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/items/ItemRenderListManager.java @@ -23,7 +23,7 @@ * along with FalseTweaks. If not, see . */ -package com.gtnewhorizons.angelica.rendering; +package com.gtnewhorizons.angelica.rendering.items; import com.gtnewhorizon.gtnhlib.client.renderer.DirectTessellator; import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinItemRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinItemRenderer.java index 5d507c02e..27a9b185f 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinItemRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinItemRenderer.java @@ -27,9 +27,7 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.itemrenderer; import com.gtnewhorizon.gtnhlib.client.renderer.DirectTessellator; import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; -import com.gtnewhorizon.gtnhlib.client.renderer.vbo.IVertexBuffer; -import com.gtnewhorizon.gtnhlib.client.renderer.vbo.VertexBuffer; -import com.gtnewhorizons.angelica.rendering.ItemRenderListManager; +import com.gtnewhorizons.angelica.rendering.items.ItemRenderListManager; import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinRenderBlocks.java new file mode 100644 index 000000000..76253d8b3 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/itemrenderer/MixinRenderBlocks.java @@ -0,0 +1,46 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.itemrenderer; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import com.gtnewhorizons.angelica.rendering.items.BlockRenderListManager; +import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(RenderBlocks.class) +public abstract class MixinRenderBlocks { + + + @Shadow + public boolean useInventoryTint; + + @Shadow + public boolean enableAO; + + @Shadow + public IIcon overrideBlockTexture; + + @WrapMethod(method = "renderBlockAsItem") + private void angelica$cacheBlockItemRenderer(Block block, int meta, float brightness, Operation original) { + if (BlockRenderListManager.isISBRH(block.getRenderType()) + || enableAO + || this.overrideBlockTexture != null + || brightness != 1.0F + || !this.useInventoryTint + ) { + // Do not cache those + original.call(block, meta, brightness); + return; + } + int list = BlockRenderListManager.getDisplayList(block, meta); + if (list == 0) { + list = BlockRenderListManager.startCompiling(); + original.call(block, meta, brightness); + BlockRenderListManager.endCompiling(list, block, meta); + } + GLStateManager.glCallList(list); + } +}