fixed terrain issue for HDRP

3 年前 · cba6cea1
--- a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity
+++ b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 4890085278179872738, guid: b80def8d0e6014ea1a10b42f06911c6c,
+    type: 2}
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 85886258}
+  - component: {fileID: 117484508}
  - component: {fileID: 85886257}
  m_Layer: 0
  m_Name: Scenario
  m_Script: {fileID: 11500000, guid: d50076aff0af4515b4422166496fdd5e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Profile: {fileID: 0}
-  m_StaticLightingSkyUniqueID: 0
-  m_SkySettings: {fileID: 0}
-  m_SkySettingsFromProfile: {fileID: 0}
+  m_Randomizers: []
+  configuration: {fileID: 0}
+  constants:
+    randomSeed: 539662031
+    totalIterations: 100
+    instanceCount: 1
+    instanceIndex: 0
+    framesPerIteration: 1
+  references:
+    version: 1
 --- !u!4 &117484508
 Transform:
  m_ObjectHideFlags: 0
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &411238276
 GameObject:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &411238280
 MeshFilter:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  yDegreesPerSecond: 180
+--- !u!1 &703243862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 703243865}
+  - component: {fileID: 703243864}
+  - component: {fileID: 703243863}
+  m_Layer: 0
+  m_Name: Terrain
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!154 &703243863
+TerrainCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 703243862}
+  m_Material: {fileID: 0}
+  m_Enabled: 1
+  m_TerrainData: {fileID: 15600000, guid: 4bb44296574a34e65a441df8c0a0e66a, type: 2}
+  m_EnableTreeColliders: 1
+--- !u!218 &703243864
+Terrain:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 703243862}
+  m_Enabled: 1
+  serializedVersion: 6
+  m_TerrainData: {fileID: 15600000, guid: 4bb44296574a34e65a441df8c0a0e66a, type: 2}
+  m_TreeDistance: 5000
+  m_TreeBillboardDistance: 50
+  m_TreeCrossFadeLength: 5
+  m_TreeMaximumFullLODCount: 50
+  m_DetailObjectDistance: 80
+  m_DetailObjectDensity: 1
+  m_HeightmapPixelError: 5
+  m_SplatMapDistance: 1000
+  m_HeightmapMaximumLOD: 0
+  m_ShadowCastingMode: 2
+  m_DrawHeightmap: 1
+  m_DrawInstanced: 0
+  m_DrawTreesAndFoliage: 1
+  m_ReflectionProbeUsage: 1
+  m_MaterialTemplate: {fileID: 2100000, guid: 22ff8771d87ef27429e670136399094b, type: 2}
+  m_BakeLightProbesForTrees: 1
+  m_PreserveTreePrototypeLayers: 0
+  m_DeringLightProbesForTrees: 1
+  m_ScaleInLightmap: 0.0256
+  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+  m_GroupingID: 0
+  m_RenderingLayerMask: 257
+  m_AllowAutoConnect: 1
+--- !u!4 &703243865
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 703243862}
+  m_LocalRotation: {x: -0, y: -0.07853227, z: -0, w: 0.9969116}
+  m_LocalPosition: {x: -604.5, y: 65.1, z: -902.3}
+  m_LocalScale: {x: 0.95858, y: 0.95858, z: 0.95858}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: -9.008, z: 0}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
  m_BounceIntensity: 1
  m_ColorTemperature: 6570
  m_UseColorTemperature: 1
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1e-45}
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: NaN}
+  m_UseViewFrustumForShadowCasterCull: 1
  m_ShadowRadius: 0
  m_ShadowAngle: 0
 --- !u!4 &705507995
  m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Version: 10
+  m_Version: 11
  m_ObsoleteShadowResolutionTier: 1
  m_ObsoleteUseShadowQualitySettings: 0
  m_ObsoleteCustomShadowResolution: 512
  m_EnableSpotReflector: 1
  m_LuxAtDistance: 1
  m_InnerSpotPercent: 0
+  m_SpotIESCutoffPercent: 100
+  m_VolumetricFadeDistance: 10000
  m_AffectDiffuse: 1
  m_AffectSpecular: 1
  m_NonLightmappedOnly: 0
  m_ApplyRangeAttenuation: 1
  m_DisplayAreaLightEmissiveMesh: 0
  m_AreaLightCookie: {fileID: 0}
+  m_IESPoint: {fileID: 0}
+  m_IESSpot: {fileID: 0}
+  m_IncludeForRayTracing: 1
  m_AreaLightShadowCone: 120
  m_UseScreenSpaceShadows: 0
  m_InteractsWithSky: 1
  m_LightShadowRadius: 0.5
  m_SemiTransparentShadow: 0
  m_ColorShadow: 1
+  m_DistanceBasedFiltering: 0
  m_EvsmExponent: 15
  m_EvsmLightLeakBias: 0
  m_EvsmVarianceBias: 0.00001
  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_preserveCachedShadow: 0
  m_ShadowCascadeRatios:
  - 0.05
  - 0.2
  showAdditionalSettings: 0
  m_AreaLightEmissiveMeshShadowCastingMode: 0
  m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
+  m_AreaLightEmissiveMeshLayer: -1
 --- !u!1 &934158981
 GameObject:
  m_ObjectHideFlags: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &934158986
 MeshFilter:
  m_ObjectHideFlags: 0
  dithering: 0
  stopNaNs: 0
  taaSharpenStrength: 0.6
+  TAAQuality: 1
+  taaHistorySharpening: 0.35
+  taaAntiFlicker: 0.5
+  taaMotionVectorRejection: 0
+  taaAntiHistoryRinging: 0
  physicalParameters:
    m_Iso: 200
    m_ShutterSpeed: 0.005
    m_BarrelClipping: 0.25
    m_Anamorphism: 0
  flipYMode: 0
+  xrRendering: 1
  fullscreenPassthrough: 0
  allowDynamicResolution: 0
  customRenderingSettings: 0
    m_Bits: 4294967295
  hasPersistentHistory: 0
+  exposureTarget: {fileID: 0}
  m_RenderingPathCustomFrameSettings:
    bitDatas:
      data1: 72198262773251917
    maximumLODLevel: 0
    maximumLODLevelMode: 0
    maximumLODLevelQualityLevel: 0
+    sssQualityMode: 0
+    sssQualityLevel: 0
+    sssCustomSampleBudget: 20
    materialQuality: 0
  renderingPathCustomFrameSettingsOverrideMask:
    mask:
  m_Script: {fileID: 11500000, guid: 4467405dbcbd3d64ab4363e9ae8bb813, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  m_Labelers:
+  - id: 0
+  - id: 1
+  - id: 2
+  - id: 3
  description: The main camera
  captureRgbImages: 1
  firstCaptureFrame: 0
  framesBetweenCaptures: 0
-  m_Labelers:
-  - id: 0
-  - id: 1
-  - id: 2
-  - id: 3
  showVisualizations: 1
  references:
    version: 1
        objectInfoMetricId: 5ba92024-b3b7-41a7-9d3f-c03a6a8ddd01
        idLabelConfig: {fileID: 11400000, guid: 258de5b48703743468d34fc5bbdfa3aa,
          type: 2}
--- !u!1 &1321518866
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1321518869}
-  - component: {fileID: 1321518868}
-  - component: {fileID: 1321518867}
-  - component: {fileID: 1321518870}
-  m_Layer: 0
-  m_Name: Terrain
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
-  m_IsActive: 1
--- !u!154 &1321518867
-TerrainCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321518866}
-  m_Material: {fileID: 0}
-  m_Enabled: 1
-  m_TerrainData: {fileID: 15600000, guid: 15ded0116bd9f864f80b9813d4f4477f, type: 2}
-  m_EnableTreeColliders: 1
--- !u!218 &1321518868
-Terrain:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321518866}
-  m_Enabled: 1
-  serializedVersion: 6
-  m_TerrainData: {fileID: 15600000, guid: 15ded0116bd9f864f80b9813d4f4477f, type: 2}
-  m_TreeDistance: 5000
-  m_TreeBillboardDistance: 50
-  m_TreeCrossFadeLength: 5
-  m_TreeMaximumFullLODCount: 50
-  m_DetailObjectDistance: 80
-  m_DetailObjectDensity: 1
-  m_HeightmapPixelError: 5
-  m_SplatMapDistance: 1000
-  m_HeightmapMaximumLOD: 0
-  m_ShadowCastingMode: 2
-  m_DrawHeightmap: 1
-  m_DrawInstanced: 0
-  m_DrawTreesAndFoliage: 1
-  m_ReflectionProbeUsage: 1
-  m_MaterialTemplate: {fileID: 2100000, guid: 22ff8771d87ef27429e670136399094b, type: 2}
-  m_BakeLightProbesForTrees: 1
-  m_PreserveTreePrototypeLayers: 0
-  m_DeringLightProbesForTrees: 1
-  m_ScaleInLightmap: 0.0256
-  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
-  m_GroupingID: 0
-  m_RenderingLayerMask: 1
-  m_AllowAutoConnect: 1
--- !u!4 &1321518869
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321518866}
-  m_LocalRotation: {x: -0, y: -0.07853227, z: -0, w: 0.9969116}
-  m_LocalPosition: {x: -604.5, y: 65.1, z: -902.3}
-  m_LocalScale: {x: 0.95858, y: 0.95858, z: 0.95858}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: -9.008, z: 0}
--- !u!114 &1321518870
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321518866}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b33f0bc2b78db642a758f07826d0dd0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  labels:
-  - Terrain
-  useAutoLabeling: 0
-  autoLabelingSchemeType: 
 --- !u!1 &1640252278
 GameObject:
  m_ObjectHideFlags: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &1640252282
 MeshFilter:
  m_ObjectHideFlags: 0
--- a/TestProjects/PerceptionHDRP/UserSettings/EditorUserSettings.asset
+++ b/TestProjects/PerceptionHDRP/UserSettings/EditorUserSettings.asset
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e28061137acf53a31f6fe
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c6f1f05122b2b21382a35633c133af6f9
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2805183df1c43d2bf6e824fdee3531722c0ce6281d
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2805183df1c43d2bf6e824fdee3531722c0ce6281d
+      value: 22424703114646680e0b0227036c6f1f05122b2b21382a35633c133af6f9
      flags: 0
    RecentlyUsedScenePath-3:
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
--- a/TestProjects/PerceptionURP/Assets/Scenes/SampleScene.unity
+++ b/TestProjects/PerceptionURP/Assets/Scenes/SampleScene.unity
  m_Name: 
  m_EditorClassIdentifier: 
  m_Randomizers: []
-  quitOnComplete: 1
-  serializedConstantsFileName: constants
+  configuration: {fileID: 0}
+    randomSeed: 539662031
    totalIterations: 100
    instanceCount: 1
    instanceIndex: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &411238280
 MeshFilter:
  m_ObjectHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4467405dbcbd3d64ab4363e9ae8bb813, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  description: The main camera
-  period: 0.0166
-  startTime: 0
-  captureRgbImages: 1
+  description: The main camera
+  captureRgbImages: 1
+  firstCaptureFrame: 0
+  captureTriggerMode: 0
+  manualSensorAffectSimulationTiming: 0
+  simulationDeltaTime: 0.0166
+  framesBetweenCaptures: 0
  showVisualizations: 1
  references:
    version: 1
--- a/TestProjects/PerceptionURP/Assets/Scenes/SampleSceneSettings.lighting
+++ b/TestProjects/PerceptionURP/Assets/Scenes/SampleSceneSettings.lighting
  m_PrefabAsset: {fileID: 0}
  m_Name: SampleSceneSettings
  serializedVersion: 3
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
  m_EnableBakedLightmaps: 1
  m_EnableRealtimeLightmaps: 1
  m_RealtimeEnvironmentLighting: 1
--- a/TestProjects/PerceptionURP/UserSettings/EditorUserSettings.asset
+++ b/TestProjects/PerceptionURP/UserSettings/EditorUserSettings.asset
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2805183df1c43d2bf6e824fdee3531722c0ce6281d
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c6f1f05122b2b21382a35633c133af6f9
-      value: 22424703114646680e0b0227036c6f1f05122b2b21382a35633c133af6f9
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
--- a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleSceneSettings.lighting
+++ b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleSceneSettings.lighting
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SampleSceneSettings
+  serializedVersion: 3
+  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_PVRMinBounces: 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
--- a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleSceneSettings.lighting.meta
+++ b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleSceneSettings.lighting.meta
+fileFormatVersion: 2
+guid: b80def8d0e6014ea1a10b42f06911c6c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: