Skip to content

Commit

Permalink
fix(Animation): remove legacy animations from animation controllers
Browse files Browse the repository at this point in the history
The Bow and the Fire Extinguisher Joint animation controllers both
contained a reference to a legacy animation, which would on occasion
display a warning in the console.

These have been removed to clean up the associated warning.
  • Loading branch information
thestonefox committed Jan 1, 2017
1 parent c4ff424 commit be6b0d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 56 deletions.
30 changes: 2 additions & 28 deletions Assets/VRTK/Examples/Resources/Animations/BottomJoint.controller
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,14 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1102000010729181926
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: FireExtinguisher_Lever
m_Speed: 0
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_Motion: {fileID: 7400000, guid: 1acc4649e1e4c034aa385465764df45d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1107 &1107000012801851354
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102000010729181926}
m_Position: {x: 204, y: 240, z: 0}
m_ChildStates: []
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -64,4 +38,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 420, y: 96, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102000010729181926}
m_DefaultState: {fileID: 0}
30 changes: 2 additions & 28 deletions Assets/VRTK/Examples/Resources/Animations/Bow.controller
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,14 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &110265928
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: BowPullAnimation
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_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1107 &110773058
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110265928}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStates: []
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -64,4 +38,4 @@ AnimatorStateMachine:
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: 110265928}
m_DefaultState: {fileID: 0}

0 comments on commit be6b0d0

Please sign in to comment.