From d1469af69dce876e7795e7ee431dccaeca7f643a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 4 Aug 2015 01:38:45 -0400 Subject: [PATCH] Fix vertex transforms not being applied to techne face normals --- .../enderio/core/client/render/TechneUtil.java | 13 ++++++++++++- .../core/client/render/VertexRotationFacing.java | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/enderio/core/client/render/TechneUtil.java b/src/main/java/com/enderio/core/client/render/TechneUtil.java index a19ba75..e614d05 100644 --- a/src/main/java/com/enderio/core/client/render/TechneUtil.java +++ b/src/main/java/com/enderio/core/client/render/TechneUtil.java @@ -289,9 +289,20 @@ public class TechneUtil { tv.add(0.5, 0, 0.5); if(vt != null) { vt.apply(v); + // TODO BLECH + if (vt instanceof VertexRotationFacing) { + normal = ((VertexRotationFacing) vt).rotate(normal); + } + if (vt instanceof VertexTransformComposite) { + for (VertexTransform xform : ((VertexTransformComposite) vt).xforms) { + if (xform instanceof VertexRotationFacing) { + normal = ((VertexRotationFacing) xform).rotate(normal); + } + } + } } - if (isbrh) { + if(isbrh) { int c = (int) (0xFF * RenderUtil.getColorMultiplierForFace(normal)); tes.setColorOpaque(c, c, c); } diff --git a/src/main/java/com/enderio/core/client/render/VertexRotationFacing.java b/src/main/java/com/enderio/core/client/render/VertexRotationFacing.java index 485d627..f33301e 100644 --- a/src/main/java/com/enderio/core/client/render/VertexRotationFacing.java +++ b/src/main/java/com/enderio/core/client/render/VertexRotationFacing.java @@ -26,4 +26,20 @@ public class VertexRotationFacing extends VertexRotation { setAngle(ROTATION_AMOUNT * 3); } } + + public ForgeDirection rotate(ForgeDirection dir) { + if (dir.offsetY != 0) { + return dir; + } + if (getAngle() == ROTATION_AMOUNT) { + return dir.getRotation(ForgeDirection.DOWN); + } + if (getAngle() == ROTATION_AMOUNT * 2) { + return dir.getOpposite(); + } + if (getAngle() == ROTATION_AMOUNT * 3) { + return dir.getRotation(ForgeDirection.UP); + } + return dir; + } }