Re-enable auto bake of lightmaps

Reduce texel density in 2601_ColorTemp test
7 年前 · 0d8490bc
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 0.5
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 0
-  m_LightingDataAsset: {fileID: 112000078, guid: e53c22e6000d3534f8ec90372eb92686,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass.unity.meta
 fileFormatVersion: 2
 guid: 8747b43f8bcf2b44cbc3ece373da65a9
-labels:
- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 0.5
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 1
-  m_LightingDataAsset: {fileID: 112000016, guid: 10022f4aa0d773842b686156e2b35246,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission.unity.meta
 fileFormatVersion: 2
 guid: b8f49ca9a12abb4468116e9422139e63
-labels:
- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_BakeMixed.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 2
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 0
-  m_LightingDataAsset: {fileID: 112000024, guid: 69dfd70e8803cd341bd2ad557215bad1,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity
 LightmapSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
  m_LightmapEditorSettings:
    serializedVersion: 10
    m_Resolution: 2
-    m_BakeResolution: 40
+    m_BakeResolution: 20
    m_AtlasSize: 1024
    m_AO: 0
    m_AOMaxDistance: 1
    m_PVRFilteringAtrousPositionSigmaIndirect: 2
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ShowResolutionOverlay: 1
-  m_LightingDataAsset: {fileID: 112000004, guid: fcaf9eccbaa13734a915b4a09ad3ff8f,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 31
+  m_RootOrder: 32
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &116114150
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 37
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &216308120
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 27
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &257057735
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 38
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &259199003
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 29
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &267472392
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 23
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &318928070
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &498933441
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 30
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &533832108
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 32
+  m_RootOrder: 33
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &558086321
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &560421919
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &587617193
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &621608806
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &661728039
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &844482178
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &887527257
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &916887742
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &960753678
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &965611802
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &986121663
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!114 &986121666
 MonoBehaviour:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 41
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1081699464
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1207281478
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 33
+  m_RootOrder: 34
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1224049267
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1244967709
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1248841136
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1322909810
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1348755772
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1355112477
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 42
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1370971663
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1378617740
 GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!4 &1378617741
 Transform:
  m_GameObject: {fileID: 1378617740}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 1, z: 10}
+  m_LocalPosition: {x: 5, y: 0, z: -5.5}
+  m_LocalScale: {x: 3, y: 3, z: 3}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 40
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1508209860
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1537588142
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 35
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1541755983
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1001 &1750108495
 Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 2}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7,
        type: 2}
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 25
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &1953243359
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 39
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &2006468835
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 31
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &2044384723
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 26
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &2073809735
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
 --- !u!1 &2084815366
 GameObject:
  m_LocalScale: {x: 10, y: 10, z: 10}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
+--- !u!1 &2108040534
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2108040538}
+  - component: {fileID: 2108040537}
+  - component: {fileID: 2108040536}
+  - component: {fileID: 2108040535}
+  m_Layer: 0
+  m_Name: Plane (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!64 &2108040535
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2108040534}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &2108040536
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2108040534}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  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_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
+--- !u!33 &2108040537
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2108040534}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &2108040538
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2108040534}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 35, y: 0, z: -5.5}
+  m_LocalScale: {x: 3, y: 3, z: 3}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity.meta
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_ColorTemp.unity.meta
 fileFormatVersion: 2
 guid: 34a3a4a7a56d3014dad3114e6b523742
-labels:
- DoLightmap
 DefaultImporter:
  externalObjects: {}
  userData: