keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Provide ItemCameraTransforms for vanilla models when possible.

This commit is contained in:
RainWarrior 2015-11-08 09:37:33 +03:00
parent 8a11ad7a7a
commit cbe2766c0a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View File

@ -545,22 +545,25 @@ public class ForgeHooksClient
if(pair.getRight() != null) multiplyCurrentGlMatrix(pair.getRight()); if(pair.getRight() != null) multiplyCurrentGlMatrix(pair.getRight());
return pair.getLeft(); return pair.getLeft();
} }
switch(cameraTransformType) else
{ {
case FIRST_PERSON: switch(cameraTransformType)
RenderItem.applyVanillaTransform(model.getItemCameraTransforms().firstPerson); {
break; case FIRST_PERSON:
case GUI: RenderItem.applyVanillaTransform(model.getItemCameraTransforms().firstPerson);
RenderItem.applyVanillaTransform(model.getItemCameraTransforms().gui); break;
break; case GUI:
case HEAD: RenderItem.applyVanillaTransform(model.getItemCameraTransforms().gui);
RenderItem.applyVanillaTransform(model.getItemCameraTransforms().head); break;
break; case HEAD:
case THIRD_PERSON: RenderItem.applyVanillaTransform(model.getItemCameraTransforms().head);
RenderItem.applyVanillaTransform(model.getItemCameraTransforms().thirdPerson); break;
break; case THIRD_PERSON:
default: RenderItem.applyVanillaTransform(model.getItemCameraTransforms().thirdPerson);
break; break;
default:
break;
}
} }
return model; return model;
} }

2
src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java
View File

@ -59,7 +59,7 @@ public interface IPerspectiveAwareModel extends IBakedModel
public boolean isGui3d() { return parent.isGui3d(); } public boolean isGui3d() { return parent.isGui3d(); }
public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
public TextureAtlasSprite getTexture() { return parent.getTexture(); } public TextureAtlasSprite getTexture() { return parent.getTexture(); }
public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
public List<BakedQuad> getFaceQuads(EnumFacing side) { return parent.getFaceQuads(side); } public List<BakedQuad> getFaceQuads(EnumFacing side) { return parent.getFaceQuads(side); }
public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); } public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); }
public VertexFormat getFormat() { return parent.getFormat(); } public VertexFormat getFormat() { return parent.getFormat(); }