Skip to content

Commit 9cea152

Browse files
authored
Worm Ragdoll & Env Updates (#4413)
* add worm updates * add rewman * cp * normalize rewards * only cookie * try 20M. Add3.5Mnn file * reduce strength to 3000spring * facing reward troubleshooting * Update WormAgent.cs * troubleshoot nan * try product of rewards * train 5M steps * try end episode on target touch * fix joint obsv * use 7M steps * added nn file for observation joint fix. looks great * don't end episode * remove old code * refactor to patterns used in walker & crawler * add auto-setup code * reformat * use head vel * remove unneeded observ. update prefabs * update static scenes * keeps rolling. added debug. try 5 m/s * gate the facing reward based on angle tolerance * added 10ms_angle30rew_nn files * use fromto rot * use 7M steps * add new trained files. cleanup code and prefabs * use avgvel. add code comments * remove unused method * add more comments * Update Learning-Environment-Examples.md * Update DynamicTargetPlatform.prefab * remove testing tools * reset targetcontroller to master * reset mat to master * update case * change property name, update prefab * add new set up methods * update format
1 parent ca11a7b commit 9cea152

22 files changed

+2479
-4183
lines changed

Project/Assets/ML-Agents/Examples/SharedAssets/Prefabs/DynamicTargetPlatform.prefab

Lines changed: 1 addition & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ GameObject:
101101
m_Component:
102102
- component: {fileID: 839922442615925678}
103103
m_Layer: 0
104-
m_Name: DynamicPlatform
104+
m_Name: DynamicTargetPlatform
105105
m_TagString: Untagged
106106
m_Icon: {fileID: 0}
107107
m_NavMeshLayer: 0
@@ -120,7 +120,6 @@ Transform:
120120
m_Children:
121121
- {fileID: 839929025558985770}
122122
- {fileID: 840186797462469276}
123-
- {fileID: 844321025358320794}
124123
m_Father: {fileID: 0}
125124
m_RootOrder: 0
126125
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -306,184 +305,6 @@ BoxCollider:
306305
serializedVersion: 2
307306
m_Size: {x: 1, y: 5, z: 1}
308307
m_Center: {x: 0, y: 0, z: 0}
309-
--- !u!1 &845742365997159796
310-
GameObject:
311-
m_ObjectHideFlags: 0
312-
m_CorrespondingSourceObject: {fileID: 0}
313-
m_PrefabInstance: {fileID: 0}
314-
m_PrefabAsset: {fileID: 0}
315-
serializedVersion: 6
316-
m_Component:
317-
- component: {fileID: 844321025358320794}
318-
- component: {fileID: 851178619372665464}
319-
- component: {fileID: 819411542484216416}
320-
- component: {fileID: 859320361128752180}
321-
- component: {fileID: 827313176772345230}
322-
m_Layer: 0
323-
m_Name: Target
324-
m_TagString: target
325-
m_Icon: {fileID: 0}
326-
m_NavMeshLayer: 0
327-
m_StaticEditorFlags: 0
328-
m_IsActive: 1
329-
--- !u!4 &844321025358320794
330-
Transform:
331-
m_ObjectHideFlags: 0
332-
m_CorrespondingSourceObject: {fileID: 0}
333-
m_PrefabInstance: {fileID: 0}
334-
m_PrefabAsset: {fileID: 0}
335-
m_GameObject: {fileID: 845742365997159796}
336-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
337-
m_LocalPosition: {x: 6.2, y: 1.15, z: 3.824}
338-
m_LocalScale: {x: 1.2356956, y: 1.2356961, z: 1.2356961}
339-
m_Children:
340-
- {fileID: 844417529820221198}
341-
m_Father: {fileID: 839922442615925678}
342-
m_RootOrder: 2
343-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
344-
--- !u!33 &851178619372665464
345-
MeshFilter:
346-
m_ObjectHideFlags: 0
347-
m_CorrespondingSourceObject: {fileID: 0}
348-
m_PrefabInstance: {fileID: 0}
349-
m_PrefabAsset: {fileID: 0}
350-
m_GameObject: {fileID: 845742365997159796}
351-
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
352-
--- !u!65 &819411542484216416
353-
BoxCollider:
354-
m_ObjectHideFlags: 0
355-
m_CorrespondingSourceObject: {fileID: 0}
356-
m_PrefabInstance: {fileID: 0}
357-
m_PrefabAsset: {fileID: 0}
358-
m_GameObject: {fileID: 845742365997159796}
359-
m_Material: {fileID: 0}
360-
m_IsTrigger: 0
361-
m_Enabled: 1
362-
serializedVersion: 2
363-
m_Size: {x: 1, y: 1, z: 1}
364-
m_Center: {x: 0, y: 0, z: 0}
365-
--- !u!23 &859320361128752180
366-
MeshRenderer:
367-
m_ObjectHideFlags: 0
368-
m_CorrespondingSourceObject: {fileID: 0}
369-
m_PrefabInstance: {fileID: 0}
370-
m_PrefabAsset: {fileID: 0}
371-
m_GameObject: {fileID: 845742365997159796}
372-
m_Enabled: 1
373-
m_CastShadows: 0
374-
m_ReceiveShadows: 1
375-
m_DynamicOccludee: 1
376-
m_MotionVectors: 1
377-
m_LightProbeUsage: 1
378-
m_ReflectionProbeUsage: 1
379-
m_RenderingLayerMask: 1
380-
m_RendererPriority: 0
381-
m_Materials:
382-
- {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
383-
m_StaticBatchInfo:
384-
firstSubMesh: 0
385-
subMeshCount: 0
386-
m_StaticBatchRoot: {fileID: 0}
387-
m_ProbeAnchor: {fileID: 0}
388-
m_LightProbeVolumeOverride: {fileID: 0}
389-
m_ScaleInLightmap: 1
390-
m_PreserveUVs: 1
391-
m_IgnoreNormalsForChartDetection: 0
392-
m_ImportantGI: 0
393-
m_StitchLightmapSeams: 0
394-
m_SelectedEditorRenderState: 3
395-
m_MinimumChartSize: 4
396-
m_AutoUVMaxDistance: 0.5
397-
m_AutoUVMaxAngle: 89
398-
m_LightmapParameters: {fileID: 0}
399-
m_SortingLayerID: 0
400-
m_SortingLayer: 0
401-
m_SortingOrder: 0
402-
--- !u!54 &827313176772345230
403-
Rigidbody:
404-
m_ObjectHideFlags: 0
405-
m_CorrespondingSourceObject: {fileID: 0}
406-
m_PrefabInstance: {fileID: 0}
407-
m_PrefabAsset: {fileID: 0}
408-
m_GameObject: {fileID: 845742365997159796}
409-
serializedVersion: 2
410-
m_Mass: 5
411-
m_Drag: 0
412-
m_AngularDrag: 0.05
413-
m_UseGravity: 1
414-
m_IsKinematic: 0
415-
m_Interpolate: 0
416-
m_Constraints: 0
417-
m_CollisionDetection: 0
418-
--- !u!1 &845745296463925942
419-
GameObject:
420-
m_ObjectHideFlags: 0
421-
m_CorrespondingSourceObject: {fileID: 0}
422-
m_PrefabInstance: {fileID: 0}
423-
m_PrefabAsset: {fileID: 0}
424-
serializedVersion: 6
425-
m_Component:
426-
- component: {fileID: 844417529820221198}
427-
- component: {fileID: 737110191758369644}
428-
m_Layer: 0
429-
m_Name: Point Light
430-
m_TagString: Untagged
431-
m_Icon: {fileID: 0}
432-
m_NavMeshLayer: 0
433-
m_StaticEditorFlags: 0
434-
m_IsActive: 0
435-
--- !u!4 &844417529820221198
436-
Transform:
437-
m_ObjectHideFlags: 0
438-
m_CorrespondingSourceObject: {fileID: 0}
439-
m_PrefabInstance: {fileID: 0}
440-
m_PrefabAsset: {fileID: 0}
441-
m_GameObject: {fileID: 845745296463925942}
442-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
443-
m_LocalPosition: {x: 0, y: 0, z: 0}
444-
m_LocalScale: {x: 1, y: 1, z: 1}
445-
m_Children: []
446-
m_Father: {fileID: 844321025358320794}
447-
m_RootOrder: 0
448-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
449-
--- !u!108 &737110191758369644
450-
Light:
451-
m_ObjectHideFlags: 0
452-
m_CorrespondingSourceObject: {fileID: 0}
453-
m_PrefabInstance: {fileID: 0}
454-
m_PrefabAsset: {fileID: 0}
455-
m_GameObject: {fileID: 845745296463925942}
456-
m_Enabled: 1
457-
serializedVersion: 8
458-
m_Type: 2
459-
m_Color: {r: 1, g: 0.85834146, b: 0.472, a: 1}
460-
m_Intensity: 1
461-
m_Range: 15
462-
m_SpotAngle: 30
463-
m_CookieSize: 10
464-
m_Shadows:
465-
m_Type: 0
466-
m_Resolution: -1
467-
m_CustomResolution: -1
468-
m_Strength: 1
469-
m_Bias: 0.05
470-
m_NormalBias: 0.4
471-
m_NearPlane: 0.2
472-
m_Cookie: {fileID: 0}
473-
m_DrawHalo: 0
474-
m_Flare: {fileID: 0}
475-
m_RenderMode: 1
476-
m_CullingMask:
477-
serializedVersion: 2
478-
m_Bits: 4294967295
479-
m_Lightmapping: 4
480-
m_LightShadowCasterMode: 0
481-
m_AreaSize: {x: 1, y: 1}
482-
m_BounceIntensity: 1
483-
m_ColorTemperature: 6570
484-
m_UseColorTemperature: 0
485-
m_ShadowRadius: 0
486-
m_ShadowAngle: 0
487308
--- !u!1 &845759966583653904
488309
GameObject:
489310
m_ObjectHideFlags: 0

Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/JointDriveController.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,17 @@ public void SetupBodyPart(Transform t)
141141
bp.groundContact.agent = gameObject.GetComponent<Agent>();
142142
}
143143

144+
if (bp.joint)
145+
{
146+
var jd = new JointDrive
147+
{
148+
positionSpring = maxJointSpring,
149+
positionDamper = jointDampen,
150+
maximumForce = maxJointForceLimit
151+
};
152+
bp.joint.slerpDrive = jd;
153+
}
154+
144155
bp.thisJdController = this;
145156
bodyPartsDict.Add(t, bp);
146157
bodyPartsList.Add(bp);

Project/Assets/ML-Agents/Examples/Worm/Meshes.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-120 KB
Binary file not shown.

Project/Assets/ML-Agents/Examples/Worm/Meshes/WormCourt.fbx.meta

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)