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

Removed blockCenterToCorner from TRSRTransformation constructor. Closes #2461.

This commit is contained in:
RainWarrior 2016-03-21 18:23:27 +03:00
parent c589a3a299
commit 4e6ad80370
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,7 +597,7 @@ public class ForgeHooksClient
public static Optional<TRSRTransformation> applyTransform(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform, Optional<? extends IModelPart> part)
{
if(part.isPresent()) return Optional.absent();
return Optional.of(new TRSRTransformation(transform));
return Optional.of(TRSRTransformation.blockCenterToCorner(new TRSRTransformation(transform)));
}
public static Optional<TRSRTransformation> applyTransform(Matrix4f matrix, Optional<? extends IModelPart> part)

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

@ -68,7 +68,7 @@ public interface IPerspectiveAwareModel extends IBakedModel
ImmutableMap.Builder<TransformType, TRSRTransformation> builder = ImmutableMap.builder();
for(TransformType type : TransformType.values())
{
builder.put(type, new TRSRTransformation(transforms.getTransform(type)));
builder.put(type, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(transforms.getTransform(type))));
}
return builder.build();
}

10
src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
View File

@ -73,15 +73,7 @@ public final class TRSRTransformation implements IModelState, ITransformation
@SideOnly(Side.CLIENT)
public TRSRTransformation(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform)
{
this(getMatrix(transform));
}
@Deprecated
@SideOnly(Side.CLIENT)
public static Matrix4f getMatrix(net.minecraft.client.renderer.block.model.ItemTransformVec3f transform)
{
TRSRTransformation ret = new TRSRTransformation(toVecmath(transform.translation), quatFromXYZDegrees(toVecmath(transform.rotation)), toVecmath(transform.scale), null);
return blockCenterToCorner(ret).getMatrix();
this(toVecmath(transform.translation), quatFromXYZDegrees(toVecmath(transform.rotation)), toVecmath(transform.scale), null);
}
@SideOnly(Side.CLIENT)