Skip to content

Commit fbb04bc

Browse files
ChmanChman
authored
Merge pull request #253 from Unity-Technologies/submodule-fix
Fixed Post-processing submodule and updated to latest
2 parents f191cb3 + 8666e3e commit fbb04bc

6 files changed

Lines changed: 165 additions & 14 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "Assets/TestScenes/Big"]
22
path = Assets/TestScenes/Big
33
url = https://github.com/Unity-Technologies/ScriptableRenderLoopScenes
4+
45
[submodule "Assets/ScriptableRenderPipeline/PostProcessing"]
56
path = Assets/ScriptableRenderPipeline/PostProcessing
67
url = https://github.com/Unity-Technologies/PostProcessing

‎Assets/ScriptableRenderPipeline/PostProcessing‎

Submodule PostProcessing added at 9a6954f

‎Assets/TestScenes/HDTest/HDRenderLoopTest.unity‎

Lines changed: 131 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8923,6 +8923,104 @@ Light:
89238923
m_UseColorTemperature: 0
89248924
m_ShadowRadius: 0
89258925
m_ShadowAngle: 0
8926+
--- !u!1001 &1159917811
8927+
Prefab:
8928+
m_ObjectHideFlags: 0
8929+
serializedVersion: 2
8930+
m_Modification:
8931+
m_TransformParent: {fileID: 500408927}
8932+
m_Modifications:
8933+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8934+
propertyPath: m_LocalPosition.x
8935+
value: 2.68
8936+
objectReference: {fileID: 0}
8937+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8938+
propertyPath: m_LocalPosition.y
8939+
value: 2.267
8940+
objectReference: {fileID: 0}
8941+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8942+
propertyPath: m_LocalPosition.z
8943+
value: 1.17
8944+
objectReference: {fileID: 0}
8945+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8946+
propertyPath: m_LocalRotation.x
8947+
value: -0
8948+
objectReference: {fileID: 0}
8949+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8950+
propertyPath: m_LocalRotation.y
8951+
value: -0
8952+
objectReference: {fileID: 0}
8953+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8954+
propertyPath: m_LocalRotation.z
8955+
value: -0
8956+
objectReference: {fileID: 0}
8957+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8958+
propertyPath: m_LocalRotation.w
8959+
value: 1
8960+
objectReference: {fileID: 0}
8961+
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8962+
propertyPath: m_RootOrder
8963+
value: 0
8964+
objectReference: {fileID: 0}
8965+
- target: {fileID: 2300020, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8966+
propertyPath: m_Materials.Array.data[0]
8967+
value:
8968+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8969+
- target: {fileID: 2300006, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8970+
propertyPath: m_Materials.Array.data[0]
8971+
value:
8972+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8973+
- target: {fileID: 2300022, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8974+
propertyPath: m_Materials.Array.data[0]
8975+
value:
8976+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8977+
- target: {fileID: 2300024, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8978+
propertyPath: m_Materials.Array.data[0]
8979+
value:
8980+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8981+
- target: {fileID: 2300000, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8982+
propertyPath: m_Materials.Array.data[0]
8983+
value:
8984+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8985+
- target: {fileID: 2300002, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8986+
propertyPath: m_Materials.Array.data[0]
8987+
value:
8988+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8989+
- target: {fileID: 2300004, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8990+
propertyPath: m_Materials.Array.data[0]
8991+
value:
8992+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8993+
- target: {fileID: 2300008, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8994+
propertyPath: m_Materials.Array.data[0]
8995+
value:
8996+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
8997+
- target: {fileID: 2300010, guid: 2b46db496f27398459cf881becf5763a, type: 3}
8998+
propertyPath: m_Materials.Array.data[0]
8999+
value:
9000+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
9001+
- target: {fileID: 2300012, guid: 2b46db496f27398459cf881becf5763a, type: 3}
9002+
propertyPath: m_Materials.Array.data[0]
9003+
value:
9004+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
9005+
- target: {fileID: 2300014, guid: 2b46db496f27398459cf881becf5763a, type: 3}
9006+
propertyPath: m_Materials.Array.data[0]
9007+
value:
9008+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
9009+
- target: {fileID: 2300016, guid: 2b46db496f27398459cf881becf5763a, type: 3}
9010+
propertyPath: m_Materials.Array.data[0]
9011+
value:
9012+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
9013+
- target: {fileID: 2300018, guid: 2b46db496f27398459cf881becf5763a, type: 3}
9014+
propertyPath: m_Materials.Array.data[0]
9015+
value:
9016+
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
9017+
m_RemovedComponents: []
9018+
m_ParentPrefab: {fileID: 100100000, guid: 2b46db496f27398459cf881becf5763a, type: 3}
9019+
m_IsPrefabParent: 0
9020+
--- !u!4 &1159917812 stripped
9021+
Transform:
9022+
m_PrefabParentObject: {fileID: 0}
9023+
m_PrefabInternal: {fileID: 1159917811}
89269024
--- !u!1 &1161056796
89279025
GameObject:
89289026
m_ObjectHideFlags: 0
@@ -13915,6 +14013,7 @@ GameObject:
1391514013
- component: {fileID: 1828470161}
1391614014
- component: {fileID: 1828470160}
1391714015
- component: {fileID: 1828470166}
14016+
- component: {fileID: 1828470167}
1391814017
- component: {fileID: 1828470165}
1391914018
m_Layer: 0
1392014019
m_Name: Main Camera
@@ -14001,22 +14100,13 @@ MonoBehaviour:
1400114100
m_GameObject: {fileID: 1828470159}
1400214101
m_Enabled: 1
1400314102
m_EditorHideFlags: 0
14004-
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
14103+
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
1400514104
m_Name:
1400614105
m_EditorClassIdentifier:
14007-
volumeTrigger: {fileID: 1828470164}
14008-
volumeLayer:
14009-
serializedVersion: 2
14010-
m_Bits: 1
14011-
antialiasingMode: 0
14012-
temporalAntialiasing:
14013-
jitterSpread: 0.75
14014-
sharpen: 0.25
14015-
stationaryBlending: 0.95
14016-
motionBlending: 0.85
14017-
showDebugUI: 0
14018-
debugView:
14019-
monitor: 1
14106+
sharedProfile: {fileID: 11400000, guid: 2139b7e52a6c6c74bb94f65be9294325, type: 2}
14107+
isGlobal: 1
14108+
blendDistance: 0
14109+
priority: 0
1402014110
--- !u!114 &1828470166
1402114111
MonoBehaviour:
1402214112
m_ObjectHideFlags: 0
@@ -14032,6 +14122,33 @@ MonoBehaviour:
1403214122
m_LookSpeedMouse: 10
1403314123
m_MoveSpeed: 50
1403414124
m_Turbo: 10
14125+
--- !u!114 &1828470167
14126+
MonoBehaviour:
14127+
m_ObjectHideFlags: 0
14128+
m_PrefabParentObject: {fileID: 0}
14129+
m_PrefabInternal: {fileID: 0}
14130+
m_GameObject: {fileID: 1828470159}
14131+
m_Enabled: 1
14132+
m_EditorHideFlags: 0
14133+
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
14134+
m_Name:
14135+
m_EditorClassIdentifier:
14136+
volumeTrigger: {fileID: 1828470164}
14137+
volumeLayer:
14138+
serializedVersion: 2
14139+
m_Bits: 1
14140+
antialiasingMode: 0
14141+
temporalAntialiasing:
14142+
jitterSpread: 0.75
14143+
sharpen: 0.25
14144+
stationaryBlending: 0.95
14145+
motionBlending: 0.85
14146+
fastApproximateAntialiasing:
14147+
mobileOptimized: 0
14148+
showDebugUI: 0
14149+
debugView:
14150+
monitor: 1
14151+
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
1403514152
--- !u!1 &1828745839
1403614153
GameObject:
1403714154
m_ObjectHideFlags: 0

‎Assets/TestScenes/HDTest/PostProcess Profiles.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/TestScenes/HDTest/PostProcess Profiles/Main Camera Profile.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_GameObject: {fileID: 0}
9+
m_Enabled: 1
10+
m_EditorHideFlags: 0
11+
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
12+
m_Name: Main Camera Profile
13+
m_EditorClassIdentifier:
14+
settings: []

‎Assets/TestScenes/HDTest/PostProcess Profiles/Main Camera Profile.asset.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)