updating to Unity 2020.2 and Entities 0.16

tbg10101 · Oct 30, 2020 · 5dd39a9 · 5dd39a9
1 parent 0d29eea
commit 5dd39a9
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 91 deletions.
diff --git a/Examples~/Hybrid Simulation Test Project/Assets/Materials/Test.mat b/Examples~/Hybrid Simulation Test Project/Assets/Materials/Test.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 2
+  version: 3
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1

diff --git a/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset b/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset
@@ -13,13 +13,18 @@ MonoBehaviour:
   m_Name: URP Renderer
   m_EditorClassIdentifier: 
   m_RendererFeatures: []
+  m_RendererFeatureMap: 
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
     screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
     samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    tileDepthInfoPS: {fileID: 4800000, guid: f451c6bec16aa51408bdfd37f70aed12, type: 3}
+    tileDeferredPS: {fileID: 4800000, guid: 344787727e03649488a1022c09fa74b5, type: 3}
+    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
     fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
   m_OpaqueLayerMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -34,3 +39,5 @@ MonoBehaviour:
     failOperation: 0
     zFailOperation: 0
   m_ShadowTransparentReceive: 1
+  m_RenderingMode: 0
+  m_AccurateGbufferNormals: 0
diff --git a/Examples~/Hybrid Simulation Test Project/Packages/manifest.json b/Examples~/Hybrid Simulation Test Project/Packages/manifest.json
@@ -1,9 +1,8 @@
 {
   "dependencies": {
     "com.10101software.dots.hybridsimulation": "file:../../..",
-    "com.unity.entities": "0.11.0-preview.7",
-    "com.unity.ide.rider": "1.2.1",
-    "com.unity.render-pipelines.universal": "8.2.0",
+    "com.unity.ide.rider": "2.0.7",
+    "com.unity.render-pipelines.universal": "10.1.0",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",

diff --git a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json
@@ -5,43 +5,44 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.entities": "0.14.0-preview.19"
+        "com.unity.entities": "0.16.0-preview.21"
       }
     },
     "com.unity.burst": {
-      "version": "1.3.2",
+      "version": "1.3.7",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.1.0"
+        "com.unity.mathematics": "1.2.1"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.collections": {
-      "version": "0.12.0-preview.13",
+      "version": "0.14.0-preview.16",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework.performance": "2.3.1-preview",
-        "com.unity.burst": "1.3.2"
+        "com.unity.burst": "1.3.7"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.entities": {
-      "version": "0.14.0-preview.19",
+      "version": "0.16.0-preview.21",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.3.2",
-        "com.unity.collections": "0.12.0-preview.13",
-        "com.unity.properties": "1.3.1-preview",
-        "com.unity.mathematics": "1.1.0",
+        "com.unity.burst": "1.3.7",
+        "com.unity.properties": "1.5.0-preview",
+        "com.unity.serialization": "1.5.0-preview",
+        "com.unity.collections": "0.14.0-preview.16",
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.test-framework.performance": "2.3.1-preview",
-        "com.unity.serialization": "1.3.1-preview",
         "com.unity.nuget.mono-cecil": "0.1.6-preview.2",
-        "com.unity.jobs": "0.5.0-preview.14",
+        "com.unity.jobs": "0.7.0-preview.17",
         "com.unity.scriptablebuildpipeline": "1.9.0",
-        "com.unity.platforms": "0.7.0-preview.8"
+        "com.unity.platforms": "0.9.0-preview.9"
       },
       "url": "https://packages.unity.com"
     },
@@ -53,7 +54,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.2.1",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -62,18 +63,18 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.jobs": {
-      "version": "0.5.0-preview.14",
+      "version": "0.7.0-preview.17",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.collections": "0.12.0-preview.13",
-        "com.unity.mathematics": "1.1.0"
+        "com.unity.collections": "0.14.0-preview.16",
+        "com.unity.mathematics": "1.2.1"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.1.0",
-      "depth": 1,
+      "version": "1.2.1",
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
@@ -89,46 +90,46 @@
     },
     "com.unity.nuget.newtonsoft-json": {
       "version": "2.0.0-preview",
-      "depth": 2,
+      "depth": 3,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.platforms": {
-      "version": "0.7.0-preview.8",
+      "version": "0.9.0-preview.9",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.properties": "1.3.1-preview",
-        "com.unity.properties.ui": "1.3.1-preview",
+        "com.unity.properties": "1.5.0-preview",
+        "com.unity.properties.ui": "1.5.0-preview",
         "com.unity.scriptablebuildpipeline": "1.6.4-preview",
-        "com.unity.searcher": "4.0.9",
-        "com.unity.serialization": "1.3.1-preview"
+        "com.unity.serialization": "1.5.0-preview"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.properties": {
-      "version": "1.3.1-preview",
+      "version": "1.5.0-preview",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "nuget.mono-cecil": "0.1.5-preview",
+        "com.unity.nuget.mono-cecil": "0.1.6-preview.2",
         "com.unity.test-framework.performance": "2.0.8-preview"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.properties.ui": {
-      "version": "1.3.1-preview",
+      "version": "1.5.0-preview",
       "depth": 3,
       "source": "registry",
       "dependencies": {
-        "com.unity.properties": "1.3.1-preview",
-        "com.unity.serialization": "1.3.1-preview"
+        "com.unity.properties": "1.5.0-preview",
+        "com.unity.serialization": "1.5.0-preview",
+        "com.unity.modules.uielements": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "8.2.0",
+      "version": "10.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -137,12 +138,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.universal": {
-      "version": "8.2.0",
+      "version": "10.1.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.render-pipelines.core": "8.2.0",
-        "com.unity.shadergraph": "8.2.0"
+        "com.unity.mathematics": "1.1.0",
+        "com.unity.render-pipelines.core": "10.1.0",
+        "com.unity.shadergraph": "10.1.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -154,37 +156,37 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.searcher": {
-      "version": "4.0.9",
+      "version": "4.3.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.serialization": {
-      "version": "1.3.1-preview",
+      "version": "1.5.0-preview",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.collections": "0.8.0-preview.5",
         "com.unity.burst": "1.3.0-preview.12",
         "com.unity.jobs": "0.2.9-preview.15",
-        "com.unity.properties": "1.3.1-preview",
+        "com.unity.properties": "1.4.3-preview",
         "com.unity.test-framework.performance": "2.0.8-preview"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "8.2.0",
+      "version": "10.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.render-pipelines.core": "8.2.0",
-        "com.unity.searcher": "4.0.9"
+        "com.unity.render-pipelines.core": "10.1.0",
+        "com.unity.searcher": "4.3.1"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.16",
+      "version": "1.1.18",
       "depth": 1,
       "source": "registry",
       "dependencies": {