Skip to content

Commit

Permalink
New pedestrian models
Browse files Browse the repository at this point in the history
Signed-off-by: Piotr Jaroszek <piotr.jaroszek@robotec.ai>
  • Loading branch information
pijaro committed Jun 28, 2023
1 parent e896866 commit 03ef4b5
Show file tree
Hide file tree
Showing 54 changed files with 75,483 additions and 697 deletions.
37 changes: 26 additions & 11 deletions Assets/AWSIM/Models/NPCs/Pedestrians/Human/Human.controller
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1234829241748814695, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: 0f119679b0ccb044cb04d4e25b760a06, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -99,7 +99,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -7837701740580716372, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: 96d324d3352518e4b82c4f8778fe83b4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -128,7 +128,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -1527985126055901980, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: 70d522d6465b138488b76be3a9030cdf, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -187,6 +187,20 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &-2312946933553477510
AnimatorTransition:
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: -3319098571341201501}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1101 &-773523382759343240
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -232,7 +246,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 355142055027508395, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: dd46cc49184f0aa47abde3736042af37, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -277,25 +291,25 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: rotateSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: layingFront
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: layingBack
m_Type: 9
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
Expand Down Expand Up @@ -363,7 +377,8 @@ AnimatorStateMachine:
m_Position: {x: 270, y: 300, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_EntryTransitions:
- {fileID: -2312946933553477510}
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 50, z: 0}
Expand Down Expand Up @@ -394,7 +409,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 2468679512774818578, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: 90a086c3d92860c41ae49d19e0b9e531, type: 2}
m_Tag:
m_SpeedParameter: moveSpeed
m_MirrorParameter:
Expand Down Expand Up @@ -422,7 +437,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -705911668533398357, guid: 66d79fa4756bfdb4fa764601627ab286, type: 3}
m_Motion: {fileID: 7400000, guid: 720757b51d18d2140867ea0cad0634db, type: 2}
m_Tag:
m_SpeedParameter: moveSpeed
m_MirrorParameter:
Expand Down
16 changes: 8 additions & 8 deletions Assets/AWSIM/Models/NPCs/Pedestrians/Human/Human.controller.meta
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 03ef4b5

Please sign in to comment.