Browse Source

lens test & GI added

main
Cailean Finn 7 months ago
parent
commit
785f3e6cf4
  1. 38
      Assets/6_Scenes/Beep.unity
  2. 2
      Assets/ML-Agents/Timers/Beep_timers.json
  3. 97
      Assets/Settings/HDRPDefaultResources/C Default.asset
  4. 2
      Assets/Settings/HDRPDefaultResources/C Street.asset
  5. 4
      Assets/Settings/HDRPDefaultResources/C Surveillance.asset

38
Assets/6_Scenes/Beep.unity

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 14693.611, g: 17306.041, b: 19108.33, a: 1} m_IndirectSpecularColor: {r: 18716.479, g: 22260.361, b: 24973.613, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -234,7 +234,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83569712} m_GameObject: {fileID: 83569712}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.018573303, y: 0.978704, z: -0.10290432, w: 0.17664725} m_LocalRotation: {x: -0.092318356, y: 0.46705723, z: -0.049108036, w: -0.87802243}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -392,7 +392,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155411616} m_GameObject: {fileID: 155411616}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.031691957, y: 0.96830773, z: -0.17558749, w: 0.1747708} m_LocalRotation: {x: -0.1575244, y: 0.4620959, z: -0.08379388, w: -0.8686956}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -1112,7 +1112,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 377437129} m_GameObject: {fileID: 377437129}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.03783877, y: 0.8817097, z: -0.07178479, w: -0.46476156} m_LocalRotation: {x: -0.03783877, y: 0.88170964, z: -0.07178479, w: -0.46476156}
m_LocalPosition: {x: -128.4, y: 13, z: -248.6} m_LocalPosition: {x: -128.4, y: 13, z: -248.6}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -1572,13 +1572,13 @@ Camera:
m_GateFitMode: 1 m_GateFitMode: 1
m_FOVAxisMode: 0 m_FOVAxisMode: 0
m_Iso: 50 m_Iso: 50
m_ShutterSpeed: 0.002 m_ShutterSpeed: 0.0005
m_Aperture: 3.6 m_Aperture: 2.2
m_FocusDistance: 8.544014 m_FocusDistance: 8.93528
m_FocalLength: 35.000004 m_FocalLength: 14.999999
m_BladeCount: 5 m_BladeCount: 5
m_Curvature: {x: 26.748837, y: 32} m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.683 m_BarrelClipping: 0.25
m_Anamorphism: 0 m_Anamorphism: 0
m_SensorSize: {x: 70.41, y: 52.63} m_SensorSize: {x: 70.41, y: 52.63}
m_LensShift: {x: 0, y: 0} m_LensShift: {x: 0, y: 0}
@ -1589,8 +1589,8 @@ Camera:
width: 1 width: 1
height: 1 height: 1
near clip plane: 0.01 near clip plane: 0.01
far clip plane: 6707 far clip plane: 5000
field of view: 73.87587 field of view: 120.63225
orthographic: 0 orthographic: 0
orthographic size: 10 orthographic size: 10
m_Depth: 0 m_Depth: 0
@ -1616,8 +1616,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470663197} m_GameObject: {fileID: 470663197}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.20631877, y: 0.13953523, z: -0.029739587, w: 0.96802795} m_LocalRotation: {x: 0.315141, y: -0.6370299, z: 0.26233572, w: 0.6527321}
m_LocalPosition: {x: 9.3949585, y: -3.307354, z: -5.0979614} m_LocalPosition: {x: 41.58, y: 5.960001, z: -7.8299866}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -1853,8 +1853,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 513050371} m_GameObject: {fileID: 513050371}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.17829932, y: -0.22369511, z: 0.041663487, w: 0.9573056} m_LocalRotation: {x: 0.0031893759, y: 0.98622763, z: -0.16425067, w: 0.019150307}
m_LocalPosition: {x: 9.355881, y: -3.2973547, z: -5.6164856} m_LocalPosition: {x: 5.558182, y: -3.2973547, z: 10.155334}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -2854,7 +2854,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!320 &799276789 --- !u!320 &799276789
PlayableDirector: PlayableDirector:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3314,7 +3314,7 @@ Transform:
m_GameObject: {fileID: 1124157896} m_GameObject: {fileID: 1124157896}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696}
m_LocalPosition: {x: 9.3949585, y: -3.307354, z: -5.0979614} m_LocalPosition: {x: 5.8378906, y: -3.307354, z: 9.716858}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -3507,7 +3507,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1178814724} m_GameObject: {fileID: 1178814724}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.015149891, y: 0.9754463, z: -0.20789987, w: 0.071081914} m_LocalRotation: {x: 0.015149893, y: 0.97544634, z: -0.20789988, w: 0.07108192}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0

2
Assets/ML-Agents/Timers/Beep_timers.json

@ -1 +1 @@
{"count":1,"self":29.534326399999998,"total":29.8624394,"children":{"InitializeActuators":{"count":1,"self":0.0010061,"total":0.0010061,"children":null},"InitializeSensors":{"count":1,"self":0.002545,"total":0.002545,"children":null},"AgentSendState":{"count":1155,"self":0.0085998,"total":0.025959,"children":{"CollectObservations":{"count":231,"self":0.0022152,"total":0.0022152,"children":null},"WriteActionMask":{"count":231,"self":0.0010069999999999999,"total":0.0010069999999999999,"children":null},"RequestDecision":{"count":231,"self":0.014136999999999999,"total":0.014136999999999999,"children":null}}},"DecideAction":{"count":1155,"self":0.2806898,"total":0.28426039999999997,"children":{"RayPerceptionSensor.Perceive":{"count":231,"self":0.0035705999999999997,"total":0.0035705999999999997,"children":null}}},"AgentAct":{"count":1155,"self":0.0133117,"total":0.0133117,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711457631","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_03-Beep\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1711457661"}} {"count":1,"self":23.82348,"total":24.122651599999998,"children":{"InitializeActuators":{"count":1,"self":0.0015141,"total":0.0015141,"children":null},"InitializeSensors":{"count":1,"self":0.0025101999999999998,"total":0.0025101999999999998,"children":null},"AgentSendState":{"count":535,"self":0.016529,"total":0.0515239,"children":{"CollectObservations":{"count":107,"self":0.0122026,"total":0.0122026,"children":null},"WriteActionMask":{"count":107,"self":0.0024874999999999997,"total":0.0024874999999999997,"children":null},"RequestDecision":{"count":107,"self":0.020304799999999998,"total":0.020304799999999998,"children":null}}},"DecideAction":{"count":535,"self":0.22603769999999998,"total":0.22880409999999998,"children":{"RayPerceptionSensor.Perceive":{"count":107,"self":0.0027664,"total":0.0027664,"children":null}}},"AgentAct":{"count":535,"self":0.0143118,"total":0.0143118,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711458367","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_03-Beep\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1711458391"}}

97
Assets/Settings/HDRPDefaultResources/C Default.asset

@ -194,6 +194,7 @@ MonoBehaviour:
- {fileID: 5602483959143658810} - {fileID: 5602483959143658810}
- {fileID: 5036919984216512174} - {fileID: 5036919984216512174}
- {fileID: 4159193168474945268} - {fileID: 4159193168474945268}
- {fileID: 6021631331581935017}
--- !u!114 &448115243408767295 --- !u!114 &448115243408767295
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
@ -612,6 +613,102 @@ MonoBehaviour:
cullingDistance: cullingDistance:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1000 m_Value: 1000
--- !u!114 &6021631331581935017
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 42ef2681fa3dc8c4fa031f044e68c63f, type: 3}
m_Name: GlobalIllumination
m_EditorClassIdentifier:
active: 1
quality:
m_OverrideState: 1
m_Value: 1
enable:
m_OverrideState: 1
m_Value: 1
tracing:
m_OverrideState: 1
m_Value: 2
rayMiss:
m_OverrideState: 0
m_Value: 3
depthBufferThickness:
m_OverrideState: 1
m_Value: 0.1
fullResolutionSS:
m_OverrideState: 1
m_Value: 1
m_MaxRaySteps:
m_OverrideState: 1
m_Value: 64
m_DenoiseSS:
m_OverrideState: 1
m_Value: 1
m_HalfResolutionDenoiserSS:
m_OverrideState: 1
m_Value: 0
m_DenoiserRadiusSS:
m_OverrideState: 1
m_Value: 0.5
m_SecondDenoiserPassSS:
m_OverrideState: 1
m_Value: 1
lastBounceFallbackHierarchy:
m_OverrideState: 0
m_Value: 3
ambientProbeDimmer:
m_OverrideState: 0
m_Value: 0
layerMask:
m_OverrideState: 1
m_Value:
serializedVersion: 2
m_Bits: 4294967295
textureLodBias:
m_OverrideState: 1
m_Value: 7
m_RayLength:
m_OverrideState: 1
m_Value: 50
m_ClampValue:
m_OverrideState: 1
m_Value: 0.8
mode:
m_OverrideState: 1
m_Value: 2
m_FullResolution:
m_OverrideState: 1
m_Value: 0
sampleCount:
m_OverrideState: 1
m_Value: 2
bounceCount:
m_OverrideState: 1
m_Value: 1
m_Denoise:
m_OverrideState: 1
m_Value: 1
m_HalfResolutionDenoiser:
m_OverrideState: 1
m_Value: 0
m_DenoiserRadius:
m_OverrideState: 1
m_Value: 0.66
m_SecondDenoiserPass:
m_OverrideState: 1
m_Value: 1
m_MaxMixedRaySteps:
m_OverrideState: 1
m_Value: 48
receiverMotionRejection:
m_OverrideState: 0
m_Value: 1
--- !u!114 &7502528774814404555 --- !u!114 &7502528774814404555
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3

2
Assets/Settings/HDRPDefaultResources/C Street.asset

@ -220,7 +220,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c1bfcd0f0fa7b8468f281d6bbbaf320, type: 3} m_Script: {fileID: 11500000, guid: 9c1bfcd0f0fa7b8468f281d6bbbaf320, type: 3}
m_Name: LensDistortion m_Name: LensDistortion
m_EditorClassIdentifier: m_EditorClassIdentifier:
active: 0 active: 1
intensity: intensity:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 0 m_Value: 0

4
Assets/Settings/HDRPDefaultResources/C Surveillance.asset

@ -623,7 +623,7 @@ MonoBehaviour:
active: 1 active: 1
intensity: intensity:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 0.6 m_Value: 0.9
xMultiplier: xMultiplier:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1 m_Value: 1
@ -635,7 +635,7 @@ MonoBehaviour:
m_Value: {x: 0.5, y: 0.5} m_Value: {x: 0.5, y: 0.5}
scale: scale:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1.13 m_Value: 1.2
--- !u!114 &3823625823360864611 --- !u!114 &3823625823360864611
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3

Loading…
Cancel
Save