diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity
index 6d033a666be..396038ad989 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity
@@ -180,6 +180,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -277,6 +278,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -405,6 +407,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -486,6 +489,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -653,10 +657,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: 3a41e48b5aaa0b94cbd0859d37b44a49, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -664,6 +669,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &194169588
GameObject:
m_ObjectHideFlags: 0
@@ -708,101 +714,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_HDProbeVersion: 3
- m_ObsoleteInfiniteProjection: 1
- m_ObsoleteInfluenceVolume:
- m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendDistance: 0
- m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendNormalDistance: 0
- m_EditorAdvancedModeEnabled: 0
- m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
- m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
- m_Version: 1
- m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
- m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 10, y: 10, z: 10}
- m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
- m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
- m_ObsoleteMultiplier: 1
- m_ObsoleteWeight: 1
- m_ObsoleteMode: 0
- m_ObsoleteLightLayers: 1
- m_ObsoleteCaptureSettings:
- overrides: 0
- clearColorMode: 0
- backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
- clearDepth: 1
- cullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- useOcclusionCulling: 1
- volumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- volumeAnchorOverride: {fileID: 0}
- projection: 0
- nearClipPlane: 0.3
- farClipPlane: 1000
- fieldOfView: 90
- orthographicSize: 5
- renderingPath: 0
- shadowDistance: 100
m_ProbeSettings:
frustum:
fieldOfViewMode: 1
@@ -819,6 +730,17 @@ MonoBehaviour:
fadeDistance: 10000
rangeCompressionFactor: 1
influence:
+ m_Shape: 0
+ m_BoxSize: {x: 5.56, y: 2.4, z: 2}
+ m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
m_EditorAdvancedModeBlendDistancePositive: {x: 1, y: 1, z: 1}
m_EditorAdvancedModeBlendDistanceNegative: {x: 1, y: 1, z: 1}
m_EditorSimplifiedModeBlendDistance: 0
@@ -831,30 +753,23 @@ MonoBehaviour:
m_Version: 1
m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 5.56, y: 2.4, z: 2}
- m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
proxy:
- m_CSVersion: 1
- m_ObsoleteSphereInfiniteProjection: 0
- m_ObsoleteBoxInfiniteProjection: 0
m_Shape: 0
m_BoxSize: {x: 1, y: 1, z: 1}
m_SphereRadius: 1
+ m_CSVersion: 1
+ m_ObsoleteSphereInfiniteProjection: 0
+ m_ObsoleteBoxInfiniteProjection: 0
proxySettings:
useInfluenceVolumeAsProxyVolume: 0
capturePositionProxySpace: {x: 0, y: 0, z: 0}
captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1}
mirrorPositionProxySpace: {x: 0, y: 0, z: 0}
mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0}
+ resolutionScalable:
+ m_Override: 512
+ m_UseOverride: 0
+ m_Level: 0
resolution: 512
cameraSettings:
customRenderingSettings: 0
@@ -966,6 +881,8 @@ MonoBehaviour:
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
+ roughReflections: 1
+ distanceBasedRoughness: 0
m_ProbeSettingsOverride:
probe: 0
camera:
@@ -1051,7 +968,101 @@ MonoBehaviour:
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
m_FieldOfView: 0
m_Aspect: 0
- m_EditorOnlyData: 0
+ m_HDProbeVersion: 3
+ m_ObsoleteInfiniteProjection: 1
+ m_ObsoleteInfluenceVolume:
+ m_Shape: 0
+ m_BoxSize: {x: 10, y: 10, z: 10}
+ m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
+ m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
+ m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendDistance: 0
+ m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendNormalDistance: 0
+ m_EditorAdvancedModeEnabled: 0
+ m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
+ m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
+ m_Version: 1
+ m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
+ m_ObsoleteMultiplier: 1
+ m_ObsoleteWeight: 1
+ m_ObsoleteMode: 0
+ m_ObsoleteLightLayers: 1
+ m_ObsoleteCaptureSettings:
+ overrides: 0
+ clearColorMode: 0
+ backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
+ clearDepth: 1
+ cullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ useOcclusionCulling: 1
+ volumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ volumeAnchorOverride: {fileID: 0}
+ projection: 0
+ nearClipPlane: 0.3
+ farClipPlane: 1000
+ fieldOfView: 90
+ orthographicSize: 5
+ renderingPath: 0
+ shadowDistance: 100
m_ReflectionProbeVersion: 9
m_ObsoleteInfluenceShape: 0
m_ObsoleteInfluenceSphereRadius: 3
@@ -1229,7 +1240,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e1fbb15bf92b84f40a1eb030765b5afe, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
parameters:
albedo: {r: 0, g: 0.020182133, b: 1, a: 1}
meanFreePath: 3
@@ -1247,8 +1257,9 @@ MonoBehaviour:
invertFade: 0
distanceFadeStart: 10000
distanceFadeEnd: 10000
- textureIndex: 0
textureOffset: {x: -0, y: -0, z: 0}
+ falloffMode: 0
+ m_Version: 2
--- !u!4 &289937389
Transform:
m_ObjectHideFlags: 0
@@ -1322,6 +1333,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1417,6 +1429,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1499,14 +1512,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 0
- m_SpotLightShape: 1
- m_AreaLightShape: 0
m_Intensity: 6000000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -1516,6 +1521,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 0
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -1532,6 +1538,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -1581,6 +1588,10 @@ MonoBehaviour:
m_NormalBias: 0.75
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -1599,10 +1610,17 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 0
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 0
+ m_SpotLightShape: 1
+ m_AreaLightShape: 0
--- !u!108 &487714770
Light:
m_ObjectHideFlags: 0
@@ -1757,6 +1775,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1938,10 +1957,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: e8a8b3f6e35ec8e4892674d7b96893f3, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -1949,6 +1969,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &677872766
GameObject:
m_ObjectHideFlags: 0
@@ -2006,6 +2027,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2101,6 +2123,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2196,6 +2219,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2291,6 +2315,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2419,6 +2444,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2500,10 +2526,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: c0bc8fa10fe3fc14e96772ee9dd9ac54, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -2511,6 +2538,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &822258320
GameObject:
m_ObjectHideFlags: 0
@@ -2568,6 +2596,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2664,6 +2693,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2798,6 +2828,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2945,6 +2976,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3091,14 +3123,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 1
- m_SpotLightShape: 0
- m_AreaLightShape: 0
m_Intensity: 20000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -3108,6 +3132,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 0
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -3124,6 +3149,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -3173,6 +3199,10 @@ MonoBehaviour:
m_NormalBias: 0.75
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -3191,16 +3221,23 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 0
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
---- !u!108 &958494548
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 1
+ m_SpotLightShape: 0
+ m_AreaLightShape: 0
+--- !u!108 &958494548
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 958494545}
m_Enabled: 1
serializedVersion: 10
@@ -3314,6 +3351,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3382,101 +3420,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_HDProbeVersion: 3
- m_ObsoleteInfiniteProjection: 1
- m_ObsoleteInfluenceVolume:
- m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendDistance: 0
- m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendNormalDistance: 0
- m_EditorAdvancedModeEnabled: 0
- m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
- m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
- m_Version: 1
- m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
- m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 10, y: 10, z: 10}
- m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
- m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
- m_ObsoleteMultiplier: 1
- m_ObsoleteWeight: 1
- m_ObsoleteMode: 0
- m_ObsoleteLightLayers: 1
- m_ObsoleteCaptureSettings:
- overrides: 0
- clearColorMode: 0
- backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
- clearDepth: 1
- cullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- useOcclusionCulling: 1
- volumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- volumeAnchorOverride: {fileID: 0}
- projection: 0
- nearClipPlane: 0.3
- farClipPlane: 1000
- fieldOfView: 90
- orthographicSize: 5
- renderingPath: 0
- shadowDistance: 100
m_ProbeSettings:
frustum:
fieldOfViewMode: 1
@@ -3493,6 +3436,17 @@ MonoBehaviour:
fadeDistance: 10000
rangeCompressionFactor: 1
influence:
+ m_Shape: 0
+ m_BoxSize: {x: 20, y: 20, z: 20}
+ m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
+ m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
m_EditorAdvancedModeBlendDistancePositive: {x: 1, y: 1, z: 1}
m_EditorAdvancedModeBlendDistanceNegative: {x: 1, y: 1, z: 1}
m_EditorSimplifiedModeBlendDistance: 1
@@ -3505,30 +3459,23 @@ MonoBehaviour:
m_Version: 1
m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 20, y: 20, z: 20}
- m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
- m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
proxy:
- m_CSVersion: 1
- m_ObsoleteSphereInfiniteProjection: 0
- m_ObsoleteBoxInfiniteProjection: 0
m_Shape: 0
m_BoxSize: {x: 1, y: 1, z: 1}
m_SphereRadius: 1
+ m_CSVersion: 1
+ m_ObsoleteSphereInfiniteProjection: 0
+ m_ObsoleteBoxInfiniteProjection: 0
proxySettings:
useInfluenceVolumeAsProxyVolume: 0
capturePositionProxySpace: {x: 0, y: 0, z: 0}
captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1}
mirrorPositionProxySpace: {x: 0, y: 0, z: 0}
mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0}
+ resolutionScalable:
+ m_Override: 512
+ m_UseOverride: 0
+ m_Level: 0
resolution: 512
cameraSettings:
customRenderingSettings: 1
@@ -3640,6 +3587,8 @@ MonoBehaviour:
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
+ roughReflections: 1
+ distanceBasedRoughness: 0
m_ProbeSettingsOverride:
probe: 0
camera:
@@ -3725,7 +3674,101 @@ MonoBehaviour:
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
m_FieldOfView: 0
m_Aspect: 0
- m_EditorOnlyData: 0
+ m_HDProbeVersion: 3
+ m_ObsoleteInfiniteProjection: 1
+ m_ObsoleteInfluenceVolume:
+ m_Shape: 0
+ m_BoxSize: {x: 10, y: 10, z: 10}
+ m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1}
+ m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
+ m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendDistance: 0
+ m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendNormalDistance: 0
+ m_EditorAdvancedModeEnabled: 0
+ m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
+ m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
+ m_Version: 1
+ m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
+ m_ObsoleteMultiplier: 1
+ m_ObsoleteWeight: 1
+ m_ObsoleteMode: 0
+ m_ObsoleteLightLayers: 1
+ m_ObsoleteCaptureSettings:
+ overrides: 0
+ clearColorMode: 0
+ backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
+ clearDepth: 1
+ cullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ useOcclusionCulling: 1
+ volumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ volumeAnchorOverride: {fileID: 0}
+ projection: 0
+ nearClipPlane: 0.3
+ farClipPlane: 1000
+ fieldOfView: 90
+ orthographicSize: 5
+ renderingPath: 0
+ shadowDistance: 100
m_ReflectionProbeVersion: 9
m_ObsoleteInfluenceShape: 0
m_ObsoleteInfluenceSphereRadius: 3
@@ -3764,7 +3807,7 @@ ReflectionProbe:
m_BlendDistance: 0
m_HDR: 1
m_BoxProjection: 0
- m_RenderDynamicObjects: 0
+ m_RenderDynamicObjects: 1
m_UseOcclusionCulling: 1
m_Importance: 1
m_CustomBakedTexture: {fileID: 0}
@@ -3825,10 +3868,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: 017961ca5e12d1b47931ea75f6dac854, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -3836,6 +3880,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &1182347498
GameObject:
m_ObjectHideFlags: 0
@@ -3894,6 +3939,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3989,6 +4035,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -4063,18 +4110,22 @@ MonoBehaviour:
TargetWidth: 1920
TargetHeight: 1080
PerPixelCorrectnessThreshold: 0.0015
+ PerPixelGammaThreshold: 0.003921569
+ PerPixelAlphaThreshold: 0.003921569
AverageCorrectnessThreshold: 0.0015
+ IncorrectPixelsThreshold: 0.0000038146973
UseHDR: 0
UseBackBuffer: 0
ImageResolution: 0
+ ActiveImageTests: 1
+ ActivePixelTests: 7
doBeforeTest:
m_PersistentCalls:
m_Calls: []
captureFramerate: 60
- waitFrames: 8
+ waitFrames: 101
xrCompatible: 1
xrThresholdMultiplier: 1
- renderGraphCompatible: 1
checkMemoryAllocation: 0
renderPipelineAsset: {fileID: 11400000, guid: a2b3940bdd38ca54880a3ae1fe6be80f,
type: 2}
@@ -4090,53 +4141,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 7
- m_ObsoleteRenderingPath: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearDepth: 1
@@ -4192,6 +4196,53 @@ MonoBehaviour:
data1: 2147483649
data2: 0
defaultFrameSettings: 0
+ m_Version: 7
+ m_ObsoleteRenderingPath: 0
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
--- !u!20 &1229154922
Camera:
m_ObjectHideFlags: 0
@@ -4327,6 +4378,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -4408,10 +4460,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: 3a41e48b5aaa0b94cbd0859d37b44a49, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 1
@@ -4419,6 +4472,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 0.5
+ m_Version: 2
--- !u!1 &1256852538
GameObject:
m_ObjectHideFlags: 0
@@ -4519,6 +4573,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -4595,20 +4650,12 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1319017569}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 0
- m_SpotLightShape: 0
- m_AreaLightShape: 0
+ m_GameObject: {fileID: 1319017569}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
m_Intensity: 6000000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -4618,6 +4665,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 0
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -4634,6 +4682,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -4683,6 +4732,10 @@ MonoBehaviour:
m_NormalBias: 0.75
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -4701,10 +4754,17 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 0
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 0
+ m_SpotLightShape: 0
+ m_AreaLightShape: 0
--- !u!108 &1319017572
Light:
m_ObjectHideFlags: 0
@@ -4824,6 +4884,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -4919,6 +4980,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -5001,14 +5063,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 0
- m_SpotLightShape: 2
- m_AreaLightShape: 0
m_Intensity: 60000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -5018,6 +5072,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 2
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -5034,6 +5089,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -5083,6 +5139,10 @@ MonoBehaviour:
m_NormalBias: 0.75
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -5101,10 +5161,17 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 0
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 0
+ m_SpotLightShape: 2
+ m_AreaLightShape: 0
--- !u!108 &1389449676
Light:
m_ObjectHideFlags: 0
@@ -5211,53 +5278,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 7
- m_ObsoleteRenderingPath: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearDepth: 1
@@ -5313,6 +5333,53 @@ MonoBehaviour:
data1: 1
data2: 0
defaultFrameSettings: 0
+ m_Version: 7
+ m_ObsoleteRenderingPath: 0
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
--- !u!20 &1406067718
Camera:
m_ObjectHideFlags: 0
@@ -5413,6 +5480,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -5556,6 +5624,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -5651,6 +5720,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -5746,6 +5816,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -5827,6 +5898,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -6046,14 +6118,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 0
- m_SpotLightShape: 0
- m_AreaLightShape: 0
m_Intensity: 5000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -6063,6 +6127,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 2
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -6079,6 +6144,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -6128,6 +6194,10 @@ MonoBehaviour:
m_NormalBias: 1.36
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -6146,10 +6216,17 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 8
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 0
+ m_SpotLightShape: 0
+ m_AreaLightShape: 0
--- !u!1 &1529630566
GameObject:
m_ObjectHideFlags: 0
@@ -6207,6 +6284,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -6438,10 +6516,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: 8c5238ad69968ff48af7d2af0f79129f, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -6449,6 +6528,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &1673073998
GameObject:
m_ObjectHideFlags: 0
@@ -6506,6 +6586,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -6589,120 +6670,25 @@ GameObject:
- component: {fileID: 1748455731}
- component: {fileID: 1748455730}
- component: {fileID: 1748455729}
- m_Layer: 0
- m_Name: Plane
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1748455729
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1748455728}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HDProbeVersion: 3
- m_ObsoleteInfiniteProjection: 1
- m_ObsoleteInfluenceVolume:
- m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendDistance: 0
- m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_EditorSimplifiedModeBlendNormalDistance: 0
- m_EditorAdvancedModeEnabled: 0
- m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
- m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
- m_Version: 1
- m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
- m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 10, y: 10, z: 10}
- m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
- m_ObsoleteMultiplier: 1
- m_ObsoleteWeight: 1
- m_ObsoleteMode: 0
- m_ObsoleteLightLayers: 1
- m_ObsoleteCaptureSettings:
- overrides: 0
- clearColorMode: 0
- backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
- clearDepth: 1
- cullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- useOcclusionCulling: 1
- volumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- volumeAnchorOverride: {fileID: 0}
- projection: 0
- nearClipPlane: 0.3
- farClipPlane: 1000
- fieldOfView: 90
- orthographicSize: 5
- renderingPath: 0
- shadowDistance: 100
+ m_Layer: 0
+ m_Name: Plane
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1748455729
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1748455728}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
m_ProbeSettings:
frustum:
fieldOfViewMode: 1
@@ -6719,6 +6705,17 @@ MonoBehaviour:
fadeDistance: 10000
rangeCompressionFactor: 1
influence:
+ m_Shape: 0
+ m_BoxSize: {x: 18.77, y: 0.01, z: 13.99}
+ m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
m_EditorSimplifiedModeBlendDistance: 0
@@ -6731,30 +6728,23 @@ MonoBehaviour:
m_Version: 1
m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
m_ObsoleteOffset: {x: 0, y: 0, z: 0}
- m_Shape: 0
- m_BoxSize: {x: 18.77, y: 0.01, z: 13.99}
- m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
- m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
- m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
- m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
- m_SphereRadius: 3
- m_SphereBlendDistance: 0
- m_SphereBlendNormalDistance: 0
proxy:
- m_CSVersion: 1
- m_ObsoleteSphereInfiniteProjection: 0
- m_ObsoleteBoxInfiniteProjection: 0
m_Shape: 0
m_BoxSize: {x: 1, y: 1, z: 1}
m_SphereRadius: 1
+ m_CSVersion: 1
+ m_ObsoleteSphereInfiniteProjection: 0
+ m_ObsoleteBoxInfiniteProjection: 0
proxySettings:
useInfluenceVolumeAsProxyVolume: 0
capturePositionProxySpace: {x: 0, y: 0, z: 0}
captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1}
mirrorPositionProxySpace: {x: 0, y: 0, z: 0}
mirrorRotationProxySpace: {x: -0.70710677, y: 0, z: 0, w: 0.70710677}
+ resolutionScalable:
+ m_Override: 1024
+ m_UseOverride: 1
+ m_Level: 0
resolution: 1024
cameraSettings:
customRenderingSettings: 1
@@ -6866,6 +6856,8 @@ MonoBehaviour:
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
+ roughReflections: 1
+ distanceBasedRoughness: 0
m_ProbeSettingsOverride:
probe: 0
camera:
@@ -6951,13 +6943,107 @@ MonoBehaviour:
m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0}
m_FieldOfView: 0
m_Aspect: 0
- m_EditorOnlyData: 0
- m_PlanarProbeVersion: 6
+ m_HDProbeVersion: 3
+ m_ObsoleteInfiniteProjection: 1
+ m_ObsoleteInfluenceVolume:
+ m_Shape: 0
+ m_BoxSize: {x: 10, y: 10, z: 10}
+ m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_BoxSideFadePositive: {x: 1, y: 1, z: 1}
+ m_BoxSideFadeNegative: {x: 1, y: 1, z: 1}
+ m_SphereRadius: 3
+ m_SphereBlendDistance: 0
+ m_SphereBlendNormalDistance: 0
+ m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendDistance: 0
+ m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0}
+ m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0}
+ m_EditorSimplifiedModeBlendNormalDistance: 0
+ m_EditorAdvancedModeEnabled: 0
+ m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1}
+ m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1}
+ m_Version: 1
+ m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteOffset: {x: 0, y: 0, z: 0}
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
+ m_ObsoleteMultiplier: 1
+ m_ObsoleteWeight: 1
+ m_ObsoleteMode: 0
+ m_ObsoleteLightLayers: 1
+ m_ObsoleteCaptureSettings:
+ overrides: 0
+ clearColorMode: 0
+ backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0}
+ clearDepth: 1
+ cullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ useOcclusionCulling: 1
+ volumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ volumeAnchorOverride: {fileID: 0}
+ projection: 0
+ nearClipPlane: 0.3
+ farClipPlane: 1000
+ fieldOfView: 90
+ orthographicSize: 5
+ renderingPath: 0
+ shadowDistance: 100
+ m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645}
+ m_PlanarProbeVersion: 7
m_ObsoleteCaptureNearPlane: 0.3
m_ObsoleteCaptureFarPlane: 1000
m_ObsoleteOverrideFieldOfView: 0
m_ObsoleteFieldOfViewOverride: 90
- m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645}
--- !u!23 &1748455730
MeshRenderer:
m_ObjectHideFlags: 0
@@ -6969,6 +7055,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -7092,6 +7179,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -7174,53 +7262,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 7
- m_ObsoleteRenderingPath: 0
- m_ObsoleteFrameSettings:
- overrides: 0
- enableShadow: 0
- enableContactShadows: 0
- enableShadowMask: 0
- enableSSR: 0
- enableSSAO: 0
- enableSubsurfaceScattering: 0
- enableTransmission: 0
- enableAtmosphericScattering: 0
- enableVolumetrics: 0
- enableReprojectionForVolumetrics: 0
- enableLightLayers: 0
- enableExposureControl: 1
- diffuseGlobalDimmer: 0
- specularGlobalDimmer: 0
- shaderLitMode: 0
- enableDepthPrepassWithDeferredRendering: 0
- enableTransparentPrepass: 0
- enableMotionVectors: 0
- enableObjectMotionVectors: 0
- enableDecals: 0
- enableRoughRefraction: 0
- enableTransparentPostpass: 0
- enableDistortion: 0
- enablePostprocess: 0
- enableOpaqueObjects: 0
- enableTransparentObjects: 0
- enableRealtimePlanarReflection: 0
- enableMSAA: 0
- enableAsyncCompute: 0
- runLightListAsync: 0
- runSSRAsync: 0
- runSSAOAsync: 0
- runContactShadowsAsync: 0
- runVolumeVoxelizationAsync: 0
- lightLoopSettings:
- overrides: 0
- enableDeferredTileAndCluster: 0
- enableComputeLightEvaluation: 0
- enableComputeLightVariants: 0
- enableComputeMaterialVariants: 0
- enableFptlForForwardOpaque: 0
- enableBigTilePrepass: 0
- isFptlEnabled: 0
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearDepth: 1
@@ -7276,6 +7317,53 @@ MonoBehaviour:
data1: 2147483649
data2: 4539628424389459968
defaultFrameSettings: 0
+ m_Version: 7
+ m_ObsoleteRenderingPath: 0
+ m_ObsoleteFrameSettings:
+ overrides: 0
+ enableShadow: 0
+ enableContactShadows: 0
+ enableShadowMask: 0
+ enableSSR: 0
+ enableSSAO: 0
+ enableSubsurfaceScattering: 0
+ enableTransmission: 0
+ enableAtmosphericScattering: 0
+ enableVolumetrics: 0
+ enableReprojectionForVolumetrics: 0
+ enableLightLayers: 0
+ enableExposureControl: 1
+ diffuseGlobalDimmer: 0
+ specularGlobalDimmer: 0
+ shaderLitMode: 0
+ enableDepthPrepassWithDeferredRendering: 0
+ enableTransparentPrepass: 0
+ enableMotionVectors: 0
+ enableObjectMotionVectors: 0
+ enableDecals: 0
+ enableRoughRefraction: 0
+ enableTransparentPostpass: 0
+ enableDistortion: 0
+ enablePostprocess: 0
+ enableOpaqueObjects: 0
+ enableTransparentObjects: 0
+ enableRealtimePlanarReflection: 0
+ enableMSAA: 0
+ enableAsyncCompute: 0
+ runLightListAsync: 0
+ runSSRAsync: 0
+ runSSAOAsync: 0
+ runContactShadowsAsync: 0
+ runVolumeVoxelizationAsync: 0
+ lightLoopSettings:
+ overrides: 0
+ enableDeferredTileAndCluster: 0
+ enableComputeLightEvaluation: 0
+ enableComputeLightVariants: 0
+ enableComputeMaterialVariants: 0
+ enableFptlForForwardOpaque: 0
+ enableBigTilePrepass: 0
+ isFptlEnabled: 0
--- !u!20 &1823370824
Camera:
m_ObjectHideFlags: 0
@@ -7376,6 +7464,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -7471,6 +7560,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -7639,14 +7729,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 11
- m_ObsoleteShadowResolutionTier: 1
- m_ObsoleteUseShadowQualitySettings: 0
- m_ObsoleteCustomShadowResolution: 512
- m_ObsoleteContactShadows: 0
- m_PointlightHDType: 0
- m_SpotLightShape: 0
- m_AreaLightShape: 0
m_Intensity: 600000
m_EnableSpotReflector: 0
m_LuxAtDistance: 1
@@ -7656,6 +7738,7 @@ MonoBehaviour:
m_VolumetricDimmer: 1
m_LightUnit: 0
m_FadeDistance: 10000
+ m_VolumetricFadeDistance: 10000
m_AffectDiffuse: 1
m_AffectSpecular: 1
m_NonLightmappedOnly: 0
@@ -7672,6 +7755,7 @@ MonoBehaviour:
m_AreaLightCookie: {fileID: 0}
m_IESPoint: {fileID: 0}
m_IESSpot: {fileID: 0}
+ m_IncludeForRayTracing: 1
m_AreaLightShadowCone: 120
m_UseScreenSpaceShadows: 0
m_InteractsWithSky: 1
@@ -7721,6 +7805,10 @@ MonoBehaviour:
m_NormalBias: 0.75
m_SlopeBias: 0.5
m_ShadowUpdateMode: 0
+ m_AlwaysDrawDynamicShadows: 0
+ m_UpdateShadowOnLightMovement: 0
+ m_CachedShadowTranslationThreshold: 0.01
+ m_CachedShadowAngularThreshold: 0.5
m_BarnDoorAngle: 90
m_BarnDoorLength: 0.05
m_preserveCachedShadow: 0
@@ -7739,10 +7827,17 @@ MonoBehaviour:
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
- showAdditionalSettings: 0
m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1
+ m_Version: 11
+ m_ObsoleteShadowResolutionTier: 1
+ m_ObsoleteUseShadowQualitySettings: 0
+ m_ObsoleteCustomShadowResolution: 512
+ m_ObsoleteContactShadows: 0
+ m_PointlightHDType: 0
+ m_SpotLightShape: 0
+ m_AreaLightShape: 0
--- !u!108 &1923445992
Light:
m_ObjectHideFlags: 0
@@ -7862,10 +7957,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 2
m_Material: {fileID: 2100000, guid: 526f22e3a13fdb04faa878c4b6f780b5, type: 2}
m_DrawDistance: 1000
m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_AffectsTransparency: 0
@@ -7873,6 +7969,7 @@ MonoBehaviour:
m_Offset: {x: 0, y: 0, z: 0.5}
m_Size: {x: 2, y: 2, z: 2}
m_FadeFactor: 1
+ m_Version: 2
--- !u!1 &2012672002
GameObject:
m_ObjectHideFlags: 0
@@ -7931,6 +8028,7 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -8027,6 +8125,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat
index 383d5c17ad0..95c99f276bf 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat
@@ -37,6 +37,10 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+ m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: -2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat
index fd84565fb4f..4e22760c27d 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat
@@ -37,6 +37,10 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+ m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: 3
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat
index 5f2b24d2d11..2694cc342d4 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat
@@ -37,6 +37,10 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+ m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: 2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat
index ad11e6b21e7..17aea42d526 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat
@@ -37,6 +37,10 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+ m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: -2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
index 2448f84c843..63d0c8950a1 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
@@ -37,6 +37,10 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+ m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: -1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
index 9f7a0d20395..81787ba431f 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
@@ -41,6 +41,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_22ab0c98da19fa8cb25fd19a0aeeb31b_Texture_1:
+ m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_234b653769274d599f16c88325d2e6ae_Texture_1:
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
m_Scale: {x: 1, y: 1}
@@ -69,6 +73,10 @@ Material:
m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_922ed2f15209728c934f7ad08e8df067_Texture_1:
+ m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_998a067d9ebe483eaf2b10434380d263_Texture_1:
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
m_Scale: {x: 1, y: 1}
@@ -77,6 +85,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SampleTexture2D_b38e27eec0c6198ab3dec7c4cf4437e3_Texture_1:
+ m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _SampleTexture2D_b4b43955db0f4c4b8749459e55a590f4_Texture_1:
m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
m_Scale: {x: 1, y: 1}
@@ -105,6 +117,19 @@ Material:
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
m_Floats:
- _AffectAO: 1
- _AffectAlbedo: 1
@@ -117,7 +142,9 @@ Material:
- _DecalColorMask1: 15
- _DecalColorMask2: 15
- _DecalColorMask3: 12
+ - _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DecalStencilRef: 16
- _DecalStencilWriteMask: 16
- _DrawOrder: 0
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 8894bdd2505..a28ed042929 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -13,10 +13,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added a history rejection criterion based on if the pixel was moving in world space (case 1302392).
### Fixed
+- Fixed an exception when opening the color picker in the material UI (case 1307143).
+- Fixed lights shadow frustum near and far planes.
+- Fixed various issues with non-temporal SSAO and rendergraph.
+- Fixed white flashes on camera cuts on volumetric fog.
+- Fixed light layer issue when performing editing on multiple lights.
+- Fixed an issue where selection in a debug panel would reset when cycling through enum items.
+- Fixed material keywords with fbx importer.
+- Fixed lightmaps not working properly with shader graphs in ray traced reflections (case 1305335).
+- Fixed skybox for ortho cameras.
### Changed
- Removed the material pass probe volumes evaluation mode.
- Unifying the history validation pass so that it is only done once for the whole frame and not per effect.
+- Updated the tooltip for the Decal Angle Fade property (requires to enable Decal Layers in both HDRP asset and Frame settings) (case 1308048).
## [11.0.0] - 2020-10-21
@@ -42,6 +52,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed compilation issues on platforms that don't support XR.
- Fixed issue with compute shader stripping for probe volumes variants.
- Fixed issue with an empty index buffer not being released.
+- Fixed issue when debug full screen 'Transparent Screen Space Reflection' do not take in consideration debug exposure
### Changed
- Removed the material pass probe volumes evaluation mode.
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Anti-Aliasing.md b/com.unity.render-pipelines.high-definition/Documentation~/Anti-Aliasing.md
index 3685e3aa559..6ef5cbefc91 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Anti-Aliasing.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Anti-Aliasing.md
@@ -43,6 +43,12 @@ To select TAA for a Camera:
1. Select the Camera in the Scene view or Hierarchy and view it in the Inspector.
2. In the General section, select Temporal Anti-aliasing (TAA) from the Anti-aliasing drop-down.
+When using the same Camera GameObject for multiple Game Views TAA may not work as expected due to limitations of the history buffer system. Multiple game views using different Cameras will however work as expected.
+
+### Limitations
+In the Editor, if multiple Game views use the same Camera, TAA may not work as expected due to limitations of the history buffer system. However, if you use multiple Game views, where each Game view uses a unique Camera, TAA works as expected.
+
+
## Subpixel morphological anti-aliasing (SMAA)
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
index e8350d48bb8..0e967b1f262 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
@@ -40,7 +40,7 @@ To create a new Layered Lit Material, navigate to your Project's Asset window, r
| **Property** | **Description** |
| -------------------------------------------- | ------------------------------------------------------------ |
| **Layer Count** | Use the slider to set the number of layers this Material uses. You can set up to four layers. |
-| **Layer Mask** | Assign a Texture to the field to manage the visibility of each layer. If you do not assign a Texture, the Material uses the maximum value for every channel.
• Alpha channel for the **Main Layer**.
• Red channel for **Layer 1**.
• Green channel for **Layer 2**.
• Blue channel for **Layer** |
+| **Layer Mask** | Assign a Texture to the field to manage the visibility of each layer. If you do not assign a Texture, the Material uses the maximum value for every channel.
• Alpha channel for the **Main Layer**.
• Red channel for **Layer 1**.
• Green channel for **Layer 2**.
• Blue channel for **Layer 3**. |
| **BlendMask UV Mapping** | Use the drop-down to select the type of UV mapping that HDRP uses to map the **Layer Mask**.
• Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.
• **Planar:** A planar projection from top to bottom.
• **Triplanar**: A planar projection in three directions:X-axis: Left to rightY-axis: Top to bottomZ-axis: Front to back Unity blends these three projections together to produce the final result. |
| **World Scale** | Set the world-space size of the Texture in meters. If you set this to **1**, then HDRP maps the Texture to 1 meter in world space.If you set this to **2**, then HDRP maps the Texture to 0.5 meters in world space.This property only appears when you select **Planar** or **Triplanar** from the **BlendMask UV Mapping** drop-down. |
| **Tiling** | Set an **X** and **Y** tile rate for the **Layer Mask** UV. HDRP uses the **X** and **Y** values to tile the Texture assigned to the **Layer Mask** across the Material’s surface, in object space. |
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
index 31cef13722b..a08dbb0bc68 100644
--- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
@@ -42,12 +42,6 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
material.shader = shader;
- material.SetShaderPassEnabled("DistortionVectors", false);
- material.SetShaderPassEnabled("TransparentDepthPrepass", false);
- material.SetShaderPassEnabled("TransparentDepthPostpass", false);
- material.SetShaderPassEnabled("TransparentBackface", false);
- material.SetShaderPassEnabled("MOTIONVECTORS", false);
-
Vector4 vectorProperty;
float floatProperty;
TexturePropertyDescription textureProperty;
@@ -78,17 +72,10 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
if (isTransparent)
{
- material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
- material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
- material.SetInt("_ZWrite", 0);
material.SetFloat("_BlendMode", (float)BlendMode.Alpha);
material.SetFloat("_EnableBlendModePreserveSpecularLighting", 1.0f);
- material.EnableKeyword("_ALPHAPREMULTIPLY_ON");
- material.EnableKeyword("_SURFACE_TYPE_TRANSPARENT");
- material.EnableKeyword("_ENABLE_FOG_ON_TRANSPARENT");
- material.EnableKeyword("_ALPHATEST_ON");
material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Transparent;
- material.SetFloat("_SurfaceType", 1.0f);
+ material.SetFloat("_SurfaceType", (float)SurfaceType.Transparent);
material.SetFloat("_Cutoff", .0f);
material.SetFloat("_AlphaCutoffEnable", 1.0f);
material.SetFloat("_AlphaCutoff", .0f);
@@ -97,12 +84,12 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
}
else
{
- material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
- material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
- material.SetInt("_ZWrite", 1);
material.renderQueue = -1;
}
+ if (description.TryGetProperty("ReflectionFactor", out floatProperty))
+ material.SetFloat("_Metallic", floatProperty);
+
if (description.TryGetProperty("DiffuseColor", out textureProperty) && textureProperty.texture != null)
{
Color diffuseColor = new Color(1.0f, 1.0f, 1.0f, 1.0f);
@@ -125,7 +112,6 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
if (description.TryGetProperty("Bump", out textureProperty) && textureProperty.texture != null)
{
SetMaterialTextureProperty("_BumpMap", material, textureProperty);
- material.EnableKeyword("_NORMALMAP_TANGENT_SPACE");
if (description.TryGetProperty("BumpFactor", out floatProperty))
material.SetFloat("_BumpScale", floatProperty);
@@ -133,15 +119,10 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
else if (description.TryGetProperty("NormalMap", out textureProperty) && textureProperty.texture != null)
{
SetMaterialTextureProperty("_BumpMap", material, textureProperty);
- material.EnableKeyword("_NORMALMAP_TANGENT_SPACE");
if (description.TryGetProperty("BumpFactor", out floatProperty))
material.SetFloat("_BumpScale", floatProperty);
}
- else
- {
- material.DisableKeyword("_NORMALMAP");
- }
if (description.TryGetProperty("EmissiveColor", out textureProperty))
{
@@ -183,6 +164,8 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
RemapColorCurves(description, clips, "EmissiveColor", "_EmissionColor");
RemapColorCurves(description, clips, "EmissiveColor", "_EmissiveColor");
+
+ HDShaderUtils.ResetMaterialKeywords(material);
}
static void RemapTransparencyCurves(MaterialDescription description, AnimationClip[] clips)
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
index 1e6b25a10ef..248af7e66fd 100644
--- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
@@ -116,6 +116,14 @@ static internal void SaveAssetsToDisk()
s_NeedsSavingAssets = false;
}
+ void OnPostprocessMaterial(Material material)
+ {
+ if (!HDShaderUtils.IsHDRPShader(material.shader, upgradable: true))
+ return;
+
+ HDShaderUtils.ResetMaterialKeywords(material);
+ }
+
static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
{
foreach (var asset in importedAssets)
diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
index 519becb4da7..c260308fcb2 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
@@ -228,7 +228,7 @@ static void DrawGeneralAdditionalContent(SerializedHDLight serialized, Editor ow
EditorGUILayout.PropertyField(serialized.lightlayersMask, s_Styles.lightLayer);
// If we're not in decoupled mode for light layers, we sync light with shadow layers:
- if (serialized.linkLightLayers.boolValue && change.changed)
+ if (serialized.linkLightLayers.boolValue && change.changed && !serialized.lightlayersMask.hasMultipleDifferentValues)
SyncLightAndShadowLayers(serialized, owner);
}
}
@@ -1199,7 +1199,7 @@ static void DrawShadowMapAdditionalContent(SerializedHDLight serialized, Editor
if (change.changed)
Undo.RecordObjects(owner.targets, "Undo Light Layers Changed");
}
- if (!serialized.linkLightLayers.hasMultipleDifferentValues)
+ if (!serialized.linkLightLayers.hasMultipleDifferentValues && !serialized.lightlayersMask.hasMultipleDifferentValues)
{
using (new EditorGUI.DisabledGroupScope(serialized.linkLightLayers.boolValue))
{
diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
index 15b7fbcc8fe..477850e08fa 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
@@ -108,9 +108,9 @@ static void Drawer_SectionShapeBox(SerializedInfluenceVolume serialized, Editor
}
else
{
- serialized.editorSimplifiedModeBlendDistance.floatValue = Mathf.Max(blendPositive.x, blendPositive.y, blendPositive.z, blendNegative.x, blendNegative.y, blendNegative.z);
+ serialized.editorSimplifiedModeBlendDistance.floatValue = Mathf.Min(blendPositive.x, blendPositive.y, blendPositive.z, blendNegative.x, blendNegative.y, blendNegative.z);
serialized.boxBlendDistancePositive.vector3Value = serialized.boxBlendDistanceNegative.vector3Value = Vector3.one * serialized.editorSimplifiedModeBlendDistance.floatValue;
- serialized.editorSimplifiedModeBlendNormalDistance.floatValue = Mathf.Max(blendNormalPositive.x, blendNormalPositive.y, blendNormalPositive.z, blendNormalNegative.x, blendNormalNegative.y, blendNormalNegative.z);
+ serialized.editorSimplifiedModeBlendNormalDistance.floatValue = Mathf.Min(blendNormalPositive.x, blendNormalPositive.y, blendNormalPositive.z, blendNormalNegative.x, blendNormalNegative.y, blendNormalNegative.z);
serialized.boxBlendNormalDistancePositive.vector3Value = serialized.boxBlendNormalDistanceNegative.vector3Value = Vector3.one * serialized.editorSimplifiedModeBlendNormalDistance.floatValue;
}
}
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Decal/DecalProjectorEditor.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Decal/DecalProjectorEditor.Skin.cs
index 0c8adc52a43..46ce3ee125b 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Decal/DecalProjectorEditor.Skin.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Decal/DecalProjectorEditor.Skin.cs
@@ -19,7 +19,7 @@ partial class DecalProjectorEditor
static readonly GUIContent k_DecalLayerMaskContent = EditorGUIUtility.TrTextContent("Decal Layer", "Specify the decal layer mask to use for this projector. RenderingLayerMask of Mesh matching this value will receive the decal. Enable Layers in Decal section of HDRP settings to access it.");
static readonly GUIContent k_DistanceContent = EditorGUIUtility.TrTextContent("Draw Distance", "Sets the distance from the Camera at which HDRP stop rendering the decal.");
static readonly GUIContent k_FadeScaleContent = EditorGUIUtility.TrTextContent("Start Fade", "Controls the distance from the Camera at which this component begins to fade the decal out.");
- static readonly GUIContent k_AngleFadeContent = EditorGUIUtility.TrTextContent("Angle Fade", "Controls the fade out range of the decal based on the angle between the Decal backward direction and the vertex normal of the receiving surface.");
+ static readonly GUIContent k_AngleFadeContent = EditorGUIUtility.TrTextContent("Angle Fade", "Controls the fade out range of the decal based on the angle between the Decal backward direction and the vertex normal of the receiving surface. Requires 'Decal Layers' to be enabled in the HDRP Asset and Frame Settings.");
static readonly GUIContent k_UVScaleContent = EditorGUIUtility.TrTextContent("Tilling", "Sets the scale for the decal Material. Scales the decal along its UV axes.");
static readonly GUIContent k_UVBiasContent = EditorGUIUtility.TrTextContent("Offset", "Sets the offset for the decal Material. Moves the decal along its UV axes.");
static readonly GUIContent k_FadeFactorContent = EditorGUIUtility.TrTextContent("Fade Factor", "Controls the transparency of the decal.");
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.cs
index bbfd38eba40..6574a8f33f3 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.cs
@@ -56,7 +56,7 @@ protected override SubShaderDescriptor GetRaytracingSubShaderDescriptor()
var descriptor = base.GetRaytracingSubShaderDescriptor();
if (eyeData.subsurfaceScattering)
- descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface());
+ descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface(true));
return descriptor;
}
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.cs
index ee6800d55c6..f0c7d572b16 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.cs
@@ -56,7 +56,7 @@ protected override SubShaderDescriptor GetRaytracingSubShaderDescriptor()
var descriptor = base.GetRaytracingSubShaderDescriptor();
if (fabricData.subsurfaceScattering)
- descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface());
+ descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface(true));
return descriptor;
}
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.cs
index d0ad94188ab..4e7bd6c8287 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.cs
@@ -73,7 +73,7 @@ protected override SubShaderDescriptor GetRaytracingSubShaderDescriptor()
var descriptor = base.GetRaytracingSubShaderDescriptor();
if (litData.materialType == HDLitData.MaterialType.SubsurfaceScattering)
- descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface());
+ descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface(true));
return descriptor;
}
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs
index 8d4bfbf6cda..d8ee3d1018d 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs
@@ -860,6 +860,7 @@ public static PassDescriptor GenerateRaytracingIndirect(bool supportLighting)
referenceName = "SHADERPASS_RAYTRACING_INDIRECT",
lightMode = "IndirectDXR",
useInPreview = false,
+ requiredFields = supportLighting ? CoreRequiredFields.LitMinimal : null,
// Collections
pragmas = CorePragmas.RaytracingBasic,
@@ -972,6 +973,7 @@ public static PassDescriptor GenerateRaytracingForward(bool supportLighting)
referenceName = "SHADERPASS_RAYTRACING_FORWARD",
lightMode = "ForwardDXR",
useInPreview = false,
+ requiredFields = supportLighting ? CoreRequiredFields.LitMinimal : null,
// Port Mask
// validVertexBlocks = CoreBlockMasks.Vertex,
@@ -1037,6 +1039,7 @@ public static PassDescriptor GenerateRaytracingGBuffer(bool supportLighting)
referenceName = "SHADERPASS_RAYTRACING_GBUFFER",
lightMode = "GBufferDXR",
useInPreview = false,
+ requiredFields = supportLighting ? CoreRequiredFields.LitMinimal : null,
// Port Mask
// validVertexBlocks = CoreBlockMasks.Vertex,
@@ -1150,7 +1153,7 @@ IncludeCollection GenerateIncludes()
#region Raytracing Subsurface
- public static PassDescriptor GenerateRaytracingSubsurface()
+ public static PassDescriptor GenerateRaytracingSubsurface(bool supportLighting)
{
return new PassDescriptor
{
@@ -1159,6 +1162,7 @@ public static PassDescriptor GenerateRaytracingSubsurface()
referenceName = "SHADERPASS_RAYTRACING_SUB_SURFACE",
lightMode = "SubSurfaceDXR",
useInPreview = false,
+ requiredFields = supportLighting ? CoreRequiredFields.LitMinimal : null,
// Template
// passTemplatePath = passTemplatePath,
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.cs
index b10b4b1c82b..b7417d5d0a1 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.cs
@@ -122,7 +122,7 @@ protected override SubShaderDescriptor GetRaytracingSubShaderDescriptor()
var descriptor = base.GetRaytracingSubShaderDescriptor();
if (stackLitData.subsurfaceScattering)
- descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface());
+ descriptor.passes.Add(HDShaderPasses.GenerateRaytracingSubsurface(true));
return descriptor;
}
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/MaterialUIBlockList.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/MaterialUIBlockList.cs
index 0675e21c9ad..a7df1e24779 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/MaterialUIBlockList.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/MaterialUIBlockList.cs
@@ -61,9 +61,14 @@ public void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
uiBlock.UpdateMaterialProperties(properties);
uiBlock.OnGUI();
}
+ // Never catch ExitGUIException as they are used to handle color picker and object pickers.
+ catch (ExitGUIException)
+ {
+ throw;
+ }
catch (Exception e)
{
- Debug.LogError(e);
+ Debug.LogException(e);
}
}
}
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
index 7b0055c7524..4169bf8f7f3 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
@@ -988,10 +988,6 @@ void RegisterMaterialDebug()
void RefreshDisplayStatsDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelDisplayStats, m_DebugDisplayStatsItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterDisplayStatsDebug();
}
@@ -999,50 +995,30 @@ void RefreshDisplayStatsDebug(DebugUI.Field field, T value)
void RefreshLightingDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelLighting, m_DebugLightingItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterLightingDebug();
}
void RefreshDecalsDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelDecals, m_DebugDecalsAffectingTransparentItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterDecalsDebug();
}
void RefreshRenderingDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelRendering, m_DebugRenderingItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterRenderingDebug();
}
void RefreshMaterialDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelMaterials, m_DebugMaterialItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterMaterialDebug();
}
void RefreshVolumeDebug(DebugUI.Field field, T value)
{
UnregisterDebugItems(k_PanelVolume, m_DebugVolumeItems);
-
- if (DebugManager.instance.displayRuntimeUI)
- DebugManager.instance.ReDrawOnScreenDebug();
-
RegisterVolumeDebug();
}
@@ -1987,7 +1963,7 @@ internal bool DebugNeedsExposure()
debugLighting == DebugLightingMode.DiffuseLighting || debugLighting == DebugLightingMode.SpecularLighting || debugLighting == DebugLightingMode.VisualizeCascade) ||
(data.lightingDebugSettings.overrideAlbedo || data.lightingDebugSettings.overrideNormal || data.lightingDebugSettings.overrideSmoothness || data.lightingDebugSettings.overrideSpecularColor || data.lightingDebugSettings.overrideEmissiveColor || data.lightingDebugSettings.overrideAmbientOcclusion) ||
(debugGBuffer == DebugViewGbuffer.BakeDiffuseLightingWithAlbedoPlusEmissive) || (data.lightingDebugSettings.debugLightFilterMode != DebugLightFilterMode.None) ||
- (data.fullScreenDebugMode == FullScreenDebugMode.PreRefractionColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.FinalColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflections || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflectionsPrev || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflectionsAccum || data.fullScreenDebugMode == FullScreenDebugMode.LightCluster || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceShadows || data.fullScreenDebugMode == FullScreenDebugMode.NanTracker || data.fullScreenDebugMode == FullScreenDebugMode.ColorLog) || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceGlobalIllumination;
+ (data.fullScreenDebugMode == FullScreenDebugMode.PreRefractionColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.FinalColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.TransparentScreenSpaceReflections || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflections || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflectionsPrev || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflectionsAccum || data.fullScreenDebugMode == FullScreenDebugMode.LightCluster || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceShadows || data.fullScreenDebugMode == FullScreenDebugMode.NanTracker || data.fullScreenDebugMode == FullScreenDebugMode.ColorLog) || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceGlobalIllumination;
}
}
}
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs
index e2d75464f8e..3768b404637 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs
@@ -2083,8 +2083,8 @@ private void UpdateDirectionalShadowRequest(HDShadowManager manager, HDShadowSet
HDShadowUtils.ExtractDirectionalLightData(
visibleLight, viewportSize, (uint)requestIndex, shadowSettings.cascadeShadowSplitCount.value,
shadowSettings.cascadeShadowSplits, nearPlaneOffset, cullResults, lightIndex,
- out shadowRequest.view, out invViewProjection, out shadowRequest.deviceProjectionYFlip,
- out shadowRequest.deviceProjection, out shadowRequest.splitData
+ out shadowRequest.view, out invViewProjection, out shadowRequest.projection,
+ out shadowRequest.deviceProjection, out shadowRequest.deviceProjectionYFlip, out shadowRequest.splitData
);
cullingSphere = shadowRequest.splitData.cullingSphere;
@@ -2114,8 +2114,8 @@ internal void UpdateShadowRequestData(HDCamera hdCamera, HDShadowManager manager
HDShadowUtils.ExtractPointLightData(
visibleLight, viewportSize, shadowNearPlane,
normalBias, (uint)shadowIndex, filteringQuality, out shadowRequest.view,
- out invViewProjection, out shadowRequest.deviceProjectionYFlip,
- out shadowRequest.deviceProjection, out shadowRequest.splitData
+ out invViewProjection, out shadowRequest.projection,
+ out shadowRequest.deviceProjection, out shadowRequest.deviceProjectionYFlip, out shadowRequest.splitData
);
break;
case HDLightType.Spot:
@@ -2123,8 +2123,8 @@ internal void UpdateShadowRequestData(HDCamera hdCamera, HDShadowManager manager
HDShadowUtils.ExtractSpotLightData(
spotLightShape, spotAngleForShadows, shadowNearPlane, aspectRatio, shapeWidth,
shapeHeight, visibleLight, viewportSize, normalBias, filteringQuality,
- out shadowRequest.view, out invViewProjection, out shadowRequest.deviceProjectionYFlip,
- out shadowRequest.deviceProjection, out shadowRequest.splitData
+ out shadowRequest.view, out invViewProjection, out shadowRequest.projection,
+ out shadowRequest.deviceProjection, out shadowRequest.deviceProjectionYFlip, out shadowRequest.splitData
);
break;
case HDLightType.Directional:
@@ -2138,7 +2138,7 @@ internal void UpdateShadowRequestData(HDCamera hdCamera, HDShadowManager manager
float offset = GetAreaLightOffsetForShadows(shapeSize, areaLightShadowCone);
Vector3 shadowOffset = offset * visibleLight.GetForward();
HDShadowUtils.ExtractRectangleAreaLightData(visibleLight, visibleLight.GetPosition() + shadowOffset, areaLightShadowCone, shadowNearPlane, shapeSize, viewportSize, normalBias, filteringQuality,
- out shadowRequest.view, out invViewProjection, out shadowRequest.deviceProjectionYFlip, out shadowRequest.deviceProjection, out shadowRequest.splitData);
+ out shadowRequest.view, out invViewProjection, out shadowRequest.projection, out shadowRequest.deviceProjection, out shadowRequest.deviceProjectionYFlip, out shadowRequest.splitData);
break;
case AreaLightShape.Tube:
//Tube do not cast shadow at the moment.
@@ -2307,7 +2307,7 @@ void SetCommonShadowRequestSettings(HDShadowRequest shadowRequest, VisibleLight
}
// shadow clip planes (used for tessellation clipping)
- GeometryUtility.CalculateFrustumPlanes(CoreMatrixUtils.MultiplyProjectionMatrix(shadowRequest.deviceProjectionYFlip, shadowRequest.view, hasOrthoMatrix), m_ShadowFrustumPlanes);
+ GeometryUtility.CalculateFrustumPlanes(CoreMatrixUtils.MultiplyProjectionMatrix(shadowRequest.projection, shadowRequest.view, hasOrthoMatrix), m_ShadowFrustumPlanes);
if (shadowRequest.frustumPlanes?.Length != 6)
shadowRequest.frustumPlanes = new Vector4[6];
// Left, right, top, bottom, near, far.
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/AmbientOcclusion.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/AmbientOcclusion.RenderGraph.cs
index e68e10e97c1..ba120c65e99 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/AmbientOcclusion.RenderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/AmbientOcclusion.RenderGraph.cs
@@ -48,6 +48,7 @@ public TextureHandle Render(RenderGraph renderGraph, HDCamera hdCamera, TextureH
var packedData = RenderAO(renderGraph, aoParameters, depthBuffer, normalBuffer);
result = DenoiseAO(renderGraph, aoParameters, depthBuffer, motionVectors, packedData, currentHistory, outputHistory);
+ result = UpsampleAO(renderGraph, aoParameters, result, depthBuffer);
}
}
}
@@ -109,6 +110,9 @@ TextureHandle DenoiseAO(RenderGraph renderGraph,
TextureHandle currentHistory,
TextureHandle outputHistory)
{
+ if (!parameters.temporalAccumulation && !parameters.fullResolution)
+ return aoPackedData;
+
TextureHandle denoiseOutput;
using (var builder = renderGraph.AddRenderPass("Denoise GTAO", out var passData))
@@ -149,11 +153,8 @@ TextureHandle DenoiseAO(RenderGraph renderGraph,
ctx.cmd);
});
- if (parameters.fullResolution)
- return passData.denoiseOutput;
+ return passData.denoiseOutput;
}
-
- return UpsampleAO(renderGraph, parameters, denoiseOutput, depthTexture);
}
class UpsampleAOPassData
@@ -166,6 +167,9 @@ class UpsampleAOPassData
TextureHandle UpsampleAO(RenderGraph renderGraph, in RenderAOParameters parameters, TextureHandle input, TextureHandle depthTexture)
{
+ if (parameters.fullResolution)
+ return input;
+
using (var builder = renderGraph.AddRenderPass("Upsample GTAO", out var passData, ProfilingSampler.Get(HDProfileId.UpSampleSSAO)))
{
builder.EnableAsyncCompute(parameters.runAsync);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs
index d2bc3ebba5d..b9c7de23480 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs
@@ -91,6 +91,7 @@ class HDShadowRequest
// Use the y flipped device projection matrix as light projection matrix
public Matrix4x4 deviceProjectionYFlip;
public Matrix4x4 deviceProjection;
+ public Matrix4x4 projection;
public Matrix4x4 shadowToWorld;
public Vector3 position;
public Vector4 zBufferParam;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs
index 47176b82d59..0f2771fabc4 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs
@@ -31,17 +31,17 @@ static float GetPunctualFilterWidthInTexels(HDShadowFilteringQuality quality)
}
public static void ExtractPointLightData(VisibleLight visibleLight, Vector2 viewportSize, float nearPlane, float normalBiasMax, uint faceIndex, HDShadowFilteringQuality filteringQuality,
- out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out ShadowSplitData splitData)
+ out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out Matrix4x4 deviceProjectionYFlip, out ShadowSplitData splitData)
{
Vector4 lightDir;
float guardAngle = CalcGuardAnglePerspective(90.0f, viewportSize.x, GetPunctualFilterWidthInTexels(filteringQuality), normalBiasMax, 79.0f);
- ExtractPointLightMatrix(visibleLight, faceIndex, nearPlane, guardAngle, out view, out projection, out deviceProjection, out invViewProjection, out lightDir, out splitData);
+ ExtractPointLightMatrix(visibleLight, faceIndex, nearPlane, guardAngle, out view, out projection, out deviceProjection, out deviceProjectionYFlip, out invViewProjection, out lightDir, out splitData);
}
// TODO: box spot and pyramid spots with non 1 aspect ratios shadow are incorrectly culled, see when scriptable culling will be here
public static void ExtractSpotLightData(SpotLightShape shape, float spotAngle, float nearPlane, float aspectRatio, float shapeWidth, float shapeHeight, VisibleLight visibleLight, Vector2 viewportSize, float normalBiasMax, HDShadowFilteringQuality filteringQuality,
- out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out ShadowSplitData splitData)
+ out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out Matrix4x4 deviceProjectionYFlip, out ShadowSplitData splitData)
{
Vector4 lightDir;
@@ -50,18 +50,19 @@ public static void ExtractSpotLightData(SpotLightShape shape, float spotAngle, f
aspectRatio = 1.0f;
float guardAngle = CalcGuardAnglePerspective(spotAngle, viewportSize.x, GetPunctualFilterWidthInTexels(filteringQuality), normalBiasMax, 180.0f - spotAngle);
- ExtractSpotLightMatrix(visibleLight, spotAngle, nearPlane, guardAngle, aspectRatio, out view, out projection, out deviceProjection, out invViewProjection, out lightDir, out splitData);
+ ExtractSpotLightMatrix(visibleLight, spotAngle, nearPlane, guardAngle, aspectRatio, out view, out projection, out deviceProjection, out deviceProjectionYFlip, out invViewProjection, out lightDir, out splitData);
if (shape == SpotLightShape.Box)
{
projection = ExtractBoxLightProjectionMatrix(visibleLight.range, shapeWidth, shapeHeight, nearPlane);
deviceProjection = GL.GetGPUProjectionMatrix(projection, false);
- projection = GL.GetGPUProjectionMatrix(projection, true);
- InvertOrthographic(ref projection, ref view, out invViewProjection);
+ deviceProjectionYFlip = GL.GetGPUProjectionMatrix(projection, true);
+ InvertOrthographic(ref deviceProjectionYFlip, ref view, out invViewProjection);
}
}
- public static void ExtractDirectionalLightData(VisibleLight visibleLight, Vector2 viewportSize, uint cascadeIndex, int cascadeCount, float[] cascadeRatios, float nearPlaneOffset, CullingResults cullResults, int lightIndex, out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out ShadowSplitData splitData)
+ public static void ExtractDirectionalLightData(VisibleLight visibleLight, Vector2 viewportSize, uint cascadeIndex, int cascadeCount, float[] cascadeRatios, float nearPlaneOffset, CullingResults cullResults, int lightIndex,
+ out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out Matrix4x4 deviceProjectionYFlip, out ShadowSplitData splitData)
{
Vector4 lightDir;
@@ -84,13 +85,13 @@ public static void ExtractDirectionalLightData(VisibleLight visibleLight, Vector
cullResults.ComputeDirectionalShadowMatricesAndCullingPrimitives(lightIndex, (int)cascadeIndex, cascadeCount, ratios, (int)viewportSize.x, nearPlaneOffset, out view, out projection, out splitData);
// and the compound (deviceProjection will potentially inverse-Z)
deviceProjection = GL.GetGPUProjectionMatrix(projection, false);
- projection = GL.GetGPUProjectionMatrix(projection, true);
+ deviceProjectionYFlip = GL.GetGPUProjectionMatrix(projection, true);
InvertOrthographic(ref deviceProjection, ref view, out invViewProjection);
}
// Currently area light shadows are not supported
public static void ExtractRectangleAreaLightData(VisibleLight visibleLight, Vector3 shadowPosition, float areaLightShadowCone, float shadowNearPlane, Vector2 shapeSize, Vector2 viewportSize, float normalBiasMax, HDShadowFilteringQuality filteringQuality,
- out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out ShadowSplitData splitData)
+ out Matrix4x4 view, out Matrix4x4 invViewProjection, out Matrix4x4 projection, out Matrix4x4 deviceProjection, out Matrix4x4 deviceProjectionYFlip, out ShadowSplitData splitData)
{
Vector4 lightDir;
float aspectRatio = shapeSize.x / shapeSize.y;
@@ -98,7 +99,7 @@ public static void ExtractRectangleAreaLightData(VisibleLight visibleLight, Vect
visibleLight.spotAngle = spotAngle;
float guardAngle = CalcGuardAnglePerspective(visibleLight.spotAngle, viewportSize.x, GetPunctualFilterWidthInTexels(filteringQuality), normalBiasMax, 180.0f - visibleLight.spotAngle);
- ExtractSpotLightMatrix(visibleLight, visibleLight.spotAngle, shadowNearPlane, guardAngle, aspectRatio, out view, out projection, out deviceProjection, out invViewProjection, out lightDir, out splitData);
+ ExtractSpotLightMatrix(visibleLight, visibleLight.spotAngle, shadowNearPlane, guardAngle, aspectRatio, out view, out projection, out deviceProjection, out deviceProjectionYFlip, out invViewProjection, out lightDir, out splitData);
}
// Cubemap faces with flipped z coordinate.
@@ -245,7 +246,7 @@ public static Matrix4x4 ExtractBoxLightProjectionMatrix(float range, float width
return Matrix4x4.Ortho(-width / 2, width / 2, -height / 2, height / 2, nearZ, range);
}
- static Matrix4x4 ExtractSpotLightMatrix(VisibleLight vl, float spotAngle, float nearPlane, float guardAngle, float aspectRatio, out Matrix4x4 view, out Matrix4x4 proj, out Matrix4x4 deviceProj, out Matrix4x4 vpinverse, out Vector4 lightDir, out ShadowSplitData splitData)
+ static Matrix4x4 ExtractSpotLightMatrix(VisibleLight vl, float spotAngle, float nearPlane, float guardAngle, float aspectRatio, out Matrix4x4 view, out Matrix4x4 proj, out Matrix4x4 deviceProj, out Matrix4x4 deviceProjYFlip, out Matrix4x4 vpinverse, out Vector4 lightDir, out ShadowSplitData splitData)
{
splitData = new ShadowSplitData();
splitData.cullingSphere.Set(0.0f, 0.0f, 0.0f, float.NegativeInfinity);
@@ -263,12 +264,12 @@ static Matrix4x4 ExtractSpotLightMatrix(VisibleLight vl, float spotAngle, float
proj = ExtractSpotLightProjectionMatrix(vl.range, spotAngle, nearPlane, aspectRatio, guardAngle);
// and the compound (deviceProj will potentially inverse-Z)
deviceProj = GL.GetGPUProjectionMatrix(proj, false);
- proj = GL.GetGPUProjectionMatrix(proj, true);
+ deviceProjYFlip = GL.GetGPUProjectionMatrix(proj, true);
InvertPerspective(ref deviceProj, ref view, out vpinverse);
return CoreMatrixUtils.MultiplyPerspectiveMatrix(deviceProj, view);
}
- static Matrix4x4 ExtractPointLightMatrix(VisibleLight vl, uint faceIdx, float nearPlane, float guardAngle, out Matrix4x4 view, out Matrix4x4 proj, out Matrix4x4 deviceProj, out Matrix4x4 vpinverse, out Vector4 lightDir, out ShadowSplitData splitData)
+ static Matrix4x4 ExtractPointLightMatrix(VisibleLight vl, uint faceIdx, float nearPlane, float guardAngle, out Matrix4x4 view, out Matrix4x4 proj, out Matrix4x4 deviceProj, out Matrix4x4 deviceProjYFlip, out Matrix4x4 vpinverse, out Vector4 lightDir, out ShadowSplitData splitData)
{
if (faceIdx > (uint)CubemapFace.NegativeZ)
Debug.LogError("Tried to extract cubemap face " + faceIdx + ".");
@@ -288,7 +289,7 @@ static Matrix4x4 ExtractPointLightMatrix(VisibleLight vl, uint faceIdx, float ne
proj = Matrix4x4.Perspective(90.0f + guardAngle, 1.0f, nearZ, vl.range);
// and the compound (deviceProj will potentially inverse-Z)
deviceProj = GL.GetGPUProjectionMatrix(proj, false);
- proj = GL.GetGPUProjectionMatrix(proj, true);
+ deviceProjYFlip = GL.GetGPUProjectionMatrix(proj, true);
InvertPerspective(ref deviceProj, ref view, out vpinverse);
Matrix4x4 devProjView = CoreMatrixUtils.MultiplyPerspectiveMatrix(deviceProj, view);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
index 1231d34da2c..4f39b97a5d8 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
@@ -83,6 +83,8 @@ public struct ViewConstants
/// Volumetric history buffer state.
public bool volumetricHistoryIsValid = false;
+ internal int volumetricValidFrames = 0;
+
/// Width actually used for rendering after dynamic resolution and XR is applied.
public int actualWidth { get; private set; }
/// Height actually used for rendering after dynamic resolution and XR is applied.
@@ -129,6 +131,7 @@ public void Reset()
cameraFrameCount = 0;
resetPostProcessingHistory = true;
volumetricHistoryIsValid = false;
+ volumetricValidFrames = 0;
colorPyramidHistoryIsValid = false;
}
@@ -1385,7 +1388,7 @@ Matrix4x4 ComputePixelCoordToWorldSpaceViewDirectionMatrix(ViewConstants viewCon
}
Vector2 lensShift = camera.GetGateFittedLensShift();
- return HDUtils.ComputePixelCoordToWorldSpaceViewDirectionMatrix(verticalFoV, lensShift, resolution, viewConstants.viewMatrix, false, aspect);
+ return HDUtils.ComputePixelCoordToWorldSpaceViewDirectionMatrix(verticalFoV, lensShift, resolution, viewConstants.viewMatrix, false, aspect, camera.orthographic);
}
void Dispose()
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs
index 6430d0dc524..e11be2585eb 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs
@@ -742,8 +742,10 @@ TextureHandle VolumetricLightingPass(RenderGraph renderGraph, HDCamera hdCamera,
FilterVolumetricLighting(data.parameters, data.lightingBuffer, ctx.cmd);
});
- if (parameters.enableReprojection)
+ if (parameters.enableReprojection && hdCamera.volumetricValidFrames > 1)
hdCamera.volumetricHistoryIsValid = true; // For the next frame..
+ else
+ hdCamera.volumetricValidFrames++;
return passData.lightingBuffer;
}
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
index 8a99e2587ab..04d2e0248a6 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
@@ -140,35 +140,49 @@ internal static int GetRuntimeDebugPanelWidth(HDCamera hdCamera)
internal static float ProjectionMatrixAspect(in Matrix4x4 matrix)
=> - matrix.m11 / matrix.m00;
- internal static Matrix4x4 ComputePixelCoordToWorldSpaceViewDirectionMatrix(float verticalFoV, Vector2 lensShift, Vector4 screenSize, Matrix4x4 worldToViewMatrix, bool renderToCubemap, float aspectRatio = -1)
+ internal static Matrix4x4 ComputePixelCoordToWorldSpaceViewDirectionMatrix(float verticalFoV, Vector2 lensShift, Vector4 screenSize, Matrix4x4 worldToViewMatrix, bool renderToCubemap, float aspectRatio = -1, bool isOrthographic = false)
{
- aspectRatio = aspectRatio < 0 ? screenSize.x * screenSize.w : aspectRatio;
+ Matrix4x4 viewSpaceRasterTransform;
- // Compose the view space version first.
- // V = -(X, Y, Z), s.t. Z = 1,
- // X = (2x / resX - 1) * tan(vFoV / 2) * ar = x * [(2 / resX) * tan(vFoV / 2) * ar] + [-tan(vFoV / 2) * ar] = x * [-m00] + [-m20]
- // Y = (2y / resY - 1) * tan(vFoV / 2) = y * [(2 / resY) * tan(vFoV / 2)] + [-tan(vFoV / 2)] = y * [-m11] + [-m21]
+ if (isOrthographic)
+ {
+ // For ortho cameras, project the skybox with no perspective
+ // the same way as builtin does (case 1264647)
+ viewSpaceRasterTransform = new Matrix4x4(
+ new Vector4(-2.0f * screenSize.z, 0.0f, 0.0f, 0.0f),
+ new Vector4(0.0f, -2.0f * screenSize.w, 0.0f, 0.0f),
+ new Vector4(1.0f, 1.0f, -1.0f, 0.0f),
+ new Vector4(0.0f, 0.0f, 0.0f, 0.0f));
+ }
+ else
+ {
+ // Compose the view space version first.
+ // V = -(X, Y, Z), s.t. Z = 1,
+ // X = (2x / resX - 1) * tan(vFoV / 2) * ar = x * [(2 / resX) * tan(vFoV / 2) * ar] + [-tan(vFoV / 2) * ar] = x * [-m00] + [-m20]
+ // Y = (2y / resY - 1) * tan(vFoV / 2) = y * [(2 / resY) * tan(vFoV / 2)] + [-tan(vFoV / 2)] = y * [-m11] + [-m21]
- float tanHalfVertFoV = Mathf.Tan(0.5f * verticalFoV);
+ aspectRatio = aspectRatio < 0 ? screenSize.x * screenSize.w : aspectRatio;
+ float tanHalfVertFoV = Mathf.Tan(0.5f * verticalFoV);
- // Compose the matrix.
- float m21 = (1.0f - 2.0f * lensShift.y) * tanHalfVertFoV;
- float m11 = -2.0f * screenSize.w * tanHalfVertFoV;
+ // Compose the matrix.
+ float m21 = (1.0f - 2.0f * lensShift.y) * tanHalfVertFoV;
+ float m11 = -2.0f * screenSize.w * tanHalfVertFoV;
- float m20 = (1.0f - 2.0f * lensShift.x) * tanHalfVertFoV * aspectRatio;
- float m00 = -2.0f * screenSize.z * tanHalfVertFoV * aspectRatio;
+ float m20 = (1.0f - 2.0f * lensShift.x) * tanHalfVertFoV * aspectRatio;
+ float m00 = -2.0f * screenSize.z * tanHalfVertFoV * aspectRatio;
- if (renderToCubemap)
- {
- // Flip Y.
- m11 = -m11;
- m21 = -m21;
- }
+ if (renderToCubemap)
+ {
+ // Flip Y.
+ m11 = -m11;
+ m21 = -m21;
+ }
- var viewSpaceRasterTransform = new Matrix4x4(new Vector4(m00, 0.0f, 0.0f, 0.0f),
- new Vector4(0.0f, m11, 0.0f, 0.0f),
- new Vector4(m20, m21, -1.0f, 0.0f),
- new Vector4(0.0f, 0.0f, 0.0f, 1.0f));
+ viewSpaceRasterTransform = new Matrix4x4(new Vector4(m00, 0.0f, 0.0f, 0.0f),
+ new Vector4(0.0f, m11, 0.0f, 0.0f),
+ new Vector4(m20, m21, -1.0f, 0.0f),
+ new Vector4(0.0f, 0.0f, 0.0f, 1.0f));
+ }
// Remove the translation component.
var homogeneousZero = new Vector4(0, 0, 0, 1);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs
index 4c4d6929c8c..7a4b5635f94 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs
@@ -51,16 +51,14 @@ public enum CloudResolution
///
public enum CloudShadowsResolution
{
- /// Size 32
- CloudShadowsResolution32 = 32,
/// Size 64
- CloudShadowsResolution64 = 64,
+ VeryLow = 64,
/// Size 128
- CloudShadowsResolution128 = 128,
+ Low = 128,
/// Size 256
- CloudShadowsResolution256 = 256,
+ Medium = 256,
/// Size 512
- CloudShadowsResolution512 = 512,
+ High = 512,
}
@@ -112,7 +110,7 @@ public class CloudLayer : CloudSettings
/// Choose the resolution of the texture for the cloud shadows.
[AdditionalProperty]
[Tooltip("Specifies the resolution of the texture HDRP uses to represent the cloud shadows.")]
- public CloudLayerEnumParameter shadowResolution = new CloudLayerEnumParameter(CloudShadowsResolution.CloudShadowsResolution128);
+ public CloudLayerEnumParameter shadowResolution = new CloudLayerEnumParameter(CloudShadowsResolution.Medium);
///