Skip to content

Commit c795048

Browse files
sebastienlagardesebastienlagarde
committed
Merge improvement of HDRP template (#2389)
1 parent fee8ef5 commit c795048

File tree

55 files changed

+456
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+456
-496
lines changed

‎com.unity.template-hd/Assets/Animations/CinematicsTimeline.playable‎

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,10 @@ MonoBehaviour:
289289
m_Root: 5
290290
m_Leaf: C:/Users/pydon/Desktop/Image Sequence
291291
m_ForceAssetFolder: 0
292+
m_AbsolutePath:
292293
m_FileName: image_<Frame>
293294
outputFormat: 1
294295
captureAlpha: 0
295-
captureHDR: 0
296296
m_ImageInputSelector:
297297
m_Selected: gameViewInputSettings
298298
gameViewInputSettings:
@@ -348,6 +348,7 @@ MonoBehaviour:
348348
cameraTag:
349349
colorSpace: 0
350350
flipFinalOutput: 0
351+
m_ColorSpace: 1
351352
--- !u!114 &-7173846661789697959
352353
MonoBehaviour:
353354
m_ObjectHideFlags: 1
@@ -782,10 +783,19 @@ MonoBehaviour:
782783
m_Root: 0
783784
m_Leaf: Recordings
784785
m_ForceAssetFolder: 0
786+
m_AbsolutePath:
785787
m_FileName: movie
786788
outputFormat: 0
787789
videoBitRateMode: 2
788790
captureAlpha: 0
791+
containerFormatSelected: 0
792+
encoderSelected: 0
793+
encoderPresetSelected: 0
794+
encoderPresetSelectedName:
795+
encoderPresetSelectedOptions:
796+
encoderPresetSelectedSuffixes:
797+
encoderColorDefinitionSelected: 0
798+
encoderCustomOptions:
789799
m_ImageInputSelector:
790800
m_Selected: gameViewInputSettings
791801
gameViewInputSettings:
@@ -886,10 +896,10 @@ MonoBehaviour:
886896
m_Root: 5
887897
m_Leaf: C:/Users/pydon/Desktop/Image Sequence
888898
m_ForceAssetFolder: 0
899+
m_AbsolutePath:
889900
m_FileName: image_<Frame>
890901
outputFormat: 1
891902
captureAlpha: 0
892-
captureHDR: 0
893903
m_ImageInputSelector:
894904
m_Selected: gameViewInputSettings
895905
gameViewInputSettings:
@@ -945,6 +955,7 @@ MonoBehaviour:
945955
cameraTag:
946956
colorSpace: 0
947957
flipFinalOutput: 0
958+
m_ColorSpace: 1
948959
--- !u!114 &-4487142523796156789
949960
MonoBehaviour:
950961
m_ObjectHideFlags: 1
@@ -2182,25 +2193,7 @@ MonoBehaviour:
21822193
m_RotationOrder: 4
21832194
m_MixOutCurve:
21842195
serializedVersion: 2
2185-
m_Curve:
2186-
- serializedVersion: 3
2187-
time: 0
2188-
value: 1
2189-
inSlope: 0
2190-
outSlope: 0
2191-
tangentMode: 0
2192-
weightedMode: 0
2193-
inWeight: 0
2194-
outWeight: 0
2195-
- serializedVersion: 3
2196-
time: 1
2197-
value: 0
2198-
inSlope: 0
2199-
outSlope: 0
2200-
tangentMode: 0
2201-
weightedMode: 0
2202-
inWeight: 0
2203-
outWeight: 0
2196+
m_Curve: []
22042197
m_PreInfinity: 2
22052198
m_PostInfinity: 2
22062199
m_RotationOrder: 4
@@ -2227,25 +2220,7 @@ MonoBehaviour:
22272220
m_BlendOutDuration: -1
22282221
m_MixInCurve:
22292222
serializedVersion: 2
2230-
m_Curve:
2231-
- serializedVersion: 3
2232-
time: 0
2233-
value: 0
2234-
inSlope: 0
2235-
outSlope: 0
2236-
tangentMode: 0
2237-
weightedMode: 0
2238-
inWeight: 0
2239-
outWeight: 0
2240-
- serializedVersion: 3
2241-
time: 1
2242-
value: 1
2243-
inSlope: 0
2244-
outSlope: 0
2245-
tangentMode: 0
2246-
weightedMode: 0
2247-
inWeight: 0
2248-
outWeight: 0
2223+
m_Curve: []
22492224
m_PreInfinity: 2
22502225
m_PostInfinity: 2
22512226
m_RotationOrder: 4
@@ -3309,10 +3284,19 @@ MonoBehaviour:
33093284
m_Root: 5
33103285
m_Leaf: C:/Users/pydon/Videos/HDRP Template
33113286
m_ForceAssetFolder: 0
3287+
m_AbsolutePath:
33123288
m_FileName: movie
33133289
outputFormat: 0
33143290
videoBitRateMode: 2
33153291
captureAlpha: 0
3292+
containerFormatSelected: 0
3293+
encoderSelected: 0
3294+
encoderPresetSelected: 0
3295+
encoderPresetSelectedName:
3296+
encoderPresetSelectedOptions:
3297+
encoderPresetSelectedSuffixes:
3298+
encoderColorDefinitionSelected: 0
3299+
encoderCustomOptions:
33163300
m_ImageInputSelector:
33173301
m_Selected: gameViewInputSettings
33183302
gameViewInputSettings:

‎com.unity.template-hd/Assets/Animations/ScreenshotsTimeline.playable‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ MonoBehaviour:
132132
- {fileID: 7206989897909045908}
133133
m_FixedDuration: 0
134134
m_EditorSettings:
135-
m_Framerate: 60
135+
m_Framerate: 30
136136
m_ScenePreview: 1
137137
m_DurationMode: 0
138138
m_MarkerTrack: {fileID: 9076127134632802600}
@@ -276,7 +276,7 @@ MonoBehaviour:
276276
m_Start: 0
277277
m_ClipIn: 0
278278
m_Asset: {fileID: 2000278883325589059}
279-
m_Duration: 5
279+
m_Duration: 2
280280
m_TimeScale: 1
281281
m_ParentTrack: {fileID: 7206989897909045908}
282282
m_EaseInDuration: 0
@@ -342,10 +342,10 @@ MonoBehaviour:
342342
m_PreExtrapolationTime: 0
343343
m_DisplayName: Screenshot Camera 1
344344
- m_Version: 1
345-
m_Start: 4.999999999999998
345+
m_Start: 2
346346
m_ClipIn: 0
347347
m_Asset: {fileID: 2987344365405500798}
348-
m_Duration: 5
348+
m_Duration: 2
349349
m_TimeScale: 1
350350
m_ParentTrack: {fileID: 7206989897909045908}
351351
m_EaseInDuration: 0
@@ -411,10 +411,10 @@ MonoBehaviour:
411411
m_PreExtrapolationTime: 0
412412
m_DisplayName: Screenshot Camera 2
413413
- m_Version: 1
414-
m_Start: 9.999999999999998
414+
m_Start: 4.000000000000002
415415
m_ClipIn: 0
416416
m_Asset: {fileID: -5361689237702786821}
417-
m_Duration: 5
417+
m_Duration: 2
418418
m_TimeScale: 1
419419
m_ParentTrack: {fileID: 7206989897909045908}
420420
m_EaseInDuration: 0
@@ -480,10 +480,10 @@ MonoBehaviour:
480480
m_PreExtrapolationTime: 0
481481
m_DisplayName: Screenshot Camera 3
482482
- m_Version: 1
483-
m_Start: 14.999999999999996
483+
m_Start: 6.000000000000002
484484
m_ClipIn: 0
485485
m_Asset: {fileID: -7318707438537784122}
486-
m_Duration: 5
486+
m_Duration: 2
487487
m_TimeScale: 1
488488
m_ParentTrack: {fileID: 7206989897909045908}
489489
m_EaseInDuration: 0
@@ -549,10 +549,10 @@ MonoBehaviour:
549549
m_PreExtrapolationTime: 0
550550
m_DisplayName: Screenshot Camera 4
551551
- m_Version: 1
552-
m_Start: 19.999999999999996
552+
m_Start: 8.000000000000004
553553
m_ClipIn: 0
554554
m_Asset: {fileID: -7509283030167094440}
555-
m_Duration: 5
555+
m_Duration: 2
556556
m_TimeScale: 1
557557
m_ParentTrack: {fileID: 7206989897909045908}
558558
m_EaseInDuration: 0
@@ -618,10 +618,10 @@ MonoBehaviour:
618618
m_PreExtrapolationTime: 0
619619
m_DisplayName: Screenshot Camera 5
620620
- m_Version: 1
621-
m_Start: 24.999999999999996
621+
m_Start: 10
622622
m_ClipIn: 0
623623
m_Asset: {fileID: -1857068044906140732}
624-
m_Duration: 5
624+
m_Duration: 2
625625
m_TimeScale: 1
626626
m_ParentTrack: {fileID: 7206989897909045908}
627627
m_EaseInDuration: 0
@@ -687,10 +687,10 @@ MonoBehaviour:
687687
m_PreExtrapolationTime: 0
688688
m_DisplayName: Screenshot Camera 6
689689
- m_Version: 1
690-
m_Start: 30
690+
m_Start: 12
691691
m_ClipIn: 0
692692
m_Asset: {fileID: -1378530507966805372}
693-
m_Duration: 5
693+
m_Duration: 2
694694
m_TimeScale: 1
695695
m_ParentTrack: {fileID: 7206989897909045908}
696696
m_EaseInDuration: 0
@@ -756,10 +756,10 @@ MonoBehaviour:
756756
m_PreExtrapolationTime: 0
757757
m_DisplayName: Screenshot Camera 7
758758
- m_Version: 1
759-
m_Start: 35
759+
m_Start: 14
760760
m_ClipIn: 0
761761
m_Asset: {fileID: 1889581106370423229}
762-
m_Duration: 5
762+
m_Duration: 2
763763
m_TimeScale: 1
764764
m_ParentTrack: {fileID: 7206989897909045908}
765765
m_EaseInDuration: 0
@@ -825,10 +825,10 @@ MonoBehaviour:
825825
m_PreExtrapolationTime: 0
826826
m_DisplayName: Screenshot Camera 8
827827
- m_Version: 1
828-
m_Start: 40
828+
m_Start: 15.999999999999998
829829
m_ClipIn: 0
830830
m_Asset: {fileID: 3427665510104522246}
831-
m_Duration: 5
831+
m_Duration: 2.0000000000000018
832832
m_TimeScale: 1
833833
m_ParentTrack: {fileID: 7206989897909045908}
834834
m_EaseInDuration: 0
@@ -894,10 +894,10 @@ MonoBehaviour:
894894
m_PreExtrapolationTime: 0
895895
m_DisplayName: Screenshot Camera 9
896896
- m_Version: 1
897-
m_Start: 45
897+
m_Start: 18
898898
m_ClipIn: 0
899899
m_Asset: {fileID: 6850447457271600788}
900-
m_Duration: 5
900+
m_Duration: 2
901901
m_TimeScale: 1
902902
m_ParentTrack: {fileID: 7206989897909045908}
903903
m_EaseInDuration: 0

‎com.unity.template-hd/Assets/Art/Meshes/Props/Lights/Prefab/Light_Spot_1200lm.prefab‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Light:
8787
m_LightShadowCasterMode: 2
8888
m_AreaSize: {x: 0.5, y: 0.5}
8989
m_BounceIntensity: 2
90-
m_ColorTemperature: 2800
90+
m_ColorTemperature: 2800.0002
9191
m_UseColorTemperature: 1
9292
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
9393
m_UseBoundingSphereOverride: 0
@@ -123,6 +123,7 @@ MonoBehaviour:
123123
m_VolumetricDimmer: 1
124124
m_LightUnit: 0
125125
m_FadeDistance: 32
126+
m_VolumetricFadeDistance: 10000
126127
m_AffectDiffuse: 1
127128
m_AffectSpecular: 1
128129
m_NonLightmappedOnly: 0
@@ -139,6 +140,7 @@ MonoBehaviour:
139140
m_AreaLightCookie: {fileID: 0}
140141
m_IESPoint: {fileID: 0}
141142
m_IESSpot: {fileID: 0}
143+
m_IncludeForRayTracing: 1
142144
m_AreaLightShadowCone: 120
143145
m_UseScreenSpaceShadows: 0
144146
m_InteractsWithSky: 1
@@ -177,7 +179,7 @@ MonoBehaviour:
177179
m_Level: 2
178180
m_ShadowDimmer: 1
179181
m_VolumetricShadowDimmer: 1
180-
m_ShadowFadeDistance: 20
182+
m_ShadowFadeDistance: 24
181183
m_UseContactShadow:
182184
m_Override: 0
183185
m_UseOverride: 1
@@ -188,6 +190,10 @@ MonoBehaviour:
188190
m_NormalBias: 0.75
189191
m_SlopeBias: 0.5
190192
m_ShadowUpdateMode: 0
193+
m_AlwaysDrawDynamicShadows: 0
194+
m_UpdateShadowOnLightMovement: 0
195+
m_CachedShadowTranslationThreshold: 0.01
196+
m_CachedShadowAngularThreshold: 0.5
191197
m_BarnDoorAngle: 90
192198
m_BarnDoorLength: 0.05
193199
m_preserveCachedShadow: 0

‎com.unity.template-hd/Assets/Art/Meshes/Props/Lights/Prefab/Light_Spot_3200lm.prefab‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Light:
8787
m_LightShadowCasterMode: 2
8888
m_AreaSize: {x: 0.5, y: 0.5}
8989
m_BounceIntensity: 1
90-
m_ColorTemperature: 4000
90+
m_ColorTemperature: 3999.9998
9191
m_UseColorTemperature: 1
9292
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
9393
m_UseBoundingSphereOverride: 0
@@ -123,6 +123,7 @@ MonoBehaviour:
123123
m_VolumetricDimmer: 1
124124
m_LightUnit: 0
125125
m_FadeDistance: 40
126+
m_VolumetricFadeDistance: 10000
126127
m_AffectDiffuse: 1
127128
m_AffectSpecular: 1
128129
m_NonLightmappedOnly: 0
@@ -139,6 +140,7 @@ MonoBehaviour:
139140
m_AreaLightCookie: {fileID: 0}
140141
m_IESPoint: {fileID: 0}
141142
m_IESSpot: {fileID: 0}
143+
m_IncludeForRayTracing: 1
142144
m_AreaLightShadowCone: 120
143145
m_UseScreenSpaceShadows: 0
144146
m_InteractsWithSky: 1
@@ -188,6 +190,10 @@ MonoBehaviour:
188190
m_NormalBias: 0.75
189191
m_SlopeBias: 0.5
190192
m_ShadowUpdateMode: 1
193+
m_AlwaysDrawDynamicShadows: 0
194+
m_UpdateShadowOnLightMovement: 0
195+
m_CachedShadowTranslationThreshold: 0.01
196+
m_CachedShadowAngularThreshold: 0.5
191197
m_BarnDoorAngle: 90
192198
m_BarnDoorLength: 0.05
193199
m_preserveCachedShadow: 0

‎com.unity.template-hd/Assets/Art/Meshes/Props/Lights/Prefab/Spotlight_01b_large.prefab‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ PrefabInstance:
170170
propertyPath: m_Shadows.m_Type
171171
value: 0
172172
objectReference: {fileID: 0}
173+
- target: {fileID: 9203907179793585638, guid: 8caca8a5b8fc29241857185d3e2fbaa6, type: 3}
174+
propertyPath: m_ColorTemperature
175+
value: 3999.9998
176+
objectReference: {fileID: 0}
173177
m_RemovedComponents: []
174178
m_SourcePrefab: {fileID: 100100000, guid: 8caca8a5b8fc29241857185d3e2fbaa6, type: 3}
175179
--- !u!4 &2184713414013805759 stripped

0 commit comments

Comments
 (0)