Merge branch 'update-graphics-1.2'

Author: BrianWill-Unity

GraphicsSamples/HDRPSamples/.gitignore

@@ -26,7 +26,6 @@
 obj.meta
 .vs/
 build/*
-TwoStickShooter/Pure/Library/AnnotationManager
 *.pyc
 
 #generated by performance framework

GraphicsSamples/HDRPSamples/.multitool

@@ -46,7 +46,7 @@ MonoBehaviour:
   m_UIInfos: {fileID: 114340500867371532}
   m_ParameterInfo: []
   m_ImportDependencies: []
-  m_GraphVersion: 11
+  m_GraphVersion: 12
   m_ResourceVersion: 1
   m_SubgraphDependencies: []
   m_CategoryPath: 
@@ -460,7 +460,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_UIIgnoredErrors: []
-  m_Parent: {fileID: 114350483966674976}
+  m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
   m_UICollapsed: 1
@@ -993,7 +993,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_UIIgnoredErrors: []
-  m_Parent: {fileID: 114350483966674976}
+  m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
   m_UICollapsed: 1
@@ -1033,17 +1033,18 @@ MonoBehaviour:
   m_OutputFlowSlot:
   - link: []
   blendMode: 3
+  cullMode: 0
+  zWriteMode: 0
+  zTestMode: 0
   useAlphaClipping: 0
   generateMotionVector: 0
   excludeFromTAA: 0
   sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614605}
-  cullMode: 0
-  zWriteMode: 0
-  zTestMode: 0
   colorMapping: 0
   uvMode: 0
+  flipbookLayout: 0
   useSoftParticle: 0
   vfxSystemSortPriority: 0
   sort: 0
@@ -1054,7 +1055,6 @@ MonoBehaviour:
   frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
-  flipbookLayout: 0
   needsOwnSort: 0
   shaderGraph: {fileID: 0}
   materialSettings:
@@ -1073,7 +1073,12 @@ MonoBehaviour:
   doubleSided: 0
   preserveSpecularLighting: 0
   enableSpecular: 1
-  smokeEmissiveMode: 0
+  lightmapRemapMode: 0
+  lightmapRemapRanges: 0
+  useAlphaRemap: 0
+  emissiveMode: 0
+  useEmissiveChannelScale: 0
+  useColorAbsorption: 1
   receiveShadows: 1
   enableCookie: 1
   enableEnvLight: 1

GraphicsSamples/HDRPSamples/.vsconfig

@@ -93,7 +93,7 @@ protected override void OnUpdate()
             // Override the material color of the deformation materials
             foreach (var rendererEntity in additionalEntities.AsNativeArray())
             {
-                if (EntityManager.HasComponent<RenderMesh>(rendererEntity.Value))
+                if (EntityManager.HasComponent<RenderMeshUnmanaged>(rendererEntity.Value))
                 {
                     ecb.AddComponent(rendererEntity.Value, new HDRPMaterialPropertyBaseColor { Value = deformColor.Value });
                 }

GraphicsSamples/HDRPSamples/Assets/SampleScenes/3. Hybrid Components/TriggerParticles/SceneAssets/ImpactCubes_VFX.vfx

@@ -1,13 +1,11 @@
 {
-  "disableProjectUpdate": true,
   "dependencies": {
-    "com.unity.coding": "0.1.0-preview.24",
-    "com.unity.entities.graphics": "1.0.10",
+    "com.unity.entities.graphics": "1.2.3",
     "com.unity.ext.nunit": "2.0.3",
-    "com.unity.ide.rider": "3.0.22",
-    "com.unity.ide.visualstudio": "2.0.18",
-    "com.unity.render-pipelines.high-definition": "14.0.7",
-    "com.unity.timeline": "1.7.1",
+    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.render-pipelines.high-definition": "14.0.11",
+    "com.unity.timeline": "1.7.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
@@ -40,6 +38,5 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  },
-  "enableLockFile": false
+  }
 }

GraphicsSamples/HDRPSamples/Assets/SampleScenes/5. Deformation/CommonAssets/Scripts/SimpleAnimationSystem/Hybrid/SimpleAnimationBakingSystem.cs

@@ -6,105 +6,66 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/CommonAssets/Base.unity
+    path: Assets/SampleScenes/0. Base/Base.unity
     guid: c05a49aaa15fd4753ba02ed9c36efd26
   - enabled: 1
-    path: Assets/SampleScenes/RenderMeshUtilityExample/AddComponentsExample.unity
-    guid: cc7a16adfd7754cdabcbb8094f36e409
-  - enabled: 1
-    path: Assets/SampleScenes/AmbientAndBlendProbes/AmbientAndBlendProbes.unity
+    path: Assets/SampleScenes/1. Lighting/AmbientAndBlendProbes/AmbientAndBlendProbes.unity
     guid: c96ec6c590cbe004697bc0e5a8da2a23
   - enabled: 1
-    path: Assets/SampleScenes/Benchmark/Benchmark.unity
-    guid: 8249cb48e5da63241b280faa15067577
-  - enabled: 1
-    path: Assets/SampleScenes/BuiltinProperties/BuiltinProperties.unity
-    guid: 91e6f83f2ef325942a9bda99b9791a26
-  - enabled: 1
-    path: Assets/SampleScenes/DisabledEntities/DisabledEntities.unity
-    guid: 0d42fec96863c8641ad13402217d4a52
-  - enabled: 1
-    path: Assets/SampleScenes/ShadergraphProperties/ShaderGraphProperties.unity
-    guid: fb61bee47c7ebd24490c934b3c20e07d
+    path: Assets/SampleScenes/1. Lighting/Lightmaps/Lightmaps.unity
+    guid: 71dae98101bb3a94e963b9e63998dcc8
   - enabled: 1
-    path: Assets/SampleScenes/MeshDeformations/MeshDeformations.unity
-    guid: cebdbb653ba903446b04fb776a6d0cc1
+    path: Assets/SampleScenes/1. Lighting/Lightprobes/Lightprobes.unity
+    guid: 91aff1ffd2741584da6453f59b3b33a3
   - enabled: 1
-    path: Assets/SampleScenes/MaterialOverridesSample/MaterialOverridesSample.unity
-    guid: f2263964646c0084eb91f387233a3d2b
+    path: Assets/SampleScenes/2. MaterialProperties/BuiltInMaterialSHProperties/BuiltInMaterialSHProperties.unity
+    guid: 91e6f83f2ef325942a9bda99b9791a26
   - enabled: 1
-    path: Assets/SampleScenes/HDRPLitProperties/HDRPLitProperties.unity
+    path: Assets/SampleScenes/2. MaterialProperties/HDRPLitProperties/HDRPLitProperties.unity
     guid: a2cac163dced9ff449791e3f3d7d9786
   - enabled: 1
-    path: Assets/SampleScenes/HDRPShaders/HDRPShaders.unity
+    path: Assets/SampleScenes/2. MaterialProperties/HDRPShaders/HDRPShaders.unity
     guid: 87b610885718a824ca486ef0ab428ef2
   - enabled: 1
-    path: Assets/SampleScenes/HybridEntitiesConversion/HybridEntitiesConversion.unity
-    guid: 548edb55914bbb741bb3d7eba5f9c041
-  - enabled: 1
-    path: Assets/SampleScenes/SkinnedCharacter/SkinnedCharacter.unity
-    guid: cdcad41096f0ea140959c574590b1327
+    path: Assets/SampleScenes/2. MaterialProperties/MaterialOverridesSample/MaterialOverridesSample.unity
+    guid: f2263964646c0084eb91f387233a3d2b
   - enabled: 1
-    path: Assets/SampleScenes/Submesh/Submesh.unity
-    guid: bf476c9e35512fe4abfa98d42c3f8c94
+    path: Assets/SampleScenes/2. MaterialProperties/ShadergraphProperties/ShaderGraphProperties.unity
+    guid: fb61bee47c7ebd24490c934b3c20e07d
   - enabled: 1
-    path: Assets/SampleScenes/TransparencyOrdering/TransparencyOrdering.unity
-    guid: bf20dff90b072a847b7205b01db9a272
+    path: Assets/SampleScenes/3. Hybrid Components/HybridEntitiesConversion/HybridEntitiesConversion.unity
+    guid: 548edb55914bbb741bb3d7eba5f9c041
   - enabled: 1
-    path: Assets/SampleScenes/TriggerParticles/TriggerParticles.unity
+    path: Assets/SampleScenes/3. Hybrid Components/TriggerParticles/TriggerParticles.unity
     guid: b79a5cb2b822716499b67183b5b6673c
   - enabled: 1
-    path: Assets/SampleScenes/Lightmaps/Lightmaps.unity
-    guid: 71dae98101bb3a94e963b9e63998dcc8
-  - enabled: 1
-    path: Assets/SampleScenes/Lightprobes/Lightprobes.unity
-    guid: 91aff1ffd2741584da6453f59b3b33a3
-  - enabled: 1
-    path: Assets/SampleScenes/LODs/LODs.unity
-    guid: 2e2857f0448a4584db8a173b9711d18d
-  - enabled: 1
-    path: Assets/SampleScenes/LODsStatic/LODsStatic.unity
-    guid: 0f2badf9c7af9554fb14970fb936acd8
-  - enabled: 1
-    path: Assets/SampleScenes/MaterialMeshChange/MaterialMeshChange.unity
-    guid: b56226e0e52319442a1b1287933d2010
-  - enabled: 1
-    path: Assets/SampleScenes/MatrixPrevious/MatrixPrevious.unity
-    guid: 8ee73dd4cf8cf8840be0e22af3a3fd26
-  - enabled: 1
-    path: Assets/SampleScenes/NegativeScale/NegativeScale.unity
-    guid: 2db6bc194a94076478b12bc2cbb6d2ad
-  - enabled: 1
-    path: Assets/SampleScenes/EntityCreationAPI/EntityCreationAPI.unity
+    path: Assets/SampleScenes/4. API Examples/EntityCreation/EntityCreation.unity
     guid: 494ca42abdc621849ab405eca1c8e43c
   - enabled: 1
-    path: Assets/SampleScenes/GlobalIndirectSpecular/GlobalIndirectSpecular.unity
-    guid: 92f34e4b0efff5e4e847a4823c19f81c
-  - enabled: 1
-    path: Assets/Tests/GraphicsTest/LayerParams/LayerParams.unity
-    guid: ccc6574d127601342bc2c74c39694b04
+    path: Assets/SampleScenes/4. API Examples/MaterialMeshChange/MaterialMeshChange.unity
+    guid: b56226e0e52319442a1b1287933d2010
   - enabled: 1
-    path: Assets/Tests/GraphicsTest/DuplicateProperties/DuplicateProperties.unity
-    guid: 00c0785ee6fc77e408a9e64af713877f
+    path: Assets/SampleScenes/4. API Examples/RenderMeshUtilityExample/RenderMeshUtilityExample.unity
+    guid: cc7a16adfd7754cdabcbb8094f36e409
   - enabled: 1
-    path: Assets/Tests/GraphicsTest/FarAwayFromOrigin/FarAwayFromOrigin.unity
-    guid: be33bfd947e7f4743af7dbab5c4992dc
+    path: Assets/SampleScenes/5. Deformation/MeshDeformations/MeshDeformations.unity
+    guid: cebdbb653ba903446b04fb776a6d0cc1
   - enabled: 1
-    path: Assets/Tests/GraphicsTest/BakedLightFullyBaked/BakedLightFullyBaked.unity
-    guid: 0606f529676c202439da78ecbce9cf77
+    path: Assets/SampleScenes/5. Deformation/SkinnedCharacter/SkinnedCharacter.unity
+    guid: cdcad41096f0ea140959c574590b1327
   - enabled: 1
-    path: Assets/StressTestScenes/BigBatches/StressTestHybrid.unity
-    guid: 91c6bd0eb9c10634a9e19714d1bf7e20
+    path: Assets/SampleScenes/6. Misc/DisabledEntities/DisabledEntities.unity
+    guid: 0d42fec96863c8641ad13402217d4a52
   - enabled: 1
-    path: Assets/StressTestScenes/BigBatches/StressTestHybridLODs.unity
-    guid: 41c015bb34a67dc4083a5618a947791b
+    path: Assets/SampleScenes/6. Misc/LODs/LODs.unity
+    guid: 2e2857f0448a4584db8a173b9711d18d
   - enabled: 1
-    path: Assets/StressTestScenes/BigBatches/StressTestHybridWithDisabledRendering.unity
-    guid: ad050540b81b3be488c9c3f3b13871e7
+    path: Assets/SampleScenes/6. Misc/MatrixPrevious/MatrixPrevious.unity
+    guid: 8ee73dd4cf8cf8840be0e22af3a3fd26
   - enabled: 1
-    path: Assets/StressTestScenes/BatchingBenchmark/BatchingBenchmark.unity
-    guid: 28040c8581794f14fa6217f915862acc
+    path: Assets/SampleScenes/6. Misc/Submesh/Submesh.unity
+    guid: bf476c9e35512fe4abfa98d42c3f8c94
   - enabled: 1
-    path: Assets/Tests/GraphicsTest/GraphicsTest_001/GraphicsTest_001.unity
-    guid: 7ce3382c6711a3645b60276558dbc257
+    path: Assets/SampleScenes/6. Misc/TransparencyOrdering/TransparencyOrdering.unity
+    guid: bf20dff90b072a847b7205b01db9a272
   m_configObjects: {}

GraphicsSamples/HDRPSamples/Packages/manifest.json

@@ -31,6 +31,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -834
-    m_OriginalInstanceId: -836
+    m_UserModificationsInstanceId: -830
+    m_OriginalInstanceId: -832
   m_LoadAssets: 0