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

Fix TRSRTransformation.toItemTransform. Closes #2425.

Browse source
This commit is contained in:
RainWarrior 2016-02-07 17:49:06 +03:00
parent 4ae2a1fa35
commit 12c924751a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/minecraftforge/client/model/TRSRTransformation.java
View file

@ -157,6 +157,12 @@ public class TRSRTransformation implements IModelState, ITransformation
return ret; return ret;
} }
public static Vector3f toYXZDegrees(Quat4f q)
{
Vector3f yxz = toYXZ(q);
return new Vector3f((float)Math.toDegrees(yxz.x), (float)Math.toDegrees(yxz.y), (float)Math.toDegrees(yxz.z));
}
public static Vector3f toYXZ(Quat4f q) public static Vector3f toYXZ(Quat4f q)
{ {
float w2 = q.w * q.w; float w2 = q.w * q.w;
@ -164,19 +170,19 @@ public class TRSRTransformation implements IModelState, ITransformation
float y2 = q.y * q.y; float y2 = q.y * q.y;
float z2 = q.z * q.z; float z2 = q.z * q.z;
float l = w2 + x2 + y2 + z2; float l = w2 + x2 + y2 + z2;
float sx = 2 * q.y * q.z - 2 * q.w * q.x; float sx = 2 * q.w * q.x - 2 * q.y * q.z;
float x = (float)Math.asin(sx / l); float x = (float)Math.asin(sx / l);
if(Math.abs(sx) > .999f * l) if(Math.abs(sx) > .999f * l)
{ {
return new Vector3f( return new Vector3f(
2 * (float)Math.atan2(q.y, q.w),
x, x,
2 * (float)Math.atan2(q.y, q.w),
0 0
); );
} }
return new Vector3f( return new Vector3f(
(float)Math.atan2(2 * q.x * q.z + 2 * q.y * q.w, w2 - x2 - y2 + z2),
x, x,
(float)Math.atan2(2 * q.x * q.z + 2 * q.y * q.w, w2 - x2 - y2 + z2),
(float)Math.atan2(2 * q.x * q.y + 2 * q.w * q.z, w2 - x2 + y2 - z2) (float)Math.atan2(2 * q.x * q.y + 2 * q.w * q.z, w2 - x2 + y2 - z2)
); );
} }
@ -443,7 +449,7 @@ public class TRSRTransformation implements IModelState, ITransformation
*/ */
public ItemTransformVec3f toItemTransform() public ItemTransformVec3f toItemTransform()
{ {
return new ItemTransformVec3f(toLwjgl(getTranslation()), toLwjgl(toYXZ(getLeftRot())), toLwjgl(getScale())); return new ItemTransformVec3f(toLwjgl(toYXZDegrees(getLeftRot())), toLwjgl(getTranslation()), toLwjgl(getScale()));
} }
public Matrix4f getMatrix() public Matrix4f getMatrix()