diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity index 0a899493caa..dd9d966835b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity @@ -7677,7 +7677,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering.unity index 3f8fdbe0108..b50dd9361aa 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering.unity @@ -3928,7 +3928,7 @@ MonoBehaviour: aspectRatio: 1 shapeRadius: 0 maxSmoothness: 1 - applyRangeAttenuation: 1 + applyRangeAttenuation: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 @@ -4658,7 +4658,7 @@ MonoBehaviour: aspectRatio: 1 shapeRadius: 0 maxSmoothness: 1 - applyRangeAttenuation: 1 + applyRangeAttenuation: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric.unity index ef053361d8a..934a5db5585 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric.unity @@ -1082,7 +1082,7 @@ MonoBehaviour: aspectRatio: 0.4 shapeRadius: 0 maxSmoothness: 1 - applyRangeAttenuation: 1 + applyRangeAttenuation: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2002_Light_DynamicMix.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2002_Light_DynamicMix.unity index f42b4912e69..0669ff028df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2002_Light_DynamicMix.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2002_Light_DynamicMix.unity @@ -38,24 +38,23 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.36615336, g: 0.38474482, b: 0.42534754, a: 1} + m_IndirectSpecularColor: {r: 0.30957052, g: 0.3253681, b: 0.35991505, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -63,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,9 +94,11 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 563410596} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -110,9 +118,127 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &87360114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 87360115} + - component: {fileID: 87360118} + - component: {fileID: 87360117} + - component: {fileID: 87360116} + m_Layer: 0 + m_Name: New Text (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &87360115 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87360114} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.6, y: 1.09, z: 3} + m_LocalScale: {x: 0.41697517, y: 0.41697517, z: 0.41697517} + m_Children: [] + m_Father: {fileID: 574762494} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &87360116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87360114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1843972f86a70ad4f9ac115809638244, type: 3} + m_Name: + m_EditorClassIdentifier: + pixelSize: 8 + testSettings: {fileID: 1900725528} + targetCamera: {fileID: 1900725527} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 + textMesh: {fileID: 87360117} +--- !u!102 &87360117 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87360114} + m_Text: 'Spot - Box + + No attenuation' + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1.3 + m_Anchor: 7 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 0 + m_Font: {fileID: 12800000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!23 &87360118 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87360114} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1001 &183745593 PrefabInstance: m_ObjectHideFlags: 0 @@ -172,9 +298,16 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} --- !u!4 &183745594 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, + type: 3} m_PrefabInstance: {fileID: 183745593} m_PrefabAsset: {fileID: 0} +--- !u!4 &327226539 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, + type: 3} + m_PrefabInstance: {fileID: 429631461} + m_PrefabAsset: {fileID: 0} --- !u!1001 &333183857 PrefabInstance: m_ObjectHideFlags: 0 @@ -182,6 +315,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1192666584} m_Modifications: + - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_Name + value: Cube (2) + objectReference: {fileID: 0} - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} propertyPath: m_LocalPosition.x value: 0.03999996 @@ -230,17 +367,75 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -39.959003 objectReference: {fileID: 0} - - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} - propertyPath: m_Name - value: Cube (2) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} --- !u!4 &333183858 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, + type: 3} m_PrefabInstance: {fileID: 333183857} m_PrefabAsset: {fileID: 0} +--- !u!1001 &429631461 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2142451069} + m_Modifications: + - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_Name + value: Cube (2) + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalPosition.x + value: 0.03999996 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalPosition.y + value: 1.817 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalPosition.z + value: -0.99 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalRotation.y + value: -0.34168717 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalRotation.w + value: 0.93981373 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -39.959003 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} --- !u!1 &467207848 GameObject: m_ObjectHideFlags: 0 @@ -288,6 +483,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -299,6 +496,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -311,6 +509,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &467207851 MeshFilter: m_ObjectHideFlags: 0 @@ -344,7 +543,6 @@ GameObject: - component: {fileID: 487878713} - component: {fileID: 487878716} - component: {fileID: 487878715} - - component: {fileID: 487878714} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -366,92 +564,117 @@ Transform: m_Father: {fileID: 1169686270} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 45, z: 0} ---- !u!114 &487878714 +--- !u!114 &487878715 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 487878712} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 10 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 1 + m_AreaLightShape: 0 + m_Intensity: 600 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 50 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 4 - shadowPrecision: 0 - shadowData: - format: 4 - data: 0bd7a33b0000803f - shadowDatas: - - format: 4 - data: 0bd7a33b0000803f ---- !u!114 &487878715 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487878712} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 50 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 1 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 4 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 - displayLightIntensity: 600 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 --- !u!108 &487878716 Light: m_ObjectHideFlags: 0 @@ -460,12 +683,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 487878712} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 47.746483 m_Range: 30 m_SpotAngle: 40 + m_InnerSpotAngle: 29.320492 m_CookieSize: 10 m_Shadows: m_Type: 1 @@ -475,6 +700,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.1 m_NearPlane: 2.16 + m_CullingMatrixOverride: + e00: 2.7474773 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 2.7474773 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1.0066667 + e23: -0.20066667 + e30: 0 + e31: 0 + e32: 1 + e33: 0 + m_UseCullingMatrixOverride: 1 m_Cookie: {fileID: 2800000, guid: 45f0819bab75a8b47b8c90e4c8a34999, type: 3} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -482,12 +725,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 30} + m_UseBoundingSphereOverride: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &517278656 @@ -497,6 +743,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100000, guid: 35676372ff25f7942a8cfe7ddf9c7878, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 35676372ff25f7942a8cfe7ddf9c7878, type: 3} propertyPath: m_LocalPosition.x value: -0 @@ -533,12 +783,69 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} - - target: {fileID: 100000, guid: 35676372ff25f7942a8cfe7ddf9c7878, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35676372ff25f7942a8cfe7ddf9c7878, type: 3} +--- !u!850595691 &563410596 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + serializedVersion: 2 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 --- !u!1 &574762493 GameObject: m_ObjectHideFlags: 0 @@ -570,9 +877,214 @@ Transform: - {fileID: 1074616646} - {fileID: 1890834151} - {fileID: 626316075} + - {fileID: 87360115} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &576870512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576870513} + - component: {fileID: 576870515} + - component: {fileID: 576870514} + m_Layer: 0 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &576870513 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576870512} + m_LocalRotation: {x: 0.20677853, y: -0.18417637, z: -0.07893372, w: 0.95764875} + m_LocalPosition: {x: 0.99, y: 2.6, z: -2.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 845179403} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 21.529, y: -24.475, z: -14.146} +--- !u!114 &576870514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576870512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 10 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 + m_Intensity: 600 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 50 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 3.5 + m_ShapeHeight: 3.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 0 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 4 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + showAdditionalSettings: 5 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 +--- !u!108 &576870515 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576870512} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 47.746483 + m_Range: 30 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.1 + m_NearPlane: 2.16 + m_CullingMatrixOverride: + e00: 0.5714286 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0.5714286 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0.066889636 + e23: -1.006689 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 1 + m_Cookie: {fileID: 2800000, guid: 45f0819bab75a8b47b8c90e4c8a34999, type: 3} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 15, w: 15.202796} + m_UseBoundingSphereOverride: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1001 &607344269 PrefabInstance: m_ObjectHideFlags: 0 @@ -580,6 +1092,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1902903443} m_Modifications: + - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_Name + value: Cube (3) + objectReference: {fileID: 0} - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} propertyPath: m_LocalPosition.x value: 0.427 @@ -628,15 +1144,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 49.138 objectReference: {fileID: 0} - - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} - propertyPath: m_Name - value: Cube (3) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} --- !u!4 &607344270 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, + type: 3} m_PrefabInstance: {fileID: 607344269} m_PrefabAsset: {fileID: 0} --- !u!1 &626316074 @@ -708,6 +1221,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -719,6 +1234,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -731,6 +1247,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &626316078 MonoBehaviour: m_ObjectHideFlags: 0 @@ -745,9 +1262,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 1900725528} - camera: {fileID: 1900725527} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 626316076} - pixelPerfect: 0 --- !u!1 &673842478 GameObject: m_ObjectHideFlags: 0 @@ -820,6 +1338,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2109923720} m_Modifications: + - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + propertyPath: m_Name + value: Cube (1) + objectReference: {fileID: 0} - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} propertyPath: m_LocalPosition.x value: 0.15299988 @@ -866,17 +1388,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -32.272003 - objectReference: {fileID: 0} - - target: {fileID: 1752614318191108, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} - propertyPath: m_Name - value: Cube (1) + value: -32.272003 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} --- !u!4 &809663471 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, type: 3} + m_CorrespondingSourceObject: {fileID: 4729046375724384, guid: 48a8bf1cfd4090647aa6cdcd4cddfc23, + type: 3} m_PrefabInstance: {fileID: 809663470} m_PrefabAsset: {fileID: 0} --- !u!1 &835557360 @@ -926,6 +1445,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -937,6 +1458,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -949,6 +1471,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &835557363 MeshFilter: m_ObjectHideFlags: 0 @@ -971,6 +1494,37 @@ Transform: m_Father: {fileID: 2109923720} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &845179402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 845179403} + m_Layer: 0 + m_Name: GameObject (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &845179403 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845179402} + m_LocalRotation: {x: -0.23911758, y: -0.3696438, z: -0.099045746, w: 0.89239913} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 576870513} + m_Father: {fileID: 2142451069} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -30, y: -45, z: 0} --- !u!1 &956017064 GameObject: m_ObjectHideFlags: 0 @@ -1049,6 +1603,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1060,6 +1616,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1072,6 +1629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1028431634 MeshFilter: m_ObjectHideFlags: 0 @@ -1163,6 +1721,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1174,6 +1734,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1186,6 +1747,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1074616649 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1200,9 +1762,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 1900725528} - camera: {fileID: 1900725527} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1074616647} - pixelPerfect: 0 --- !u!1 &1083378958 GameObject: m_ObjectHideFlags: 0 @@ -1214,7 +1777,6 @@ GameObject: - component: {fileID: 1083378959} - component: {fileID: 1083378962} - component: {fileID: 1083378961} - - component: {fileID: 1083378960} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1236,92 +1798,117 @@ Transform: m_Father: {fileID: 673842479} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 45, z: 0} ---- !u!114 &1083378960 +--- !u!114 &1083378961 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1083378958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 2.25 - viewBiasMax: 10 - viewBiasScale: 8 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 10 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 + m_Intensity: 600 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 50 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 3.5 + m_ShapeHeight: 3.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 4 - shadowPrecision: 0 - shadowData: - format: 4 - data: 0bd7a33b0000803f - shadowDatas: - - format: 4 - data: 0bd7a33b0000803f ---- !u!114 &1083378961 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083378958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 50 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 2 - shapeWidth: 3.5 - shapeHeight: 3.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 4 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 - displayLightIntensity: 600 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 + showAdditionalSettings: 5 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 --- !u!108 &1083378962 Light: m_ObjectHideFlags: 0 @@ -1330,12 +1917,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1083378958} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 47.746483 m_Range: 30 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 1 @@ -1345,6 +1934,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.1 m_NearPlane: 2.16 + m_CullingMatrixOverride: + e00: 0.5714286 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 0.5714286 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 0.066889636 + e23: -1.006689 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 1 m_Cookie: {fileID: 2800000, guid: 45f0819bab75a8b47b8c90e4c8a34999, type: 3} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1352,12 +1959,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 15, w: 15.202796} + m_UseBoundingSphereOverride: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1169686269 @@ -1436,7 +2046,6 @@ GameObject: - component: {fileID: 1302673723} - component: {fileID: 1302673722} - component: {fileID: 1302673721} - - component: {fileID: 1302673720} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -1444,7 +2053,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1302673720 +--- !u!114 &1302673721 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} @@ -1453,83 +2062,108 @@ MonoBehaviour: m_GameObject: {fileID: 1302673719} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 10 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 600 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 4 - shadowPrecision: 0 - shadowData: - format: 4 - data: 0bd7a33b0000803f - shadowDatas: - - format: 4 - data: 0bd7a33b0000803f ---- !u!114 &1302673721 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1302673719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 0 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 4 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 - displayLightIntensity: 600 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 --- !u!108 &1302673722 Light: m_ObjectHideFlags: 0 @@ -1538,12 +2172,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302673719} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 2 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 47.746483 m_Range: 5 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 1 @@ -1553,6 +2189,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 8900000, guid: bcd1d60980af623478368e9455ea5689, type: 3} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1560,12 +2214,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1302673723 @@ -1582,6 +2239,102 @@ Transform: m_Father: {fileID: 1902903443} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1375846046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1375846047} + - component: {fileID: 1375846050} + - component: {fileID: 1375846049} + - component: {fileID: 1375846048} + m_Layer: 0 + m_Name: Capsule (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1375846047 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375846046} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2142451069} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1375846048 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375846046} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1375846049 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375846046} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1375846050 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375846046} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1498382498 GameObject: m_ObjectHideFlags: 0 @@ -1629,6 +2382,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1640,6 +2395,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1652,6 +2408,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1498382501 MeshFilter: m_ObjectHideFlags: 0 @@ -1776,6 +2533,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1787,6 +2546,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1799,6 +2559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1556403013 MeshFilter: m_ObjectHideFlags: 0 @@ -1818,7 +2579,6 @@ GameObject: - component: {fileID: 1637281120} - component: {fileID: 1637281123} - component: {fileID: 1637281122} - - component: {fileID: 1637281121} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1840,7 +2600,7 @@ Transform: m_Father: {fileID: 956017065} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 45, z: 0} ---- !u!114 &1637281121 +--- !u!114 &1637281122 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} @@ -1849,83 +2609,108 @@ MonoBehaviour: m_GameObject: {fileID: 1637281119} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 10 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 600 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 50 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 4 - shadowPrecision: 0 - shadowData: - format: 4 - data: 0bd7a33b0000803f - shadowDatas: - - format: 4 - data: 0bd7a33b0000803f ---- !u!114 &1637281122 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637281119} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 50 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 4 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 - displayLightIntensity: 600 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 --- !u!108 &1637281123 Light: m_ObjectHideFlags: 0 @@ -1934,12 +2719,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637281119} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 47.746483 m_Range: 30 m_SpotAngle: 40 + m_InnerSpotAngle: 29.320492 m_CookieSize: 10 m_Shadows: m_Type: 1 @@ -1949,6 +2736,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.1 m_NearPlane: 2.16 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 2800000, guid: 45f0819bab75a8b47b8c90e4c8a34999, type: 3} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1956,12 +2761,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1660772714 @@ -2025,6 +2833,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2036,6 +2846,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2048,6 +2859,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1660772718 MeshFilter: m_ObjectHideFlags: 0 @@ -2056,6 +2868,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1660772714} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1732980389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1732980390} + - component: {fileID: 1732980393} + - component: {fileID: 1732980392} + - component: {fileID: 1732980391} + m_Layer: 0 + m_Name: Capsule (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1732980390 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732980389} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.86000013, y: 1, z: -0.72} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2142451069} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1732980391 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732980389} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1732980392 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732980389} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2505e1d9c7a8c654487d6a2dcae04242, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1732980393 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732980389} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1753161993 GameObject: m_ObjectHideFlags: 0 @@ -2117,6 +3025,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2128,6 +3038,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2140,6 +3051,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1753161997 MeshFilter: m_ObjectHideFlags: 0 @@ -2195,6 +3107,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2206,6 +3120,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2218,6 +3133,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1837398468 MeshFilter: m_ObjectHideFlags: 0 @@ -2309,6 +3225,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2320,6 +3238,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2332,6 +3251,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1890834154 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2346,9 +3266,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 1900725528} - camera: {fileID: 1900725527} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1890834152} - pixelPerfect: 0 --- !u!1001 &1900725526 PrefabInstance: m_ObjectHideFlags: 0 @@ -2388,40 +3309,58 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: far clip plane value: 50 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: m_ClearFlags value: 2 objectReference: {fileID: 0} - - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: width value: 853 objectReference: {fileID: 0} - - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: height value: 480 objectReference: {fileID: 0} - - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: width value: 853 objectReference: {fileID: 0} - - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} propertyPath: height value: 480 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!20 &1900725527 stripped Camera: - m_CorrespondingSourceObject: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + m_CorrespondingSourceObject: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} m_PrefabInstance: {fileID: 1900725526} m_PrefabAsset: {fileID: 0} --- !u!114 &1900725528 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + m_CorrespondingSourceObject: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} m_PrefabInstance: {fileID: 1900725526} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -2534,6 +3473,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2545,6 +3486,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2557,6 +3499,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1930668416 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2571,9 +3514,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 1900725528} - camera: {fileID: 1900725527} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1930668414} - pixelPerfect: 0 --- !u!1 &2109923719 GameObject: m_ObjectHideFlags: 0 @@ -2669,6 +3613,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2680,6 +3626,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2692,6 +3639,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2138720847 MeshFilter: m_ObjectHideFlags: 0 @@ -2700,3 +3648,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2138720843} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2142451068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2142451069} + m_Layer: 0 + m_Name: Spot_Box_No_Attenuation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2142451069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142451068} + m_LocalRotation: {x: -0, y: 0.7231106, z: -0, w: 0.69073224} + m_LocalPosition: {x: 6.88, y: 2.61, z: 3.19} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1375846047} + - {fileID: 845179403} + - {fileID: 1732980390} + - {fileID: 327226539} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 92.624, z: 0} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2313_Shadow_Mask_Spotlight_Shapes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2313_Shadow_Mask_Spotlight_Shapes.unity index 226cf167867..910ea6977e2 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2313_Shadow_Mask_Spotlight_Shapes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2313_Shadow_Mask_Spotlight_Shapes.unity @@ -614,7 +614,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 1 m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 @@ -3784,7 +3784,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 1 m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity index 4084a3eba02..32b374d9d61 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity @@ -5909,7 +5909,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/LightScriptCreator.cs b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/LightScriptCreator.cs index c9bf9ef982c..85e4ac311a3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/LightScriptCreator.cs +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/LightScriptCreator.cs @@ -45,6 +45,7 @@ void Start() { case 0: // Spot Box hdLight.SetLightTypeAndShape(HDLightTypeAndShape.BoxSpot); + hdLight.applyRangeAttenuation = false; break; case 1: // Spot Pyramid hdLight.SetLightTypeAndShape(HDLightTypeAndShape.PyramidSpot); diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity index d50b9cf38da..d3a23be3c72 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity @@ -2871,7 +2871,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity index bd7e18f3a17..bd63f5f084e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity @@ -4932,7 +4932,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity index 16de542d234..0c143444d60 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity @@ -18642,7 +18642,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity index 81aa46a1352..5747be64a64 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity @@ -1712,7 +1712,7 @@ MonoBehaviour: m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 + m_ApplyRangeAttenuation: 0 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} m_AreaLightShadowCone: 120 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2002_Light_DynamicMix.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2002_Light_DynamicMix.png index a7d5f0fce51..79a13bdc8d2 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2002_Light_DynamicMix.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2002_Light_DynamicMix.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:306e45b96fb48846ed1b0a3ab0518e63102f3d3940621d34c8563e745ae08080 -size 101428 +oid sha256:485d2ae08d83b09f9d4221142d63bba53824cb00eeba136623acfddb1622b146 +size 98439 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2002_Light_DynamicMix.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2002_Light_DynamicMix.png index e2a312c25fb..79a13bdc8d2 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2002_Light_DynamicMix.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2002_Light_DynamicMix.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b1811054b28a801aa169c984bf1c502a3ab77bd3693a452793906936b039ee0 -size 88230 +oid sha256:485d2ae08d83b09f9d4221142d63bba53824cb00eeba136623acfddb1622b146 +size 98439 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2002_Light_DynamicMix.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2002_Light_DynamicMix.png index 638370615d9..79a13bdc8d2 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2002_Light_DynamicMix.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2002_Light_DynamicMix.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16dfa5ac5b7fa7d4e0b2a4cc1c3415fb5f5dda0708873b5873480d0c11326de9 -size 101637 +oid sha256:485d2ae08d83b09f9d4221142d63bba53824cb00eeba136623acfddb1622b146 +size 98439 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/2002_Dynamic_Mix.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/2002_Dynamic_Mix.png index 32eb9941606..79a13bdc8d2 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/2002_Dynamic_Mix.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/2002_Dynamic_Mix.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f55f4e303868c758d1118fbfc00c98361df23d7b7d73baa499bec58103eceaf -size 90610 +oid sha256:485d2ae08d83b09f9d4221142d63bba53824cb00eeba136623acfddb1622b146 +size 98439 diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 42b5171d939..b306b24fd44 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -111,6 +111,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added the HDRP Compositor Tool (in Preview). - Added a ray tracing mode option in the HDRP asset that allows to override and shader stripping. - Added support for arbitrary resolution scaling of Volumetric Lighting to the Fog volume component. +- Added range attenuation for box-shaped spotlights. ### Fixed - Fix when rescale probe all direction below zero (1219246) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Light-Component.md b/com.unity.render-pipelines.high-definition/Documentation~/Light-Component.md index fd537c504a4..ea857ebb349 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Light-Component.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Light-Component.md @@ -77,7 +77,7 @@ These settings define the area this Light affects. Each Light **Type** has its o | **Property** | **Description** | | ------------------- | ------------------------------------------------------------ | -| **Shape** | HDRP Spot Lights can use three shapes.
• **Cone** : Projects light from a single point at the GameObject’s position, out to a circular base, like a cone. Alter the radius of the circular base by changing the **Outer Angle** and the **Range**.
• **Pyramid** : Projects light from a single point at the GameObject’s position onto a base that is a square with its side length equal to the diameter of the **Cone**.
• **Box** : Projects light evenly across a rectangular area defined by a horizontal and vertical size. | +| **Shape** | HDRP Spot Lights can use three shapes.
• **Cone** : Projects light from a single point at the GameObject’s position, out to a circular base, like a cone. Alter the radius of the circular base by changing the **Outer Angle** and the **Range**.
• **Pyramid** : Projects light from a single point at the GameObject’s position onto a base that is a square with its side length equal to the diameter of the **Cone**.
• **Box** : Projects light evenly across a rectangular area defined by a horizontal and vertical size. This light has no attenuation unless **Range Attenuation** is checked. | | **Outer Angle** | The angle in degrees at the base of a Spot Light’s cone. This property is only for Lights with a **Cone Shape**. | | **Inner Angle (%)** | Determines where the attenuation between the inner cone and the outer cone starts. Higher values cause the light at the edges of the Spot Light to fade out. Lower values stop the light from fading at the edges. This property is only for Lights with a **Cone Shape**. | | **Spot Angle** | The angle in degrees used to determine the size of a Spot Light using a **Pyramid** shape. | 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 e0630e53319..0a4fa915637 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs @@ -787,14 +787,12 @@ static void DrawEmissionAdvancedContent(SerializedHDLight serialized, Editor own EditorGUILayout.PropertyField(serialized.affectSpecular, s_Styles.affectSpecular); if (lightType != HDLightType.Directional) { - if (serialized.spotLightShape.GetEnumValue() != SpotLightShape.Box) - EditorGUILayout.PropertyField(serialized.applyRangeAttenuation, s_Styles.applyRangeAttenuation); + EditorGUILayout.PropertyField(serialized.applyRangeAttenuation, s_Styles.applyRangeAttenuation); EditorGUILayout.PropertyField(serialized.fadeDistance, s_Styles.fadeDistance); } EditorGUILayout.PropertyField(serialized.lightDimmer, s_Styles.lightDimmer); } - else if (lightType == HDLightType.Point - || lightType == HDLightType.Spot && serialized.spotLightShape.GetEnumValue() != SpotLightShape.Box) + else if (lightType == HDLightType.Point || lightType == HDLightType.Spot) EditorGUILayout.PropertyField(serialized.applyRangeAttenuation, s_Styles.applyRangeAttenuation); // Emissive mesh for area light only (and not supported on Disc currently) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl index 51237056a5b..e509922b0d0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl @@ -302,42 +302,7 @@ DirectionalShadowType EvaluateShadow_Directional(LightLoopContext lightLoopConte // Punctual Light evaluation helper //----------------------------------------------------------------------------- -// distances = {d, d^2, 1/d, d_proj} -void ModifyDistancesForFillLighting(inout float4 distances, float lightSqRadius) -{ - // Apply the sphere light hack to soften the core of the punctual light. - // It is not physically plausible (using max() is more correct, but looks worse). - // See https://www.desmos.com/calculator/otqhxunqhl - // We only modify 1/d for performance reasons. - float sqDist = distances.y; - distances.z = rsqrt(sqDist + lightSqRadius); // Recompute 1/d -} - -// Returns the normalized light vector L and the distances = {d, d^2, 1/d, d_proj}. -void GetPunctualLightVectors(float3 positionWS, LightData light, out float3 L, out float4 distances) -{ - float3 lightToSample = positionWS - light.positionRWS; - - distances.w = dot(lightToSample, light.forward); - - if (light.lightType == GPULIGHTTYPE_PROJECTOR_BOX) - { - L = -light.forward; - distances.xyz = 1; // No distance or angle attenuation - } - else - { - float3 unL = -lightToSample; - float distSq = dot(unL, unL); - float distRcp = rsqrt(distSq); - float dist = distSq * distRcp; - - L = unL * distRcp; - distances.xyz = float3(dist, distSq, distRcp); - - ModifyDistancesForFillLighting(distances, light.size.x); - } -} +#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/PunctualLightCommon.hlsl" float4 EvaluateCookie_Punctual(LightLoopContext lightLoopContext, LightData light, float3 lightToSample) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index 9ed251c3ca0..a81ef06827e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -1338,11 +1338,9 @@ internal void GetLightData(CommandBuffer cmd, HDCamera hdCamera, HDShadowSetting lightData.positionRWS = visibleLightAxisAndPosition.Position; - bool applyRangeAttenuation = additionalLightData.applyRangeAttenuation && (gpuLightType != GPULightType.ProjectorBox); - lightData.range = light.range; - if (applyRangeAttenuation) + if (additionalLightData.applyRangeAttenuation) { lightData.rangeAttenuationScale = 1.0f / (light.range * light.range); lightData.rangeAttenuationBias = 1.0f; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/PunctualLightCommon.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/PunctualLightCommon.hlsl index f8b161f99a6..6a580a85cb4 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/PunctualLightCommon.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/PunctualLightCommon.hlsl @@ -26,7 +26,17 @@ void GetPunctualLightVectors(float3 positionWS, LightData light, out float3 L, o if (light.lightType == GPULIGHTTYPE_PROJECTOR_BOX) { L = -light.forward; - distances.xyz = 1; // No distance or angle attenuation + + if (light.rangeAttenuationBias == 1.0) // Light uses range attenuation + { + float dist = -dot(lightToSample, L); + float distSq = dist * dist; + float distRcp = rcp(dist); + distances.xyz = float3(dist, distSq, distRcp); + ModifyDistancesForFillLighting(distances, light.size.x); + } + else // Light is directionnal + distances.xyz = 1; // No distance or angle attenuation } else {