tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Fixes #2498: Corrected color of biometric card with hash = 0 and correctly delegate the perspective aware transformations to the base model. In addition, don't allocate an empty cache for all cached models.

This commit is contained in:
Sebastian Hartte 2016-10-24 23:10:44 +02:00
parent b175c71b84
commit 23f8497dea
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
View File

@ -11,7 +11,6 @@ import javax.vecmath.Matrix4f;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.mojang.authlib.GameProfile;
import org.apache.commons.lang3.tuple.Pair;
@ -47,26 +46,27 @@ class BiometricCardBakedModel implements IPerspectiveAwareModel
private final int hash;
private final ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms;
private final Cache<Integer, BiometricCardBakedModel> modelCache;
private final ImmutableList<BakedQuad> generalQuads;
BiometricCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture, ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms )
BiometricCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture )
{
this( format, baseModel, texture, 0, transforms );
this( format, baseModel, texture, 0, createCache() );
}
BiometricCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture, int hash, ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms )
private BiometricCardBakedModel( VertexFormat format, IBakedModel baseModel, TextureAtlasSprite texture, int hash, Cache<Integer, BiometricCardBakedModel> modelCache )
{
this.format = format;
this.baseModel = baseModel;
this.texture = texture;
this.hash = hash;
this.transforms = transforms;
this.generalQuads = ImmutableList.copyOf( buildGeneralQuads() );
modelCache = CacheBuilder.newBuilder()
this.modelCache = modelCache;
}
private static Cache<Integer, BiometricCardBakedModel> createCache() {
return CacheBuilder.newBuilder()
.maximumSize( 100 )
.build();
}
@ -97,7 +97,7 @@ class BiometricCardBakedModel implements IPerspectiveAwareModel
AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
if( hash == 0 )
{
col = AEColor.RED;
col = AEColor.BLACK;
}
for( int x = 0; x < 8; x++ )
@ -196,7 +196,7 @@ class BiometricCardBakedModel implements IPerspectiveAwareModel
try
{
return modelCache.get( hash, () -> new BiometricCardBakedModel( format, baseModel, texture, hash, transforms ) );
return modelCache.get( hash, () -> new BiometricCardBakedModel( format, baseModel, texture, hash, modelCache ) );
}
catch( ExecutionException e )
{
@ -210,6 +210,13 @@ class BiometricCardBakedModel implements IPerspectiveAwareModel
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
{
return IPerspectiveAwareModel.MapWrapper.handlePerspective( this, transforms, type );
// Delegate to the base model if possible
if( baseModel instanceof IPerspectiveAwareModel )
{
IPerspectiveAwareModel pam = (IPerspectiveAwareModel) baseModel;
Pair<? extends IBakedModel, Matrix4f> pair = pam.handlePerspective( type );
return Pair.of( this, pair.getValue() );
}
return Pair.of( this, TRSRTransformation.identity().getMatrix() );
}
}

7
src/main/java/appeng/client/render/model/BiometricCardModel.java
View File

@ -5,15 +5,12 @@ import java.util.Collection;
import java.util.Collections;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
@ -49,9 +46,7 @@ public class BiometricCardModel implements IModel
IBakedModel baseModel = getBaseModel( state, format, bakedTextureGetter );
ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> map = IPerspectiveAwareModel.MapWrapper.getTransforms(state);
return new BiometricCardBakedModel( format, baseModel, texture, map );
return new BiometricCardBakedModel( format, baseModel, texture );
}
private IBakedModel getBaseModel( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )