More model utils

This commit is contained in:
Bernhard Bonigl committed 2016-03-21 15:42:21 +01:00
1 parent 1f0abcdcd7
commit 51e8065fdc
2 files changed
+48 -13

No files matched your search

@@ -1,6 +1,5 @@
package slimeknights.mantle.client;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import net.minecraft.block.Block;
@@ -11,21 +10,19 @@ 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.client.renderer.vertex.VertexFormatElement;
import net.minecraftforge.client.model.IModelPart;
import net.minecraftforge.client.model.IModelState;
import net.minecraftforge.client.model.SimpleModelState;
import net.minecraftforge.client.model.TRSRTransformation;
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
import net.minecraftforge.client.model.pipeline.VertexTransformer;
import javax.vecmath.Matrix3f;
import javax.vecmath.Matrix4f;
import javax.vecmath.Vector3f;
import javax.vecmath.Vector4f;
public class ModelHelper {
public static final Optional<IModelState> DEFAULT_ITEM_STATE;
public static final Optional<IModelState> DEFAULT_TOOL_STATE;
public static final IModelState DEFAULT_ITEM_STATE;
public static final IModelState DEFAULT_TOOL_STATE;
public static final TRSRTransformation BLOCK_THIRD_PERSON_RIGHT;
public static final TRSRTransformation BLOCK_THIRD_PERSON_LEFT;
@@ -55,19 +52,22 @@ public class ModelHelper {
static {
{
// equals forge:default-item
DEFAULT_ITEM_STATE = Optional.<IModelState>of(new SimpleModelState(ImmutableMap.of(
ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f),
ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1),
ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f),
ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f))));
ImmutableMap.Builder<IModelPart, TRSRTransformation> builder = ImmutableMap.builder();
builder.put(ItemCameraTransforms.TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f));
builder.put(ItemCameraTransforms.TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1));
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f));
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 3, 1, 0, 0, 0, 0.55f));
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f));
builder.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f));
DEFAULT_ITEM_STATE = new SimpleModelState(builder.build());
}
{
// equals forge:default-tool
DEFAULT_TOOL_STATE = Optional.<IModelState>of(new SimpleModelState(ImmutableMap.of(
DEFAULT_TOOL_STATE = new SimpleModelState(ImmutableMap.of(
ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 4, 0.5f, 0, -90, 55, 0.85f),
ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, get(0, 4, 0.5f, 0, 90, -55, 0.85f),
ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f),
ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f))));
ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f)));
}
{
BLOCK_THIRD_PERSON_RIGHT = get(0, 2.5f, 0, 75, 45, 0, 0.375f);
@@ -0,0 +1,35 @@
package slimeknights.mantle.client.model;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.util.EnumFacing;
import java.util.List;
import slimeknights.mantle.util.ImmutableConcatList;
public class BakedCompositeModel extends BakedWrapper {
protected final List<IBakedModel> parts;
public BakedCompositeModel(IBakedModel parent, List<IBakedModel> parts) {
super(parent);
this.parts = parts;
}
@Override
public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
ImmutableList.Builder<List<BakedQuad>> builder = ImmutableList.builder();
builder.add(super.getQuads(state, side, rand));
for(IBakedModel part : parts) {
builder.add(part.getQuads(state, side, rand));
}
return new ImmutableConcatList<BakedQuad>(builder.build());
}
}