From 56df9b63236f66827e12935065b2e96571c540c1 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 3 Nov 2022 13:44:43 +0800 Subject: [PATCH] Add animation morph control (WIP) --- ...ace Override Controller.overrideController | 11 ++ ...verride Controller.overrideController.meta | 8 ++ Assets/Resources/FaceController.controller | 113 ++++++++++++++++++ .../Resources/FaceController.controller.meta | 8 ++ Assets/Scenes/Version2.unity | 2 + Assets/Scripts/UmaContainer.cs | 12 +- Assets/Scripts/UmaViewerBuilder.cs | 2 +- .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 54 ++++++++- .../Scripts/umamusume/Gallop/FacialMorph.cs | 1 + 9 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 Assets/Resources/Face Override Controller.overrideController create mode 100644 Assets/Resources/Face Override Controller.overrideController.meta create mode 100644 Assets/Resources/FaceController.controller create mode 100644 Assets/Resources/FaceController.controller.meta diff --git a/Assets/Resources/Face Override Controller.overrideController b/Assets/Resources/Face Override Controller.overrideController new file mode 100644 index 0000000..13f717b --- /dev/null +++ b/Assets/Resources/Face Override Controller.overrideController @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Face Override Controller + m_Controller: {fileID: 9100000, guid: 09aea86c4ae2e9345a1cfb74dd3b27b1, type: 2} + m_Clips: [] diff --git a/Assets/Resources/Face Override Controller.overrideController.meta b/Assets/Resources/Face Override Controller.overrideController.meta new file mode 100644 index 0000000..875b26d --- /dev/null +++ b/Assets/Resources/Face Override Controller.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21f82840716293147bcb9f4bfb58cc99 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/FaceController.controller b/Assets/Resources/FaceController.controller new file mode 100644 index 0000000..19f0527 --- /dev/null +++ b/Assets/Resources/FaceController.controller @@ -0,0 +1,113 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4072449279223152736 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1046042063806159501} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1046042063806159501 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4072449279223152736} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} + m_Tag: + m_SpeedParameter: animSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: animSpeed +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FaceController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: animSpeed + m_Type: 1 + m_DefaultFloat: 1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: next + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: next_s + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1917244892325702502} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1917244892325702502 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1046042063806159501} + m_Position: {x: 260, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1046042063806159501} diff --git a/Assets/Resources/FaceController.controller.meta b/Assets/Resources/FaceController.controller.meta new file mode 100644 index 0000000..e7395b2 --- /dev/null +++ b/Assets/Resources/FaceController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09aea86c4ae2e9345a1cfb74dd3b27b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index de1f78e..e9cb564 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -25229,6 +25229,8 @@ MonoBehaviour: alphaShader: {fileID: 0} CurrentAudioSources: [] OverrideController: {fileID: 22100000, guid: 130057757529b0f40a4fdc08bf0861ef, type: 2} + FaceOverrideController: {fileID: 22100000, guid: 21f82840716293147bcb9f4bfb58cc99, + type: 2} --- !u!1 &1566898429 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index 1effd40..062d3d2 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -19,6 +19,10 @@ public class UmaContainer : MonoBehaviour public Animator UmaAnimator; public AnimatorOverrideController OverrideController; + public bool isAnimatorControl; + public Animator UmaFaceAnimator; + public AnimatorOverrideController FaceOverrideController; + [Header("Face")] public FaceDrivenKeyTarget FaceDrivenKeyTarget; public FaceEmotionKeyTarget FaceEmotionKeyTarget; @@ -92,7 +96,8 @@ public class UmaContainer : MonoBehaviour //MergeAvatar UmaAnimator = gameObject.AddComponent(); UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name); - UmaAnimator.runtimeAnimatorController = OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController); + OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController); + UmaAnimator.runtimeAnimatorController = OverrideController; } @@ -144,5 +149,10 @@ public class UmaContainer : MonoBehaviour var finalRotation = new Vector2(Mathf.Clamp(deltaRotation.x / 0.86f,-1,1), Mathf.Clamp(deltaRotation.y / 0.86f, -1, 1));//Limited to the angle of view FaceDrivenKeyTarget.SetEyeRange(finalRotation.x, finalRotation.y, finalRotation.x, -finalRotation.y); } + + if (isAnimatorControl) + { + FaceDrivenKeyTarget.ProcessLocator(); + } } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 2e5b3d5..a9a4d59 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -39,7 +39,7 @@ public class UmaViewerBuilder : MonoBehaviour public List CurrentLyrics = new List(); public AnimatorOverrideController OverrideController; - + public AnimatorOverrideController FaceOverrideController; private void Awake() { diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index def5226..9d8d6c0 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -21,11 +21,12 @@ namespace Gallop public List EyeMorphs = new List(); public List MouthMorphs = new List(); - public bool needUpdate = false; - public bool needAllUpdate = false; + public GameObject DrivenKeyLocator; + public UmaContainer Container; Dictionary RotationRecorder = new Dictionary(); + public void Initialize(List objs) { Objs = objs; @@ -119,13 +120,41 @@ namespace Gallop } FacialResetAll(); ChangeMorphWeight(MouthMorphs[3], 1); - + SetupAnimator(); if (UmaViewerUI.Instance) { UmaViewerUI.Instance.LoadFacialPanels(this); } } + public void SetupAnimator() + { + DrivenKeyLocator = new GameObject("DrivenKeyLocator"); + DrivenKeyLocator.transform.SetParent(Container.transform); + SetupLocator("Eye_L_Base_Ctrl", "Eye_L__", EyeMorphs.FindAll(a => a.direction == true)); + SetupLocator("Eye_R_Base_Ctrl", "Eye_R__", EyeMorphs.FindAll(a => a.direction == false)); + SetupLocator("Eyebrow_L_Base_Ctrl", "Eyebrow_L__", EyeBrowMorphs.FindAll(a => a.direction == true)); + SetupLocator("Eyebrow_R_Base_Ctrl", "Eyebrow_R__", EyeBrowMorphs.FindAll(a => a.direction == false)); + SetupLocator("Mouth_Base_Ctrl", "Mouth__", EyeBrowMorphs.FindAll(a => a.direction == false)); + + Container.UmaFaceAnimator = DrivenKeyLocator.AddComponent(); + Container.UmaFaceAnimator.avatar = AvatarBuilder.BuildGenericAvatar(DrivenKeyLocator, "DrivenKeyLocator"); + Container.FaceOverrideController = Instantiate(UmaViewerBuilder.Instance.FaceOverrideController); + Container.UmaFaceAnimator.runtimeAnimatorController = Container.FaceOverrideController; + } + + public void SetupLocator(string rootName, string prefix, List morphs) + { + var root = new GameObject(rootName); + root.transform.SetParent(DrivenKeyLocator.transform); + + morphs.ForEach(morph=>{ + var locator = new GameObject(prefix+morph.tag); + locator.transform.SetParent(root.transform); + morph.locator = locator.transform; + }); + } + public void ChangeMorph() { FacialResetAll(); @@ -224,6 +253,25 @@ namespace Gallop RightEyeYrange.weight = ry; ChangeMorph(); } + + public void ProcessLocator() + { + EyeBrowMorphs.ForEach(morph => + { + morph.weight = morph.locator.transform.localPosition.x; + }); + EyeMorphs.ForEach(morph => + { + morph.weight = morph.locator.transform.localPosition.x; + }); + MouthMorphs.ForEach(morph => + { + if(morph.locator) + morph.weight = morph.locator.transform.localPosition.x; + }); + ChangeMorph(); + } + } } diff --git a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs index 835d64a..1c8a8d7 100644 --- a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs +++ b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs @@ -16,5 +16,6 @@ namespace Gallop public FaceDrivenKeyTarget target; public float weight; public List trsArray; + public Transform locator; } }