From 7e3460991aa622e666c8a7840a9b9f27a2291c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Sun, 18 Sep 2022 23:30:00 +0800 Subject: [PATCH] fix emotion rotation. --- Assets/Scripts/RotationConvert.cs | 27 +++++++++++++++++++ Assets/Scripts/RotationConvert.cs.meta | 11 ++++++++ .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 12 ++++----- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 Assets/Scripts/RotationConvert.cs create mode 100644 Assets/Scripts/RotationConvert.cs.meta diff --git a/Assets/Scripts/RotationConvert.cs b/Assets/Scripts/RotationConvert.cs new file mode 100644 index 0000000..c2a9b58 --- /dev/null +++ b/Assets/Scripts/RotationConvert.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RotationConvert : MonoBehaviour +{ + public static Quaternion fromMaya(Vector3 euler_angle) + { + euler_angle.x *= Mathf.Deg2Rad; + euler_angle.y *= Mathf.Deg2Rad; + euler_angle.z *= Mathf.Deg2Rad; + + float c = Mathf.Cos(euler_angle[0] / 2); + float d = Mathf.Cos(euler_angle[1] / 2); + float e = Mathf.Cos(euler_angle[2] / 2); + float f = Mathf.Sin(euler_angle[0] / 2); + float g = Mathf.Sin(euler_angle[1] / 2); + float h = Mathf.Sin(euler_angle[2] / 2); + + float x = f * d * e - c * g * h; + float y = c * g * e + f * d * h; + float z = c * d * h - f * g * e; + float w = c * d * e + f * g * h; + + return new Quaternion(x, y, z, w); + } +} diff --git a/Assets/Scripts/RotationConvert.cs.meta b/Assets/Scripts/RotationConvert.cs.meta new file mode 100644 index 0000000..15bed59 --- /dev/null +++ b/Assets/Scripts/RotationConvert.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f4b735fe905efe349ae8765d518e9e88 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 452232b..b72a0e3 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -130,7 +130,7 @@ namespace Gallop { trs.transform.localScale += trs._scale * morph.Weight; trs.transform.localPosition += trs._position * morph.Weight; - trs.transform.localEulerAngles += trs._rotation * morph.Weight; + trs.transform.localEulerAngles += RotationConvert.fromMaya(trs._rotation).eulerAngles * morph.Weight; }; } } @@ -144,7 +144,7 @@ namespace Gallop trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; - trs.transform.localEulerAngles = trs._rotation; + trs.transform.localEulerAngles = RotationConvert.fromMaya(trs._rotation).eulerAngles; }; } @@ -155,7 +155,7 @@ namespace Gallop trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; - trs.transform.localEulerAngles = trs._rotation; + trs.transform.localEulerAngles = RotationConvert.fromMaya(trs._rotation).eulerAngles; }; } @@ -166,7 +166,7 @@ namespace Gallop trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; - trs.transform.localEulerAngles = trs._rotation; + trs.transform.localEulerAngles = RotationConvert.fromMaya(trs._rotation).eulerAngles; }; } @@ -177,7 +177,7 @@ namespace Gallop trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; - trs.transform.localEulerAngles = trs._rotation; + trs.transform.localEulerAngles = RotationConvert.fromMaya(trs._rotation).eulerAngles; }; } @@ -188,7 +188,7 @@ namespace Gallop trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; - trs.transform.localEulerAngles = trs._rotation; + trs.transform.localEulerAngles = RotationConvert.fromMaya(trs._rotation).eulerAngles; }; } }