From 70e35d8daf1042ec1c556ea433ee26a64523258d Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 15 Apr 2016 18:46:04 +0200 Subject: [PATCH] Fix Baked Composite model not caching the quads. Now it can be used as a proper model cache #59 --- .../client/model/BakedCompositeModel.java | 59 ++++++++++++++++--- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java b/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java index 0051a12..2f75d1a 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java @@ -1,6 +1,10 @@ package slimeknights.mantle.client.model; +import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +import com.sun.xml.internal.bind.v2.runtime.unmarshaller.IntData; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -8,28 +12,69 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.util.EnumFacing; import java.util.List; +import java.util.Map; import slimeknights.mantle.util.ImmutableConcatList; +/** + * Groups multiple baked models into a single one. Does not respect state etc. when getting quads. + * Best use the Builder to create a BakedCompositeModel. + */ public class BakedCompositeModel extends BakedWrapper { - protected final List parts; + protected final ImmutableMap, ImmutableList> parts; - public BakedCompositeModel(IBakedModel parent, List parts) { + public BakedCompositeModel(IBakedModel parent, ImmutableMap, ImmutableList> parts) { super(parent); + this.parts = parts; } @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { - ImmutableList.Builder> builder = ImmutableList.builder(); + return parts.get(Optional.fromNullable(side)); + } - builder.add(super.getQuads(state, side, rand)); + public static class Builder { + ImmutableList.Builder[] builders; + IBakedModel parent; - for(IBakedModel part : parts) { - builder.add(part.getQuads(state, side, rand)); + public Builder() { + this.parent = parent; + builders = new ImmutableList.Builder[7]; + for(int i = 0; i < 7; i++) { + builders[i] = ImmutableList.builder(); + } } - return new ImmutableConcatList(builder.build()); + public void add(IBakedModel model, IBlockState state, long rand) { + add(model, state, null, rand); + for(EnumFacing side : EnumFacing.values()) { + add(model, state, side, rand); + } + } + + public void add(IBakedModel model, IBlockState state, EnumFacing side, long rand) { + int index; + if(side == null) { + index = 6; + } + else { + index = side.getIndex(); + } + + builders[index].addAll(model.getQuads(state, side, rand)); + } + + public BakedCompositeModel build(IBakedModel parent) { + ImmutableMap.Builder, ImmutableList> map = ImmutableMap.builder(); + + map.put(Optional.absent(), builders[6].build()); + for(EnumFacing side : EnumFacing.values()) { + map.put(Optional.of(side), builders[side.getIndex()].build()); + } + + return new BakedCompositeModel(parent, map.build()); + } } }