ModelRotation.getMatrix() now returns the correct matrix; fixed the application of custom transformations to vanilla models; fixed application of transformations to B3D models; fixed the culling of rotated vanilla models

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -9,6 +9,8 @@ import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 
 import javax.vecmath.Matrix4f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector4f;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -35,6 +37,7 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.model.IBakedModel;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelRotation;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -633,4 +636,24 @@ public class ForgeHooksClient
                 FMLLog.severe("Unimplemented vanilla attribute upload: %s", attrType.getDisplayName());
         }
     }
+
+    public static void transform(Vector3d vec, Matrix4f m)
+    {
+        Vector4f tmp = new Vector4f((float)vec.x, (float)vec.y, (float)vec.z, 1f);
+        m.transform(tmp);
+        if(Math.abs(tmp.w - 1f) > 1e-5) tmp.scale(1f / tmp.w);
+        vec.set(tmp.x, tmp.y, tmp.z);
+    }
+
+    public static Matrix4f getMatrix(ModelRotation modelRotation)
+    {
+        Matrix4f ret = new Matrix4f(modelRotation.getMatrix4d()), tmp = new Matrix4f();
+        tmp.setIdentity();
+        tmp.m03 = tmp.m13 = tmp.m23 = .5f;
+        ret.mul(tmp, ret);
+        tmp.invert();
+        //tmp.m03 = tmp.m13 = tmp.m23 = -.5f;
+        ret.mul(tmp);
+        return ret;
+    }
 }

src/main/java/net/minecraftforge/client/model/TRSRTransformation.java

@@ -9,6 +9,7 @@ import javax.vecmath.Vector4f;
 import net.minecraft.client.renderer.block.model.ItemTransformVec3f;
 import net.minecraft.client.resources.model.ModelRotation;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3i;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
@@ -57,7 +58,7 @@ public class TRSRTransformation implements IModelState, ITransformation
 
     public TRSRTransformation(ModelRotation rotation)
     {
-        this(new Matrix4f(rotation.getMatrix4d()));
+        this(rotation.getMatrix());
     }
 
     private static final TRSRTransformation identity;
@@ -432,9 +433,28 @@ public class TRSRTransformation implements IModelState, ITransformation
 
     public static EnumFacing rotate(Matrix4f matrix, EnumFacing facing)
     {
-        Vector4f vec = new Vector4f(facing.getDirectionVec().getX(), facing.getDirectionVec().getY(), facing.getDirectionVec().getZ(), 1);
+        Vec3i dir = facing.getDirectionVec();
+        Vector4f vec = new Vector4f(dir.getX(), dir.getY(), dir.getZ(), 0);
         matrix.transform(vec);
-        return EnumFacing.getFacingFromVector(vec.x / vec.w, vec.y / vec.w, vec.z / vec.w);
+        return EnumFacing.getFacingFromVector(vec.x, vec.y, vec.z);
+    }
+
+    public static boolean isInteger(Matrix4f matrix)
+    {
+        Matrix4f m = new Matrix4f();
+        m.setIdentity();
+        m.m30 = m.m31 = m.m32 = 1;
+        m.m33 = 0;
+        m.mul(matrix, m);
+        for(int i = 0; i < 3; i++)
+        {
+            for(int j = 0; j < 3; j++)
+            {
+                float v = m.getElement(i, j) / m.getElement(3, j);
+                if(Math.abs(v - Math.round(v)) > 1e-5) return false;
+            }
+        }
+        return true;
     }
 
     public int rotate(EnumFacing facing, int vertexIndex)

src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java

@@ -236,6 +236,11 @@ public class B3DLoader implements ICustomModelLoader
         public static TRSRTransformation getNodeMatrix(Animation animation, Node<?> node, int frame)
         {
             TRSRTransformation ret = TRSRTransformation.identity();
+            if(node.getParent() != null)
+            {
+                TRSRTransformation pm = cache.getUnchecked(Triple.<Animation, Node<?>, Integer>of(animation, node.getParent(), frame));
+                ret = ret.compose(pm);
+            }
             Key key = null;
             if(animation != null) key = animation.getKeys().get(frame, node);
             else if(key == null && node.getAnimation() != null && node.getAnimation() != animation) key = node.getAnimation().getKeys().get(frame, node);
@@ -441,14 +446,7 @@ public class B3DLoader implements ICustomModelLoader
                     // gets transformation in global space
                     public Matrix4f apply(Node<?> node)
                     {
-                        TRSRTransformation ret = TRSRTransformation.identity(), pm = null;
-                        if(node.getParent() != null) pm = new TRSRTransformation(apply(node.getParent()));
-                        if(pm != null)
-                        {
-                            ret = ret.compose(pm);
-                        }
-                        ret = ret.compose(state.apply(PartWrapper.create(node)));
-                        return ret.getMatrix();
+                        return state.apply(PartWrapper.create(node)).getMatrix();
                     }
                 });
                 for(Face f : faces)