diff --git a/Assets/biped-test/animations/toggles/show-hwm-off.anim b/Assets/biped-test/animations/toggles/show-hwm-off.anim new file mode 100644 index 0000000..55c681b --- /dev/null +++ b/Assets/biped-test/animations/toggles/show-hwm-off.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: show-hwm-off + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: MESH_HWMDebug + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1480953100 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: MESH_HWMDebug + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/biped-test/animations/toggles/show-hwm-off.anim.meta b/Assets/biped-test/animations/toggles/show-hwm-off.anim.meta new file mode 100644 index 0000000..ec9204e --- /dev/null +++ b/Assets/biped-test/animations/toggles/show-hwm-off.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8358a3ef61b35b4eb5d27d840b30552 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/biped-test/animations/toggles/show-hwm-on.anim b/Assets/biped-test/animations/toggles/show-hwm-on.anim new file mode 100644 index 0000000..8d7f50d --- /dev/null +++ b/Assets/biped-test/animations/toggles/show-hwm-on.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: show-hwm-on + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: MESH_HWMDebug + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1480953100 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: MESH_HWMDebug + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/biped-test/animations/toggles/show-hwm-on.anim.meta b/Assets/biped-test/animations/toggles/show-hwm-on.anim.meta new file mode 100644 index 0000000..68e5a38 --- /dev/null +++ b/Assets/biped-test/animations/toggles/show-hwm-on.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f01023d112f9a4343999ace9654bad31 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/biped-test/biped-fx.controller b/Assets/biped-test/biped-fx.controller index 1a99d35..dfb4934 100644 --- a/Assets/biped-test/biped-fx.controller +++ b/Assets/biped-test/biped-fx.controller @@ -1,5 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9188688294259164442 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: show-hwm-off + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2326360071142653495} + 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: b8358a3ef61b35b4eb5d27d840b30552, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-8918153812154898797 AnimatorState: serializedVersion: 6 @@ -330,6 +357,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: Voice +--- !u!1101 &-2326360071142653495 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: ShowHWM + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3349416441473168744} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1346526048298533149 AnimatorState: serializedVersion: 6 @@ -357,6 +409,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-832623102407090500 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: ShowHWM + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9188688294259164442} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-619824499884561674 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -422,25 +499,49 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: ShowSliders m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: ShowHWM + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: shapeA + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: shapeB + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: shapeC + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} - m_Name: Viseme m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Voice m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -478,6 +579,30 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Show HWM + m_StateMachine: {fileID: 2348116956090177355} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: HWM Demo + m_StateMachine: {fileID: 9182885298856804393} + 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} - serializedVersion: 5 m_Name: ManualViseme m_StateMachine: {fileID: 4697315387886343345} @@ -570,6 +695,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &2348116956090177355 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Show HWM + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -9188688294259164442} + m_Position: {x: 300, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3349416441473168744} + m_Position: {x: 300, y: 200, 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: -9188688294259164442} --- !u!1102 &2618761108962378242 AnimatorState: serializedVersion: 6 @@ -750,6 +900,33 @@ AnimatorStateTransition: m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &3349416441473168744 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: show-hwm-on + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -832623102407090500} + 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: f01023d112f9a4343999ace9654bad31, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &3372178666247173499 AnimatorState: serializedVersion: 6 @@ -1203,3 +1380,22 @@ AnimatorStateTransition: m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1107 &9182885298856804393 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HWM Demo + m_ChildStates: [] + 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: 0} diff --git a/Assets/biped-test/biped-menu.asset b/Assets/biped-test/biped-menu.asset index eb28305..1483a5f 100644 --- a/Assets/biped-test/biped-menu.asset +++ b/Assets/biped-test/biped-menu.asset @@ -44,3 +44,13 @@ MonoBehaviour: subMenu: {fileID: 0} subParameters: [] labels: [] + - name: HWM Demo + icon: {fileID: 10900, guid: 0000000000000000f000000000000000, type: 0} + type: 103 + parameter: + name: + value: 1 + style: 0 + subMenu: {fileID: 11400000, guid: 29f7a20520bb90144b084a16cb94df89, type: 2} + subParameters: [] + labels: [] diff --git a/Assets/biped-test/biped-parameters.asset b/Assets/biped-test/biped-parameters.asset index c84369f..5e911f0 100644 --- a/Assets/biped-test/biped-parameters.asset +++ b/Assets/biped-test/biped-parameters.asset @@ -31,11 +31,31 @@ MonoBehaviour: networkSynced: 1 - name: ShowBones valueType: 2 - saved: 1 + saved: 0 defaultValue: 0 networkSynced: 1 - name: ShowSliders valueType: 2 - saved: 1 + saved: 0 + defaultValue: 0 + networkSynced: 1 + - name: ShowHWM + valueType: 2 + saved: 0 + defaultValue: 0 + networkSynced: 1 + - name: shapeA + valueType: 1 + saved: 0 + defaultValue: 0 + networkSynced: 1 + - name: shapeB + valueType: 1 + saved: 0 + defaultValue: 0 + networkSynced: 1 + - name: shapeC + valueType: 1 + saved: 0 defaultValue: 0 networkSynced: 1 diff --git a/Assets/biped-test/hwm-submenu.asset b/Assets/biped-test/hwm-submenu.asset new file mode 100644 index 0000000..ad8dcb6 --- /dev/null +++ b/Assets/biped-test/hwm-submenu.asset @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -340790334, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: hwm-submenu + m_EditorClassIdentifier: + Parameters: {fileID: 11400000, guid: 0e154ebec817ee342b9dbcc1fb7ebba2, type: 2} + controls: + - name: Show Panel + icon: {fileID: 0} + type: 102 + parameter: + name: ShowHWM + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: [] + labels: [] + - name: Shape A + icon: {fileID: 0} + type: 203 + parameter: + name: shapeA + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: + - name: + labels: [] + - name: Shape C + icon: {fileID: 0} + type: 203 + parameter: + name: shapeC + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: + - name: + labels: [] + - name: Shape B + icon: {fileID: 0} + type: 203 + parameter: + name: shapeB + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: + - name: + labels: [] diff --git a/Assets/biped-test/hwm-submenu.asset.meta b/Assets/biped-test/hwm-submenu.asset.meta new file mode 100644 index 0000000..e0639dc --- /dev/null +++ b/Assets/biped-test/hwm-submenu.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29f7a20520bb90144b084a16cb94df89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: