Skip to content

Add TargetController/OrientationCubeController Components & Bugfix #4157

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.

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

Merged
merged 86 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
8c2d029
added Target and OCube controllers. updated crawler envs
Hunter-Unity Jun 12, 2020
b450045
update walker prefab
Hunter-Unity Jun 12, 2020
d3d5ee1
add refs to prefab
Hunter-Unity Jun 12, 2020
c9b8a91
Update Crawler.prefab
Hunter-Unity Jun 13, 2020
eab5b63
update platform, ragdoll, ocube prefabs
Hunter-Unity Jun 16, 2020
32be194
reformat file
Hunter-Unity Jun 16, 2020
4020a21
reformat files
Hunter-Unity Jun 16, 2020
368283d
fix behavior name
Hunter-Unity Jun 16, 2020
3985ac6
add final retrained crawler and walker nn files
Hunter-Unity Jun 17, 2020
fc8d6ab
collect hip ocube rot in world space
Hunter-Unity Jun 17, 2020
98358bb
update crawler observations and update prefabs
Hunter-Unity Jun 17, 2020
d2d204e
change to 20M steps
Hunter-Unity Jun 17, 2020
b02b8a8
update crwl prefab to 142 observ
Hunter-Unity Jun 17, 2020
06147dd
update obsvs to 241. add expvel reward
Hunter-Unity Jun 18, 2020
d299b7a
change walkspeed to 3
Hunter-Unity Jun 18, 2020
341d538
add new crawler and walker nn files
Hunter-Unity Jun 18, 2020
b897154
adjust rewards
Hunter-Unity Jun 18, 2020
c92de07
enable other pairs
Hunter-Unity Jun 18, 2020
c0cc8fe
add RewardManager
Hunter-Unity Jun 18, 2020
37c8988
cleanup about to do final training
Hunter-Unity Jun 18, 2020
74f47a1
cleanup add nn files for increased facing rew reduced height rew
Hunter-Unity Jun 19, 2020
db72903
try no facing rew
Hunter-Unity Jun 19, 2020
adf99d2
add vel only policy, try dy target
Hunter-Unity Jun 20, 2020
8e43a85
inc torq on cube
Hunter-Unity Jun 20, 2020
cd02623
added dynamic cube nn. gonna try 40M steps
Hunter-Unity Jun 20, 2020
cafeea0
add 40M step test, more cleanup
Hunter-Unity Jun 23, 2020
519842f
change back to 20M steps
Hunter-Unity Jun 23, 2020
12c3c33
Update WalkerStatic.unity
Hunter-Unity Jun 23, 2020
2902517
add no vel pen nn file
Hunter-Unity Jun 23, 2020
b7f7f99
.005 head height rew
Hunter-Unity Jun 23, 2020
822e2a2
remove extra walker in scene
Hunter-Unity Jun 23, 2020
9e8b95f
Update WalkerWithTargetPair.prefab
Hunter-Unity Jun 23, 2020
a69e551
Update WalkerStatic.unity
Hunter-Unity Jun 23, 2020
9b3e008
more cleanup add new nn file with less head height reward
Hunter-Unity Jun 24, 2020
3c8ebcd
added Target and OCube controllers. updated crawler envs
Hunter-Unity Jun 12, 2020
39b3372
update walker prefab
Hunter-Unity Jun 12, 2020
3c4a849
add refs to prefab
Hunter-Unity Jun 12, 2020
793a5d0
Update Crawler.prefab
Hunter-Unity Jun 13, 2020
cd41c0a
update platform, ragdoll, ocube prefabs
Hunter-Unity Jun 16, 2020
bd58f72
reformat file
Hunter-Unity Jun 16, 2020
99fd1a0
reformat files
Hunter-Unity Jun 16, 2020
a718c1e
fix behavior name
Hunter-Unity Jun 16, 2020
430f704
add final retrained crawler and walker nn files
Hunter-Unity Jun 17, 2020
b15ff66
collect hip ocube rot in world space
Hunter-Unity Jun 17, 2020
c82ff6a
update crawler observations and update prefabs
Hunter-Unity Jun 17, 2020
314e880
change to 20M steps
Hunter-Unity Jun 17, 2020
44198c0
update crwl prefab to 142 observ
Hunter-Unity Jun 17, 2020
508ac22
update obsvs to 241. add expvel reward
Hunter-Unity Jun 18, 2020
ca97071
change walkspeed to 3
Hunter-Unity Jun 18, 2020
9b27fe5
add new crawler and walker nn files
Hunter-Unity Jun 18, 2020
ea46ac4
adjust rewards
Hunter-Unity Jun 18, 2020
66ded00
enable other pairs
Hunter-Unity Jun 18, 2020
965825b
add RewardManager
Hunter-Unity Jun 18, 2020
0b03702
cleanup about to do final training
Hunter-Unity Jun 18, 2020
84195b8
cleanup add nn files for increased facing rew reduced height rew
Hunter-Unity Jun 19, 2020
4037fe3
try no facing rew
Hunter-Unity Jun 19, 2020
0e3bd76
add vel only policy, try dy target
Hunter-Unity Jun 20, 2020
7ee5b8d
inc torq on cube
Hunter-Unity Jun 20, 2020
1b9f64c
added dynamic cube nn. gonna try 40M steps
Hunter-Unity Jun 20, 2020
f528717
add 40M step test, more cleanup
Hunter-Unity Jun 23, 2020
e8c2cbc
change back to 20M steps
Hunter-Unity Jun 23, 2020
1245771
Update WalkerStatic.unity
Hunter-Unity Jun 23, 2020
203faf2
add no vel pen nn file
Hunter-Unity Jun 23, 2020
feccf45
.005 head height rew
Hunter-Unity Jun 23, 2020
e21ffa8
remove extra walker in scene
Hunter-Unity Jun 23, 2020
ea019e6
Update WalkerWithTargetPair.prefab
Hunter-Unity Jun 23, 2020
1d96e44
Update WalkerStatic.unity
Hunter-Unity Jun 23, 2020
15265cc
more cleanup add new nn file with less head height reward
Hunter-Unity Jun 24, 2020
78428f5
Merge branch 'hh/develop/targetControllerFinal' of https://github.com…
Hunter-Unity Jun 24, 2020
69a7f2a
cleanup
Hunter-Unity Jun 24, 2020
fdd0e79
remove comment
Hunter-Unity Jun 24, 2020
aa8617d
more cleanup
Hunter-Unity Jun 24, 2020
050f346
correct format
Hunter-Unity Jun 24, 2020
835f5ae
Update ProjectVersion.txt
Hunter-Unity Jun 24, 2020
4189410
change to Log()
Hunter-Unity Jun 29, 2020
823bac9
cleanup
Hunter-Unity Jun 29, 2020
a607310
use the starting y position instead of a hard coded height
Hunter-Unity Jun 30, 2020
b15d0a2
test old fromtorot
Hunter-Unity Jun 30, 2020
ed07721
add 236 model
Hunter-Unity Jul 1, 2020
9227400
testing new 236 nn files
Hunter-Unity Jul 2, 2020
234f83e
add final walker nn files
Hunter-Unity Jul 2, 2020
5402413
cleanup
Hunter-Unity Jul 2, 2020
30e09b7
crawler cleanup
Hunter-Unity Jul 2, 2020
754c29f
update crawler observ size
Hunter-Unity Jul 2, 2020
b468c8b
add final crawler nn files
Hunter-Unity Jul 2, 2020
68b69e8
fixed formatting ssues
Hunter-Unity Jul 2, 2020
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
65 changes: 31 additions & 34 deletions Project/Assets/ML-Agents/Examples/Crawler/Prefabs/Crawler.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ GameObject:
- component: {fileID: 4845971000000621466}
m_Layer: 0
m_Name: foreleg0
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -423,7 +423,7 @@ GameObject:
- component: {fileID: 4845971000245862062}
m_Layer: 0
m_Name: foreleg3
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -677,7 +677,7 @@ GameObject:
- component: {fileID: 4845971000281612788}
m_Layer: 0
m_Name: foreleg2
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -932,7 +932,7 @@ GameObject:
- component: {fileID: 4845971000566026491}
m_Layer: 0
m_Name: leg2
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -1434,7 +1434,7 @@ GameObject:
- component: {fileID: 4845971000943818052}
m_Layer: 0
m_Name: leg3
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -1999,7 +1999,7 @@ GameObject:
- component: {fileID: 4845971001325249075}
m_Layer: 0
m_Name: leg1
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -2177,7 +2177,7 @@ GameObject:
- component: {fileID: 4845971001327158052}
m_Layer: 0
m_Name: leg0
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -2356,7 +2356,7 @@ GameObject:
- component: {fileID: 4845971001588102144}
m_Layer: 0
m_Name: Body
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -2489,7 +2489,7 @@ GameObject:
- component: {fileID: 4845971001622533709}
m_Layer: 0
m_Name: foreleg1
m_TagString: Untagged
m_TagString: agent
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -2784,10 +2784,10 @@ MonoBehaviour:
VectorActionSize: 14000000
VectorActionDescriptions: []
VectorActionSpaceType: 1
m_Model: {fileID: 11400000, guid: 9049db2514a454914be8f5e5d3508ffe, type: 3}
m_Model: {fileID: 11400000, guid: c6509001ba679447fba27f894761c3ba, type: 3}
m_InferenceDevice: 0
m_BehaviorType: 0
m_BehaviorName: CrawlerDynamic
m_BehaviorName: CrawlerStatic
TeamId: 0
m_UseChildSensors: 1
m_ObservableAttributeHandling: 0
Expand All @@ -2809,10 +2809,6 @@ MonoBehaviour:
MaxStep: 5000
maximumWalkingSpeed: 999
target: {fileID: 0}
targetSpawnRadius: 40
detectTargets: 1
respawnTargetWhenTouched: 1
ground: {fileID: 0}
body: {fileID: 4845971001588102148}
leg0Upper: {fileID: 4845971001327157979}
leg0Lower: {fileID: 4845971000000621467}
Expand All @@ -2822,17 +2818,17 @@ MonoBehaviour:
leg2Lower: {fileID: 4845971000281612789}
leg3Upper: {fileID: 4845971000943818107}
leg3Lower: {fileID: 4845971000245862063}
orientationCube: {fileID: 2270141184585723037}
orientationCube: {fileID: 4462656217269709630}
rewardMovingTowardsTarget: 1
rewardFacingTarget: 1
rewardUseTimePenalty: 0
useFootGroundedVisualization: 0
foot0: {fileID: 0}
foot1: {fileID: 0}
foot2: {fileID: 0}
foot3: {fileID: 0}
groundedMaterial: {fileID: 0}
unGroundedMaterial: {fileID: 0}
foot0: {fileID: 4845971001702882992}
foot1: {fileID: 4845970999844939483}
foot2: {fileID: 4845970999929964134}
foot3: {fileID: 4845971001308907666}
groundedMaterial: {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
unGroundedMaterial: {fileID: 2100000, guid: eaad04b0e0dec42229c9cb00a981d7ac, type: 2}
--- !u!114 &4845971001715176662
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2960,11 +2956,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4845971001715176651}
m_Modifications:
- target: {fileID: 2591864625898824423, guid: 72f745913c5a34df5aaadd5c1f0024cb,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2591864627249999504, guid: 72f745913c5a34df5aaadd5c1f0024cb,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -3027,18 +3018,24 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72f745913c5a34df5aaadd5c1f0024cb, type: 3}
--- !u!1 &2270141184585723037 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2591864627249999519, guid: 72f745913c5a34df5aaadd5c1f0024cb,
type: 3}
m_PrefabInstance: {fileID: 4357529801223143938}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2270141184585723026 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2591864627249999504, guid: 72f745913c5a34df5aaadd5c1f0024cb,
type: 3}
m_PrefabInstance: {fileID: 4357529801223143938}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4462656217269709630 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114705911240010044, guid: 72f745913c5a34df5aaadd5c1f0024cb,
type: 3}
m_PrefabInstance: {fileID: 4357529801223143938}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 771e78c5e980e440e8cd19716b55075f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8385811723256971493
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3069,7 +3066,7 @@ PrefabInstance:
- target: {fileID: 6084207059270429360, guid: e568400ebedb3474fac505995f12ed4a,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.5078
value: -1.996
objectReference: {fileID: 0}
- target: {fileID: 6084207059270429360, guid: e568400ebedb3474fac505995f12ed4a,
type: 3}
Expand Down
Loading