From 66abe8dfca29943350388f914c3f3a367ecaa4c3 Mon Sep 17 00:00:00 2001 From: cailean Date: Thu, 11 Apr 2024 17:11:34 +0100 Subject: [PATCH] added volume for body cam --- Assets/5_Scenes/DreconDemo.unity | 64 ++++++++++++------- .../Camera Mound-Top.asset | 12 ++-- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- .../FMOD/Resources/FMODStudioSettings.asset | 2 +- ProjectSettings/TagManager.asset | 2 +- 5 files changed, 50 insertions(+), 32 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index d3ccb3c..93866b1 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -219,7 +219,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &62178362 Transform: m_ObjectHideFlags: 0 @@ -681,7 +681,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &298844362 Transform: m_ObjectHideFlags: 0 @@ -826,11 +826,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.1 + near clip plane: 0.01 far clip plane: 5000 - field of view: 14 + field of view: 31.1 orthographic: 0 - orthographic size: 10 + orthographic size: 0.53 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -854,8 +854,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.014131192, y: 0.76026535, z: 0.016547535, w: -0.6492482} - m_LocalPosition: {x: 75.44, y: 18.08, z: 0} + m_LocalRotation: {x: -0.254152, y: 0.69070727, z: -0.6135771, w: -0.28610036} + m_LocalPosition: {x: 22.891924, y: 9.244215, z: 4.6990404} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1730,7 +1730,7 @@ MonoBehaviour: m_Lens: FieldOfView: 100 OrthographicSize: 10 - NearClipPlane: 0.01 + NearClipPlane: 0.1 FarClipPlane: 5000 Dutch: -95 ModeOverride: 2 @@ -1761,7 +1761,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.52918464, y: -0.000000017930528, z: 0.000000011182658, w: 0.8485067} + m_LocalRotation: {x: 0.52918464, y: -0.000000026320045, z: 0.000000016414912, w: 0.8485067} m_LocalPosition: {x: 18.113062, y: 9.285504, z: -0.5535152} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1947,7 +1947,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &949034604 Transform: m_ObjectHideFlags: 0 @@ -2836,7 +2836,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1440085504 Transform: m_ObjectHideFlags: 0 @@ -2876,7 +2876,7 @@ MonoBehaviour: m_Lens: FieldOfView: 40 OrthographicSize: 5.2 - NearClipPlane: 0.01 + NearClipPlane: 0.1 FarClipPlane: 50000 Dutch: 25 ModeOverride: 2 @@ -3227,6 +3227,7 @@ GameObject: m_Component: - component: {fileID: 1634889328} - component: {fileID: 1634889329} + - component: {fileID: 1634889330} m_Layer: 0 m_Name: Mound-Top-Down m_TagString: vc_Body @@ -3242,7 +3243,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1634889327} serializedVersion: 2 - m_LocalRotation: {x: -0.25415206, y: 0.6907072, z: -0.61357707, w: -0.28610042} + m_LocalRotation: {x: -0.254152, y: 0.69070727, z: -0.6135771, w: -0.28610036} m_LocalPosition: {x: 22.891924, y: 9.244215, z: 4.6990404} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3271,12 +3272,12 @@ MonoBehaviour: m_LookAt: {fileID: 1853480535} m_Follow: {fileID: 1645504645} m_Lens: - FieldOfView: 40 + FieldOfView: 31.1 OrthographicSize: 0.53 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 - ModeOverride: 1 + ModeOverride: 2 LensShift: {x: 0, y: 0} GateFit: 2 FocusDistance: 10 @@ -3296,6 +3297,23 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 766384028} +--- !u!114 &1634889330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634889327} + 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: -1.73 + m_Profile: {fileID: 11400000, guid: d49226c597192874a9da3c6697ea8d37, type: 2} --- !u!1 &1645504644 GameObject: m_ObjectHideFlags: 0 @@ -3356,7 +3374,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1657725490 Transform: m_ObjectHideFlags: 0 @@ -3767,7 +3785,7 @@ MonoBehaviour: m_Lens: FieldOfView: 10 OrthographicSize: 10 - NearClipPlane: 1.11 + NearClipPlane: 0.1 FarClipPlane: 5000 Dutch: 0 ModeOverride: 2 @@ -3798,7 +3816,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.0000014609433, y: 0.7132504, z: -0.7009093, w: 0.0000014866663} + m_LocalRotation: {x: -0.0000005639385, y: 0.7132504, z: -0.7009093, w: -0.0000005738679} m_LocalPosition: {x: 18.113062, y: 10.981609, z: -0.6314695} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3822,7 +3840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2024068565 Transform: m_ObjectHideFlags: 0 @@ -3852,16 +3870,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_Everything: serializedVersion: 2 - m_Bits: 1407 + m_Bits: 3455 m_Agent: serializedVersion: 2 - m_Bits: 1151 + m_Bits: 3199 m_Bodies: serializedVersion: 2 m_Bits: 1335 m_Environment: serializedVersion: 2 - m_Bits: 1087 + m_Bits: 3135 m_CameraBlendMin: 3 m_CameraBlendMax: 4 m_CameraSwapMin: 7 @@ -7362,7 +7380,7 @@ GameObject: - component: {fileID: 4931218027702484626} - component: {fileID: 4876933051977942161} - component: {fileID: 1305037035509676156} - m_Layer: 0 + m_Layer: 11 m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/5_Scenes/DreconDemo_Profiles/Camera Mound-Top.asset b/Assets/5_Scenes/DreconDemo_Profiles/Camera Mound-Top.asset index a8c61f2..cdab26b 100644 --- a/Assets/5_Scenes/DreconDemo_Profiles/Camera Mound-Top.asset +++ b/Assets/5_Scenes/DreconDemo_Profiles/Camera Mound-Top.asset @@ -30,7 +30,7 @@ MonoBehaviour: active: 1 quality: m_OverrideState: 1 - m_Value: 3 + m_Value: 0 focusMode: m_OverrideState: 1 m_Value: 2 @@ -45,13 +45,13 @@ MonoBehaviour: m_Value: 0 nearFocusEnd: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.00001 farFocusStart: m_OverrideState: 1 - m_Value: 3.5 + m_Value: 1.4 farFocusEnd: m_OverrideState: 1 - m_Value: 30 + m_Value: 2.5 m_NearSampleCount: m_OverrideState: 1 m_Value: 3 @@ -88,10 +88,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c1bfcd0f0fa7b8468f281d6bbbaf320, type: 3} m_Name: LensDistortion m_EditorClassIdentifier: - active: 1 + active: 0 intensity: m_OverrideState: 1 - m_Value: -0.37 + m_Value: 0.24 xMultiplier: m_OverrideState: 1 m_Value: 1 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 29d0537..2fb7f43 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":76.9741568,"total":79.1122367,"children":{"InitializeActuators":{"count":1,"self":0.0005041,"total":0.0005041,"children":null},"InitializeSensors":{"count":1,"self":0.0010007,"total":0.0010007,"children":null},"AgentSendState":{"count":4383,"self":0.0261377,"total":0.55289369999999993,"children":{"CollectObservations":{"count":2192,"self":0.51046819999999993,"total":0.51046819999999993,"children":null},"WriteActionMask":{"count":2192,"self":0.0017471,"total":0.0017471,"children":null},"RequestDecision":{"count":2192,"self":0.0145407,"total":0.0145407,"children":null}}},"DecideAction":{"count":4383,"self":0.9455952,"total":0.9455952,"children":null},"AgentAct":{"count":4383,"self":0.6370874,"total":0.6370874,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":60.3221054,"min":60.3221054,"runningAverage":60.3221054,"value":60.3221054,"weightedAverage":60.3221054}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712850333","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 e06e6a66-fc4f-47ff-ab1b-a6158c6e5744 -accessToken glZ5bBMEdkrTGI27K2niQCP1IQcygqyJ7kHayqUkY78005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712850413"}} \ No newline at end of file +{"count":1,"self":56.0466304,"total":57.803192499999994,"children":{"InitializeActuators":{"count":1,"self":0.001005,"total":0.001005,"children":null},"InitializeSensors":{"count":1,"self":0.0010050999999999999,"total":0.0010050999999999999,"children":null},"AgentSendState":{"count":3108,"self":0.0218055,"total":0.641199,"children":{"CollectObservations":{"count":1554,"self":0.6033556,"total":0.6033556,"children":null},"WriteActionMask":{"count":1554,"self":0.0015044,"total":0.0015044,"children":null},"RequestDecision":{"count":1554,"self":0.0145335,"total":0.0145335,"children":null}}},"DecideAction":{"count":3108,"self":0.66401599999999994,"total":0.66401599999999994,"children":null},"AgentAct":{"count":3108,"self":0.4493371,"total":0.4493371,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":72.1043243,"min":72.1043243,"runningAverage":72.1043243,"value":72.1043243,"weightedAverage":72.1043243}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712851609","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 e06e6a66-fc4f-47ff-ab1b-a6158c6e5744 -accessToken glZ5bBMEdkrTGI27K2niQCP1IQcygqyJ7kHayqUkY78005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712851667"}} \ No newline at end of file diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 3d24a0b..021ae5b 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -315,7 +315,7 @@ MonoBehaviour: Value: 0 HasValue: 0 Overlay: - Value: 1 + Value: 0 HasValue: 1 OverlayPosition: Value: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 3cdf35c..544e13d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - Body - Body Ground - VFX - - + - Camera Ground - - -