rebasing onto master

3 年前 · 9f09e6cd
--- a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity
+++ b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 11
  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: 280278c4790e89b428686b2f2d0b966a,
-    type: 2}
+  m_UseShadowmask: 1
 --- !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_Script: {fileID: 11500000, guid: d50076aff0af4515b4422166496fdd5e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Randomizers: []
-  configuration: {fileID: 0}
-  constants:
-    randomSeed: 539662031
-    totalIterations: 100
-    instanceCount: 1
-    instanceIndex: 0
-    framesPerIteration: 1
-  references:
-    version: 1
--- !u!4 &85886258
+  m_Profile: {fileID: 0}
+  m_StaticLightingSkyUniqueID: 0
+  m_SkySettings: {fileID: 0}
+  m_SkySettingsFromProfile: {fileID: 0}
+--- !u!4 &117484508
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
+  - {fileID: 2100000, guid: ddfd18df3e5ef3043b7889c5a070d8ca, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &411238280
 MeshFilter:
  m_ObjectHideFlags: 0
  m_UseColorTemperature: 1
  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1e-45}
  m_UseBoundingSphereOverride: 0
-  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: 11
+  m_Version: 10
  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
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 934158981}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 107.21, y: 72.77, z: -144.12}
+  m_LocalPosition: {x: 107.21, y: 73.4, z: -144.12}
  m_LocalScale: {x: 15, y: 15, z: 15}
  m_Children: []
  m_Father: {fileID: 0}
  m_GameObject: {fileID: 963194225}
  m_LocalRotation: {x: -0.22882307, y: 0.124303445, z: -0.029468497, w: -0.96504945}
  m_LocalPosition: {x: 116.52855, y: 91.11087, z: -194.85445}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 36.249973, y: 36.249973, z: 36.249973}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 4
  SMAAQuality: 2
  dithering: 0
  stopNaNs: 0
-  taaSharpenStrength: 0.5
-  TAAQuality: 1
-  taaHistorySharpening: 0.35
-  taaAntiFlicker: 0.5
-  taaMotionVectorRejection: 0
-  taaAntiHistoryRinging: 0
+  taaSharpenStrength: 0.6
  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 &1217036683
+--- !u!1 &1321518866
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_Component:
-  - component: {fileID: 1217036686}
-  - component: {fileID: 1217036685}
-  - component: {fileID: 1217036684}
+  - component: {fileID: 1321518869}
+  - component: {fileID: 1321518868}
+  - component: {fileID: 1321518867}
+  - component: {fileID: 1321518870}
  m_Layer: 0
  m_Name: Terrain
  m_TagString: Untagged
  m_IsActive: 1
--- !u!154 &1217036684
+--- !u!154 &1321518867
-  m_GameObject: {fileID: 1217036683}
+  m_GameObject: {fileID: 1321518866}
-  m_TerrainData: {fileID: 15600000, guid: 4bb44296574a34e65a441df8c0a0e66a, type: 2}
+  m_TerrainData: {fileID: 15600000, guid: 15ded0116bd9f864f80b9813d4f4477f, type: 2}
--- !u!218 &1217036685
+--- !u!218 &1321518868
-  m_GameObject: {fileID: 1217036683}
+  m_GameObject: {fileID: 1321518866}
-  m_TerrainData: {fileID: 15600000, guid: 4bb44296574a34e65a441df8c0a0e66a, type: 2}
+  m_TerrainData: {fileID: 15600000, guid: 15ded0116bd9f864f80b9813d4f4477f, type: 2}
  m_TreeDistance: 5000
  m_TreeBillboardDistance: 50
  m_TreeCrossFadeLength: 5
  m_ScaleInLightmap: 0.0256
  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
  m_GroupingID: 0
-  m_RenderingLayerMask: 257
+  m_RenderingLayerMask: 1
--- !u!4 &1217036686
+--- !u!4 &1321518869
-  m_GameObject: {fileID: 1217036683}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -385, y: 64.6, z: -673}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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/PerceptionURP/Assets/Scenes/SampleScene.unity
+++ b/TestProjects/PerceptionURP/Assets/Scenes/SampleScene.unity
  m_Script: {fileID: 11500000, guid: d50076aff0af4515b4422166496fdd5e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Randomizers:
-  - id: 0
-  configuration: {fileID: 0}
+  m_Randomizers: []
+  quitOnComplete: 1
+  serializedConstantsFileName: constants
-    randomSeed: 539662031
    totalIterations: 100
    instanceCount: 1
    instanceIndex: 0
-    00000000:
-      type: {class: ForegroundObjectPlacementRandomizer, ns: UnityEngine.Perception.Randomization.Randomizers.SampleRandomizers,
-        asm: Unity.Perception.Runtime}
-      data:
-        m_Enabled: 1
-        collapsed: 0
-        depth: 0
-        separationDistance: 2
-        placementArea: {x: 10, y: 10}
-        prefabs:
-          collapsed: 0
-          probabilities:
-          - 1
-          uniform: 1
-          m_Sampler:
-            id: 1
-          m_Categories:
-          - {fileID: 4885438799896782722, guid: 15f5240909c302347a9d146de3bbb903, type: 3}
-    00000001:
-      type: {class: UniformSampler, ns: UnityEngine.Perception.Randomization.Samplers,
-        asm: Unity.Perception.Runtime}
-      data:
-        range:
-          minimum: 0
-          maximum: 1
 --- !u!4 &85886258
 Transform:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &324708166
+--- !u!1 &411238276
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_Component:
-  - component: {fileID: 324708172}
-  - component: {fileID: 324708171}
-  - component: {fileID: 324708170}
-  - component: {fileID: 324708169}
-  - component: {fileID: 324708168}
-  - component: {fileID: 324708167}
+  - component: {fileID: 411238281}
+  - component: {fileID: 411238280}
+  - component: {fileID: 411238279}
+  - component: {fileID: 411238278}
+  - component: {fileID: 411238277}
+  - component: {fileID: 411238282}
  m_Layer: 0
  m_Name: Crate
  m_TagString: Untagged
  m_IsActive: 1
--- !u!114 &324708167
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 324708166}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 673a227032a8e4940b9828c5b6f852ab, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  yDegreesPerSecond: 180
--- !u!114 &324708168
+--- !u!114 &411238277
-  m_GameObject: {fileID: 324708166}
+  m_GameObject: {fileID: 411238276}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 8b33f0bc2b78db642a758f07826d0dd0, type: 3}
  - Crate
  useAutoLabeling: 0
  autoLabelingSchemeType: 
--- !u!65 &324708169
+--- !u!65 &411238278
-  m_GameObject: {fileID: 324708166}
+  m_GameObject: {fileID: 411238276}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
--- !u!23 &324708170
+--- !u!23 &411238279
-  m_GameObject: {fileID: 324708166}
+  m_GameObject: {fileID: 411238276}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 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 &324708171
+--- !u!33 &411238280
-  m_GameObject: {fileID: 324708166}
+  m_GameObject: {fileID: 411238276}
--- !u!4 &324708172
+--- !u!4 &411238281
-  m_GameObject: {fileID: 324708166}
+  m_GameObject: {fileID: 411238276}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 121.42, y: 72.4, z: -161.73}
  m_LocalScale: {x: 15, y: 15, z: 15}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &411238282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 411238276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 673a227032a8e4940b9828c5b6f852ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  yDegreesPerSecond: 180
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 963194225}
-  m_LocalRotation: {x: 0.22882287, y: -0.124299996, z: 0.029464606, w: 0.96505}
-  m_LocalPosition: {x: 116.5285, y: 91.11087, z: -194.8544}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.22882307, y: 0.124303445, z: -0.029468497, w: -0.96504945}
+  m_LocalPosition: {x: 116.52855, y: 91.11087, z: -194.85445}
+  m_LocalScale: {x: 36.249973, y: 36.249973, z: 36.249973}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 4
  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