Skip to content

Commit

Permalink
Changed CameraSensor to render with sync to sensor frequency
Browse files Browse the repository at this point in the history
  • Loading branch information
@szylis
szylis committed Jun 16, 2023
1 parent 9c00197 commit 8f3acd0
Show file tree
Hide file tree
Showing 3 changed files with 301 additions and 67 deletions.
160 changes: 159 additions & 1 deletion Assets/AWSIM/Prefabs/Environments/Nishishinjuku/Volume Profile.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MonoBehaviour:
m_Value: 1
skyAmbientMode:
m_OverrideState: 1
m_Value: 1
m_Value: 0
fogType:
m_OverrideState: 0
m_Value: 0
Expand Down Expand Up @@ -160,6 +160,7 @@ MonoBehaviour:
- {fileID: 8301423506126545333}
- {fileID: -3768527809937896628}
- {fileID: 6553751843573519693}
- {fileID: 5701176100694489548}
--- !u!114 &1062231254598306812
MonoBehaviour:
m_ObjectHideFlags: 3
Expand Down Expand Up @@ -209,6 +210,163 @@ MonoBehaviour:
cascadeShadowBorder3:
m_OverrideState: 0
m_Value: 0
--- !u!114 &5701176100694489548
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: 2d08ce26990eb1a4a9177b860541e702, type: 3}
m_Name: Exposure
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
mode:
m_OverrideState: 1
m_Value: 0
meteringMode:
m_OverrideState: 0
m_Value: 2
luminanceSource:
m_OverrideState: 0
m_Value: 1
fixedExposure:
m_OverrideState: 1
m_Value: 13
compensation:
m_OverrideState: 1
m_Value: -0.4
limitMin:
m_OverrideState: 0
m_Value: -1
limitMax:
m_OverrideState: 0
m_Value: 14
curveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -10
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 20
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
limitMinCurveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -12
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 18
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
limitMaxCurveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -8
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 22
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
adaptationMode:
m_OverrideState: 0
m_Value: 1
adaptationSpeedDarkToLight:
m_OverrideState: 0
m_Value: 3
min: 0.001
adaptationSpeedLightToDark:
m_OverrideState: 0
m_Value: 1
min: 0.001
weightTextureMask:
m_OverrideState: 0
m_Value: {fileID: 0}
histogramPercentages:
m_OverrideState: 0
m_Value: {x: 40, y: 90}
min: 0
max: 100
histogramUseCurveRemapping:
m_OverrideState: 0
m_Value: 0
targetMidGray:
m_OverrideState: 0
m_Value: 0
centerAroundExposureTarget:
m_OverrideState: 0
m_Value: 0
proceduralCenter:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
proceduralRadii:
m_OverrideState: 0
m_Value: {x: 0.3, y: 0.3}
maskMinIntensity:
m_OverrideState: 0
m_Value: -30
maskMaxIntensity:
m_OverrideState: 0
m_Value: 30
proceduralSoftness:
m_OverrideState: 0
m_Value: 0.5
min: 0
--- !u!114 &6553751843573519693
MonoBehaviour:
m_ObjectHideFlags: 3
Expand Down
67 changes: 49 additions & 18 deletions Assets/AWSIM/Prefabs/Sensors/CameraSensor.prefab
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7800869322880189811
--- !u!1 &683421532908195521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7800869322880189814}
- component: {fileID: 7800869322880189813}
- component: {fileID: 7800869322880189801}
- component: {fileID: 7800869322880189800}
- component: {fileID: 7800869322880189815}
- component: {fileID: 8618870265807608092}
- component: {fileID: 1748890876559847002}
- component: {fileID: 4817441929433844819}
m_Layer: 0
m_Name: CameraSensor
m_TagString: MainCamera
m_Name: CameraObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7800869322880189814
m_IsActive: 0
--- !u!4 &8618870265807608092
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800869322880189811}
m_GameObject: {fileID: 683421532908195521}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 7800869322880189814}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &7800869322880189813
--- !u!20 &1748890876559847002
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800869322880189811}
m_GameObject: {fileID: 683421532908195521}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
Expand Down Expand Up @@ -77,13 +75,13 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &7800869322880189801
--- !u!114 &4817441929433844819
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800869322880189811}
m_GameObject: {fileID: 683421532908195521}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
Expand Down Expand Up @@ -191,6 +189,39 @@ MonoBehaviour:
data1: 0
data2: 0
defaultFrameSettings: 0
--- !u!1 &7800869322880189811
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7800869322880189814}
- component: {fileID: 7800869322880189800}
- component: {fileID: 7800869322880189815}
m_Layer: 0
m_Name: CameraSensor
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7800869322880189814
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800869322880189811}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8618870265807608092}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7800869322880189800
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -221,7 +252,7 @@ MonoBehaviour:
p1: 0
p2: 0
k3: 0
cameraObject: {fileID: 7800869322880189813}
cameraObject: {fileID: 1748890876559847002}
distortionShader: {fileID: 7200000, guid: 8ba118ba5fd3df74da56fc7b5c68f16c, type: 3}
rosImageShader: {fileID: 7200000, guid: ec3733322406d6750a0ad58713c14110, type: 3}
--- !u!114 &7800869322880189815
Expand Down
Loading

0 comments on commit 8f3acd0

Please sign in to comment.