From 2814df89b3eec1ab737be1bff36109976447d579 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Fri, 26 May 2017 21:57:21 +0100 Subject: [PATCH] Tweak vertex lighter to avoid causing excess array initialisations (#3771) --- .../client/model/pipeline/VertexLighterFlat.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java index 7be971e912..9e212320f0 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java @@ -35,6 +35,8 @@ import com.google.common.base.Objects; public class VertexLighterFlat extends QuadGatheringTransformer { + protected static final VertexFormatElement NORMAL_4F = new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4); + protected final BlockInfo blockInfo; private int tint = -1; private boolean diffuse = true; @@ -53,8 +55,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer public void setParent(IVertexConsumer parent) { super.setParent(parent); - if(Objects.equal(getVertexFormat(), parent.getVertexFormat())) return; - setVertexFormat(getVertexFormat(parent)); + VertexFormat format = getVertexFormat(parent); + if(Objects.equal(format, getVertexFormat())) return; + setVertexFormat(format); for(int i = 0; i < getVertexFormat().getElementCount(); i++) { switch(getVertexFormat().getElement(i).getUsage()) @@ -94,9 +97,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer private static VertexFormat getVertexFormat(IVertexConsumer parent) { VertexFormat format = parent.getVertexFormat(); - if(format.hasNormal()) return format; + if(format == null || format.hasNormal()) return format; format = new VertexFormat(format); - format.addElement(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4)); + format.addElement(NORMAL_4F); return format; }