Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed teleport animations/scripts to not reset animator state #8781

Merged
merged 1 commit into from
Oct 11, 2020
Merged

Fixed teleport animations/scripts to not reset animator state #8781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions ...RTK/SDK/Features/UX/Animations/Cursors/TeleportCursor/TeleportCursorController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,6 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 268147001575462652}
--- !u!1102 &-506156243491230051
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TeleportIdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 9588a2e9594adf94cb613e226589f5e5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -427,9 +401,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102142302649466056}
m_Position: {x: 492, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -506156243491230051}
m_Position: {x: 527, y: 185, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down
76 changes: 38 additions & 38 deletions Assets/MRTK/SDK/Features/UX/Animations/Cursors/TeleportCursor/TeleportInvalid.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TeleportInvalid
serializedVersion: 6
m_Legacy: 0
Expand Down Expand Up @@ -199,23 +200,23 @@ AnimationClip:
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
attribute: m_Enabled
path: TeleportArrow
classID: 1
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
Expand All @@ -227,23 +228,23 @@ AnimationClip:
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
attribute: m_Enabled
path: TeleportMid
classID: 1
classID: 23
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
Expand All @@ -254,49 +255,49 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 3923819429
path: 1112903405
attribute: 2108656497
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 3093145629
attribute: 2086281974
path: 3595436678
attribute: 3305885265
script: {fileID: 0}
typeID: 1
typeID: 23
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3923819429
attribute: 2086281974
path: 1112903405
attribute: 3305885265
script: {fileID: 0}
typeID: 1
typeID: 23
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3923819429
path: 1112903405
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3923819429
path: 1112903405
attribute: 1303350129
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 3923819429
path: 1112903405
attribute: 1571785585
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 3923819429
path: 1112903405
attribute: 1840221041
script: {fileID: 0}
typeID: 23
Expand Down Expand Up @@ -566,23 +567,23 @@ AnimationClip:
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
attribute: m_Enabled
path: TeleportArrow
classID: 1
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
Expand All @@ -594,26 +595,25 @@ AnimationClip:
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
attribute: m_Enabled
path: TeleportMid
classID: 1
classID: 23
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Loading