diff --git a/Assets/Resources/FaceController.controller b/Assets/Resources/Camera Controller.controller similarity index 99% rename from Assets/Resources/FaceController.controller rename to Assets/Resources/Camera Controller.controller index 19f0527..1f453b6 100644 --- a/Assets/Resources/FaceController.controller +++ b/Assets/Resources/Camera Controller.controller @@ -55,7 +55,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FaceController + m_Name: Camera Controller serializedVersion: 5 m_AnimatorParameters: - m_Name: animSpeed diff --git a/Assets/Resources/Camera Controller.controller.meta b/Assets/Resources/Camera Controller.controller.meta new file mode 100644 index 0000000..cc35d29 --- /dev/null +++ b/Assets/Resources/Camera Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31e8857c44e57504abdcd9f9e7f5a041 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Camera Override Controller.overrideController b/Assets/Resources/Camera Override Controller.overrideController new file mode 100644 index 0000000..af04098 --- /dev/null +++ b/Assets/Resources/Camera 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: Camera Override Controller + m_Controller: {fileID: 9100000, guid: 09aea86c4ae2e9345a1cfb74dd3b27b1, type: 2} + m_Clips: [] diff --git a/Assets/Resources/Camera Override Controller.overrideController.meta b/Assets/Resources/Camera Override Controller.overrideController.meta new file mode 100644 index 0000000..c1b905c --- /dev/null +++ b/Assets/Resources/Camera Override Controller.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2074a3b49810aed419168eda443b9e1a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Controller.controller b/Assets/Resources/Controller.controller index 5813512..fb7cad8 100644 --- a/Assets/Resources/Controller.controller +++ b/Assets/Resources/Controller.controller @@ -81,7 +81,8 @@ AnimatorState: m_Name: motion_2 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2501757138902606358} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -222,6 +223,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &2501757138902606358 +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: -1569566867637420955} + 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 &3046527319765726241 AnimatorState: serializedVersion: 6 diff --git a/Assets/Resources/Face Controller.controller b/Assets/Resources/Face Controller.controller new file mode 100644 index 0000000..95cdee1 --- /dev/null +++ b/Assets/Resources/Face Controller.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: Face Controller + 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: 310, y: 130, 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/Face Controller.controller.meta similarity index 100% rename from Assets/Resources/FaceController.controller.meta rename to Assets/Resources/Face Controller.controller.meta diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index e9cb564..fe1a765 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -19980,8 +19980,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 0.999995 - m_Size: 0.9765434 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25231,6 +25231,8 @@ MonoBehaviour: OverrideController: {fileID: 22100000, guid: 130057757529b0f40a4fdc08bf0861ef, type: 2} FaceOverrideController: {fileID: 22100000, guid: 21f82840716293147bcb9f4bfb58cc99, type: 2} + CameraOverrideController: {fileID: 22100000, guid: 2074a3b49810aed419168eda443b9e1a, + type: 2} --- !u!1 &1566898429 GameObject: m_ObjectHideFlags: 0 @@ -41789,6 +41791,7 @@ GameObject: - component: {fileID: 8918259399633999299} - component: {fileID: 6878219667401439304} - component: {fileID: 8918259399633999297} + - component: {fileID: 8918259399633999300} m_Layer: 0 m_Name: Camera m_TagString: MainCamera @@ -41907,6 +41910,25 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8918259399633999296} m_Enabled: 1 +--- !u!95 &8918259399633999300 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8918259399633999296} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!4 &8918259399633999301 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 48f3b5a..d5f7a87 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -40,6 +40,7 @@ public class UmaViewerBuilder : MonoBehaviour public AnimatorOverrideController OverrideController; public AnimatorOverrideController FaceOverrideController; + public AnimatorOverrideController CameraOverrideController; private void Awake() { @@ -953,12 +954,20 @@ public class UmaViewerBuilder : MonoBehaviour } else if (clip.name.Contains("face")) { - clip.wrapMode = WrapMode.Loop; CurrentUMAContainer.FaceOverrideController["clip_1"] = clip; CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); CurrentUMAContainer.isAnimatorControl = true; CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0); } + else if (clip.name.Contains("cam")) + { + Camera.main.transform.position = Vector3.zero; + var overrideController = Instantiate(CameraOverrideController); + overrideController["clip_1"] = clip; + var animator = Camera.main.gameObject.GetComponent(); + animator.runtimeAnimatorController = overrideController; + animator.Play("motion_1", 0, 0); + } else { CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; @@ -967,16 +976,27 @@ public class UmaViewerBuilder : MonoBehaviour // If Cut-in, play immediately without state interpolation if (clip.name.Contains("crd")) { - clip.wrapMode = WrapMode.Loop; var facialMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_face")); + var cameraMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_cam")); + if (facialMotion != null) { RecursiveLoadAsset(facialMotion); } + if(cameraMotion != null) + { + RecursiveLoadAsset(cameraMotion); + } + CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); + CurrentUMAContainer.OverrideController["clip_2"].wrapMode = WrapMode.Loop; } else { + CurrentUMAContainer.isAnimatorControl = false; + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + Camera.main.gameObject.GetComponent().runtimeAnimatorController = null; + CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime); CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next"); }