From c4742aadbc576999851c732e73d86f06cb94751f Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Sat, 21 Nov 2015 08:09:38 +0300 Subject: [PATCH] Removed face doubles from item models. --- .../client/model/ItemLayerModel.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java index 6c405c9b65..feade29178 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java @@ -1,6 +1,7 @@ package net.minecraftforge.client.model; import java.util.Arrays; +import java.util.BitSet; import java.util.Collection; import java.util.List; @@ -145,6 +146,7 @@ public class ItemLayerModel implements IRetexturableModel { int uMax = sprite.getIconWidth(); int vMax = sprite.getIconHeight(); + BitSet faces = new BitSet((uMax + 1) * (vMax + 1) * 4); for(int f = 0; f < sprite.getFrameCount(); f++) { int[] pixels = sprite.getFrameTextureData(f)[0]; @@ -159,26 +161,26 @@ public class ItemLayerModel implements IRetexturableModel { boolean t = isTransparent(pixels, uMax, vMax, u, v); if(ptu && !t) // left - transparent, right - opaque { - builder.add(buildSideQuad(format, transform, EnumFacing.WEST, tint, sprite, u, v)); + addSideQuad(builder, faces, format, transform, EnumFacing.WEST, tint, sprite, uMax, vMax, u, v); } if(!ptu && t) // left - opaque, right - transparent { - builder.add(buildSideQuad(format, transform, EnumFacing.EAST, tint, sprite, u, v)); + addSideQuad(builder, faces, format, transform, EnumFacing.EAST, tint, sprite, uMax, vMax, u, v); } if(ptv[u] && !t) // up - transparent, down - opaque { - builder.add(buildSideQuad(format, transform, EnumFacing.UP, tint, sprite, u, v)); + addSideQuad(builder, faces, format, transform, EnumFacing.UP, tint, sprite, uMax, vMax, u, v); } if(!ptv[u] && t) // up - opaque, down - transparent { - builder.add(buildSideQuad(format, transform, EnumFacing.DOWN, tint, sprite, u, v)); + addSideQuad(builder, faces, format, transform, EnumFacing.DOWN, tint, sprite, uMax, vMax, u, v); } ptu = t; ptv[u] = t; } if(!ptu) // last - opaque { - builder.add(buildSideQuad(format, transform, EnumFacing.EAST, tint, sprite, uMax, v)); + addSideQuad(builder, faces, format, transform, EnumFacing.EAST, tint, sprite, uMax, vMax, uMax, v); } } // last line @@ -186,7 +188,7 @@ public class ItemLayerModel implements IRetexturableModel { { if(!ptv[u]) { - builder.add(buildSideQuad(format, transform, EnumFacing.DOWN, tint, sprite, u, vMax)); + addSideQuad(builder, faces, format, transform, EnumFacing.DOWN, tint, sprite, uMax, vMax, u, vMax); } } } @@ -212,6 +214,18 @@ public class ItemLayerModel implements IRetexturableModel { return (pixels[u + (vMax - 1 - v) * uMax] >> 24 & 0xFF) == 0; } + private static void addSideQuad(ImmutableList.Builder builder, BitSet faces, VertexFormat format, TRSRTransformation transform, EnumFacing side, int tint, TextureAtlasSprite sprite, int uMax, int vMax, int u, int v) + { + int si = side.ordinal(); + if(si > 4) si -= 2; + int index = (vMax + 1) * ((uMax + 1) * si + u) + v; + if(!faces.get(index)) + { + faces.set(index); + builder.add(buildSideQuad(format, transform, side, tint, sprite, u, v)); + } + } + private static BakedQuad buildSideQuad(VertexFormat format, TRSRTransformation transform, EnumFacing side, int tint, TextureAtlasSprite sprite, int u, int v) { final float eps0 = 30e-5f;