cailean
/
drecon-unity
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

removed terrain col on end episode & vfx graph adj

master
cailean 9 months ago
parent
c58d9a1e80
commit
0c43e5ccd4
4 changed files with 187 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs
  2. 183
      Assets/5_Scenes/DreconDemo.unity
  3. 2
      Assets/5_Scenes/DreconDemo/HDRP.asset
  4. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json

12
Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs
View File

@ -63,6 +63,10 @@ public class RagDollAgent : Agent
private float x = 0;
private float y = 100;
public TerrainCollider m_TerrainCollider;
public LayerMask m_ExcludeLayer;
public LayerMask m_Temp;
void Awake()
{
if (RequestCamera && CameraTarget != null)
@ -224,6 +228,13 @@ public class RagDollAgent : Agent
if (!waitStarted)
{
waitStarted = true;
//Disable Ground Collider
if (m_TerrainCollider)
{
// Exclude Marathon from Collider
m_Temp = m_TerrainCollider.excludeLayers;
m_TerrainCollider.excludeLayers = m_ExcludeLayer;
}
}
timer += Time.fixedDeltaTime;
@ -232,6 +243,7 @@ public class RagDollAgent : Agent
{
timer = 0;
waitStarted = false;
m_TerrainCollider.excludeLayers = m_Temp;
EndEpisode();
}
}

183
Assets/5_Scenes/DreconDemo.unity
View File

@ -409,6 +409,13 @@ MonoBehaviour:
DebugPauseOnReset: 0
UsePDControl: 0
_hasAwake: 0
m_TerrainCollider: {fileID: 0}
m_ExcludeLayer:
serializedVersion: 2
m_Bits: 0
m_Temp:
serializedVersion: 2
m_Bits: 0
--- !u!114 &11637562
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1975,6 +1982,50 @@ Transform:
m_Children: []
m_Father: {fileID: 1943068351}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &116290767
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 116290768}
- component: {fileID: 116290769}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &116290768
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116290767}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 19.341925, y: 6.744215, z: 1.1490406}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1790179328}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &116290769
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116290767}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &122033971
GameObject:
m_ObjectHideFlags: 0
@ -2675,7 +2726,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153031623}
serializedVersion: 2
m_LocalRotation: {x: -2.3506322e-17, y: 0.99859816, z: 0.052931532, w: 4.4346667e-16}
m_LocalRotation: {x: -3.738411e-17, y: 0.99859816, z: 0.052931532, w: 6.6551125e-16}
m_LocalPosition: {x: 18.113062, y: 7.9968653, z: 4.3685308}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -5228,9 +5279,9 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 4
near clip plane: 0.1
far clip plane: 5000
field of view: 10
field of view: 40
orthographic: 0
orthographic size: 10
m_Depth: -1
@ -5256,8 +5307,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: -2.3506322e-17, y: 0.99859816, z: 0.052931532, w: 4.4346667e-16}
m_LocalPosition: {x: 18.113062, y: 7.9968653, z: 4.3685308}
m_LocalRotation: {x: -0.21962297, y: -0.6757513, z: 0.20426153, w: -0.6733521}
m_LocalPosition: {x: -147.7, y: 178.3, z: -6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -5310,7 +5361,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
backgroundColorHDR: {r: 1, g: 0.25206706, b: 0, a: 0}
clearDepth: 1
volumeLayerMask:
serializedVersion: 2
@ -6566,6 +6617,13 @@ MonoBehaviour:
DebugPauseOnReset: 0
UsePDControl: 0
_hasAwake: 0
m_TerrainCollider: {fileID: 0}
m_ExcludeLayer:
serializedVersion: 2
m_Bits: 0
m_Temp:
serializedVersion: 2
m_Bits: 0
--- !u!114 &462307168
MonoBehaviour:
m_ObjectHideFlags: 0
@ -10073,7 +10131,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 100
OrthographicSize: 10
NearClipPlane: 4
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: -95
ModeOverride: 0
@ -10104,7 +10162,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.52918464, y: -0.000000026320045, z: 0.000000016414912, w: 0.8485067}
m_LocalRotation: {x: 0.52918464, y: 0.00000002632004, z: -0.00000001641491, w: 0.8485067}
m_LocalPosition: {x: 18.113062, y: 8.800761, z: -0.5535152}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -13935,6 +13993,7 @@ Transform:
- {fileID: 153031625}
- {fileID: 1955078060}
- {fileID: 882491598}
- {fileID: 1790179328}
m_Father: {fileID: 547443783}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1347046965
@ -19034,6 +19093,103 @@ Transform:
- {fileID: 1601111631}
m_Father: {fileID: 898160568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1790179327
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1790179328}
- component: {fileID: 1790179330}
- component: {fileID: 1790179329}
m_Layer: 0
m_Name: Overview
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1790179328
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1790179327}
serializedVersion: 2
m_LocalRotation: {x: -0.21962297, y: -0.6757513, z: 0.20426153, w: -0.6733521}
m_LocalPosition: {x: -147.7, y: 178.3, z: -6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 116290768}
m_Father: {fileID: 1346050330}
m_LocalEulerAnglesHint: {x: 34.878, y: -269.319, z: 1.519}
--- !u!114 &1790179329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1790179327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 449ef5ebbe24720439ec31d15f7b6f3d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FocusTracksTarget: 0
m_FocusTracking: 0
m_FocusTarget: {fileID: 0}
m_FocusOffset: 0
m_Profile: {fileID: 11400000, guid: cabfbfbafb32c0142a37f923cee7926f, type: 2}
--- !u!114 &1790179330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1790179327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 100000
m_StandbyUpdate: 2
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 40
OrthographicSize: 10
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
Iso: 200
ShutterSpeed: 0.005
Aperture: 16
BladeCount: 5
Curvature: {x: 2, y: 11}
BarrelClipping: 0.25
Anamorphism: 0
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 116290768}
--- !u!1 &1790410635
GameObject:
m_ObjectHideFlags: 0
@ -20883,7 +21039,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 10
OrthographicSize: 10
NearClipPlane: 4
NearClipPlane: 1.09
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
@ -20914,7 +21070,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955078056}
serializedVersion: 2
m_LocalRotation: {x: 0.0000005639385, y: 0.7132504, z: -0.7009093, w: 0.0000005738679}
m_LocalRotation: {x: -0.0000005639385, y: 0.7132504, z: -0.7009093, w: -0.0000005738679}
m_LocalPosition: {x: 18.113062, y: 10.496865, z: -0.6314695}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -30768,6 +30924,13 @@ MonoBehaviour:
DebugPauseOnReset: 0
UsePDControl: 0
_hasAwake: 0
m_TerrainCollider: {fileID: 7966628216687685224}
m_ExcludeLayer:
serializedVersion: 2
m_Bits: 64
m_Temp:
serializedVersion: 2
m_Bits: 0
--- !u!4 &6600970695720596244
Transform:
m_ObjectHideFlags: 0

2
Assets/5_Scenes/DreconDemo/HDRP.asset
View File

@ -451,7 +451,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aaa3b8214f75b354e9ba2caadd022259, type: 3}
m_Name: DepthOfField
m_EditorClassIdentifier:
active: 1
active: 0
quality:
m_OverrideState: 1
m_Value: 1

2
Assets/ML-Agents/Timers/DreconDemo_timers.json
View File

@ -1 +1 @@
{"count":1,"self":51.253046399999995,"total":53.5221263,"children":{"InitializeActuators":{"count":1,"self":0.0010008999999999999,"total":0.0010008999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0005032,"total":0.0005032,"children":null},"AgentSendState":{"count":3820,"self":0.0196162,"total":0.47022919999999996,"children":{"CollectObservations":{"count":1910,"self":0.4360554,"total":0.4360554,"children":null},"WriteActionMask":{"count":1910,"self":0.0015096999999999999,"total":0.0015096999999999999,"children":null},"RequestDecision":{"count":1910,"self":0.0130479,"total":0.0130479,"children":null}}},"DecideAction":{"count":3820,"self":0.84313149999999992,"total":0.84313149999999992,"children":null},"AgentAct":{"count":3820,"self":0.9542145,"total":0.9542145,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":2,"max":517.4701,"min":70.9131241,"runningAverage":294.19162,"value":517.4701,"weightedAverage":182.552368}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711637635","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 7dfd37ea-e31d-4703-8403-cb0ce14358b0 -accessToken havT1r_0scGOVv_f93_50AopyNV5VMTA6NIpPysb4Po005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1711637688"}}
{"count":1,"self":522.5305088,"total":545.031218,"children":{"InitializeActuators":{"count":1,"self":0.001005,"total":0.001005,"children":null},"InitializeSensors":{"count":1,"self":0.0015036,"total":0.0015036,"children":null},"AgentSendState":{"count":43077,"self":0.18527069999999998,"total":5.9435363,"children":{"CollectObservations":{"count":21539,"self":5.6724704,"total":5.6724706,"children":null},"WriteActionMask":{"count":21539,"self":0.029078299999999998,"total":0.029078299999999998,"children":null},"RequestDecision":{"count":21539,"self":0.056716699999999995,"total":0.056716699999999995,"children":null}}},"DecideAction":{"count":43077,"self":9.4227864,"total":9.4227864999999991,"children":null},"AgentAct":{"count":43077,"self":7.1308735999999993,"total":7.1308736999999995,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":13,"max":6121.50244,"min":40.64789,"runningAverage":1525.03857,"value":1943.27527,"weightedAverage":1209.52551}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711646367","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 7dfd37ea-e31d-4703-8403-cb0ce14358b0 -accessToken R8JFKUFXjappPc2fIMikEaD5QwqfvQSIrzEQhOcmSAw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1711646912"}}
Write Preview
Loading…
Cancel
Save