Merge commit '33b1c0cf52774541fa2eea0c008750193f14737c'
This commit is contained in:
commit
29b37d91c1
@ -33,12 +33,11 @@ namespace LinearAlgebra {
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if UNITY_5_3_OR_NEWER
|
#if UNITY_5_3_OR_NEWER
|
||||||
public static SwingTwist FromQuaternion(Quaternion q) {
|
public static SwingTwist FromQuaternion(Quaternion q) {
|
||||||
// q.ToAngles(out float right, out float up, out float forward);
|
// q.ToAngles(out float right, out float up, out float forward);
|
||||||
UnityEngine.Vector3 angles = q.eulerAngles;
|
UnityEngine.Vector3 angles = q.eulerAngles;
|
||||||
SwingTwist r = new(angles.y, -angles.x, -angles.z);
|
SwingTwist r = Degrees(angles.y, -angles.x, -angles.z);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,7 +45,6 @@ namespace LinearAlgebra {
|
|||||||
Quaternion q = Quaternion.Euler(-this.swing.vertical,
|
Quaternion q = Quaternion.Euler(-this.swing.vertical,
|
||||||
this.swing.horizontal,
|
this.swing.horizontal,
|
||||||
-this.twist);
|
-this.twist);
|
||||||
System.Console.Write($"{q.eulerAngles}");
|
|
||||||
return q;
|
return q;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user