From 67935a60c42b1b339c3ae1387c19f3a2ed50794b Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Wed, 10 Apr 2024 16:01:45 +0100 Subject: [PATCH] added dolly landscape sweep --- Assets/5_Scenes/DreconDemo.unity | 316 +++++++++++++++++- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 2 files changed, 308 insertions(+), 10 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 8522ab0..ad1cd09 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -154,6 +154,55 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &39290365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 39290366} + - component: {fileID: 39290367} + m_Layer: 0 + m_Name: Dolly-Cart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &39290366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39290365} + serializedVersion: 2 + m_LocalRotation: {x: -0.023895208, y: 0.90641296, z: 0.05175012, w: 0.418529} + m_LocalPosition: {x: -9.303368, y: 3.4277678, z: -61.25482} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1926240437} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &39290367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39290365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a9c787e5d1bbf48a389834c4a9641c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Path: {fileID: 1926240438} + m_UpdateMethod: 0 + m_PositionUnits: 1 + m_Speed: 2 + m_Position: 0 --- !u!1 &62178361 GameObject: m_ObjectHideFlags: 0 @@ -179,8 +228,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62178361} serializedVersion: 2 - m_LocalRotation: {x: 0.25364858, y: -0.028775461, z: 0.007549193, w: 0.9668389} - m_LocalPosition: {x: 24.371735, y: 55, z: -83.27547} + m_LocalRotation: {x: 0.003875177, y: -0.029749023, z: 0.000115334624, w: 0.9995499} + m_LocalPosition: {x: 24.371735, y: 8, z: -83.27547} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -233,6 +282,96 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1944679633} +--- !u!1 &105761588 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 105761589} + - component: {fileID: 105761592} + - component: {fileID: 105761591} + - component: {fileID: 105761590} + - component: {fileID: 105761593} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &105761589 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105761588} + 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: 1440085504} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &105761590 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105761588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36d1163fa822e8b418a0a603ec078d5c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Damping: 1 +--- !u!114 &105761591 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105761588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 0.1 + mNoiseOffsets: {x: -933.8756, y: -486.32202, z: 1.2081909} +--- !u!114 &105761592 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105761588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &105761593 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105761588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4c41ac9245b87c4192012080077d830, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Damping: 1 --- !u!1 &153031623 GameObject: m_ObjectHideFlags: 0 @@ -687,11 +826,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.1 + near clip plane: 0.01 far clip plane: 50000 field of view: 40 orthographic: 0 - orthographic size: 10 + orthographic size: 5.2 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -715,8 +854,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.25364858, y: -0.028775461, z: 0.007549193, w: 0.9668389} - m_LocalPosition: {x: 24.371735, y: 55, z: -83.27547} + m_LocalRotation: {x: 0.1728549, y: 0.8900992, z: 0.1411097, w: 0.3974074} + m_LocalPosition: {x: 93.69663, y: 11.427768, z: 12.745178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1483,7 +1622,7 @@ Transform: m_GameObject: {fileID: 792989023} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 103, y: 55, z: 74} + m_LocalPosition: {x: 103, y: 8, z: 74} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2066,7 +2205,7 @@ MonoBehaviour: m_Path: {fileID: 792989025} m_UpdateMethod: 0 m_PositionUnits: 1 - m_Speed: 2 + m_Speed: 10 m_Position: 0 --- !u!1 &1080375954 GameObject: @@ -2442,6 +2581,7 @@ Transform: - {fileID: 298844362} - {fileID: 949034604} - {fileID: 62178362} + - {fileID: 1440085504} m_Father: {fileID: 547443783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1361807059 @@ -2725,6 +2865,85 @@ MonoBehaviour: Data3: -567375949 Data4: 1149958008 Path: event:/Music +--- !u!1 &1440085503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1440085504} + - component: {fileID: 1440085505} + m_Layer: 0 + m_Name: Environment-Wide-Dolly-2 + m_TagString: vc_Environment + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1440085504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440085503} + serializedVersion: 2 + m_LocalRotation: {x: -0.023895208, y: 0.90641296, z: 0.05175012, w: 0.418529} + m_LocalPosition: {x: 93.69663, y: 11.427768, z: 12.745178} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 105761589} + m_Father: {fileID: 1346050330} + m_LocalEulerAnglesHint: {x: 69.9, y: 309.3, z: 0} +--- !u!114 &1440085505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440085503} + 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: 1000000 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1853480535} + m_Follow: {fileID: 39290366} + m_Lens: + FieldOfView: 40 + OrthographicSize: 5.2 + NearClipPlane: 0.01 + FarClipPlane: 50000 + Dutch: 25 + ModeOverride: 2 + 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: 105761589} --- !u!1 &1517085323 GameObject: m_ObjectHideFlags: 0 @@ -3146,6 +3365,84 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1926240436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1926240437} + - component: {fileID: 1926240438} + m_Layer: 0 + m_Name: Landscape-Sweep + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1926240437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1926240436} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 103, y: 8, z: 74} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 39290366} + m_Father: {fileID: 2031268867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1926240438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1926240436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a200b19ca1a9685429ed7e043c28e904, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Resolution: 20 + m_Appearance: + pathColor: {r: 1, g: 0, b: 0.32282925, a: 1} + inactivePathColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + width: 0.2 + m_Looped: 1 + m_Waypoints: + - position: {x: -9.303368, y: 3.4277678, z: -61.25482} + roll: 0 + - position: {x: -7.1421967, y: 8.35799, z: -85.62209} + roll: 0 + - position: {x: -21.58908, y: 14.978266, z: -98.527306} + roll: 0 + - position: {x: -36.035965, y: 17.702486, z: -111.43252} + roll: 0 + - position: {x: -50.48285, y: 13.593344, z: -111.59613} + roll: 0 + - position: {x: -64.92973, y: 14.464331, z: -111.75974} + roll: 0 + - position: {x: -79.37662, y: 3.9703684, z: -102.16371} + roll: 0 + - position: {x: -93.8235, y: 2.083672, z: -75.345894} + roll: 0 + - position: {x: -131.8549, y: 16.491682, z: -95.01764} + roll: 0 + - position: {x: -160.76495, y: 13.455839, z: -84.45257} + roll: 0 + - position: {x: -136.66254, y: 7.412941, z: -62.610096} + roll: 0 + - position: {x: -125.4338, y: 5.6500306, z: -43.302216} + roll: 0 + - position: {x: -66.79367, y: 0.95085907, z: -41.959587} + roll: 0 --- !u!1 &1944679632 GameObject: m_ObjectHideFlags: 3 @@ -3341,7 +3638,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.000000563939, y: 0.7132504, z: -0.7009093, w: 0.0000005738685} m_LocalPosition: {x: 18.113062, y: 10.981609, z: -0.6314695} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3439,6 +3736,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 792989024} + - {fileID: 1926240437} m_Father: {fileID: 547443783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2036798639 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index a6ce959..d9801a8 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":26.360667199999998,"total":27.2808012,"children":{"InitializeActuators":{"count":1,"self":0.0021254,"total":0.0021254,"children":null},"InitializeSensors":{"count":1,"self":0.0015069999999999999,"total":0.0015069999999999999,"children":null},"AgentSendState":{"count":1218,"self":0.0113248,"total":0.206623,"children":{"CollectObservations":{"count":609,"self":0.1765071,"total":0.1765071,"children":null},"WriteActionMask":{"count":609,"self":0.0015237999999999999,"total":0.0015237999999999999,"children":null},"RequestDecision":{"count":609,"self":0.0172673,"total":0.0172673,"children":null}}},"DecideAction":{"count":1218,"self":0.5014886,"total":0.5014886,"children":null},"AgentAct":{"count":1218,"self":0.20737989999999998,"total":0.20737989999999998,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":65.8456,"min":65.8456,"runningAverage":65.8456,"value":65.8456,"weightedAverage":65.8456}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712759225","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\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 4874cbb0-3ab6-4370-af74-dc24d0dd5dbe -accessToken gtOVuQT275ZJTcNaM_jom0CkevszjNJVBq4tQAWtuSU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712759252"}} \ No newline at end of file +{"count":1,"self":352.13857279999996,"total":368.1310928,"children":{"InitializeActuators":{"count":1,"self":0.0020099,"total":0.0020099,"children":null},"InitializeSensors":{"count":1,"self":0.0015163,"total":0.0015163,"children":null},"AgentSendState":{"count":21437,"self":0.17361959999999999,"total":5.1550451,"children":{"CollectObservations":{"count":10719,"self":4.9135431999999994,"total":4.9135433,"children":null},"WriteActionMask":{"count":10719,"self":0.013038399999999999,"total":0.013038399999999999,"children":null},"RequestDecision":{"count":10719,"self":0.0548438,"total":0.0548438,"children":null}}},"DecideAction":{"count":21437,"self":6.8029288,"total":6.8029291,"children":null},"AgentAct":{"count":21437,"self":4.0310136,"total":4.0310135,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":10,"max":4646.662,"min":59.2991867,"runningAverage":926.775269,"value":168.378342,"weightedAverage":639.4295}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712760894","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\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 4874cbb0-3ab6-4370-af74-dc24d0dd5dbe -accessToken gtOVuQT275ZJTcNaM_jom0CkevszjNJVBq4tQAWtuSU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712761262"}} \ No newline at end of file