From 457f1d1e1d92f4b3b2289cc8e2446fce84093d54 Mon Sep 17 00:00:00 2001 From: Tristan Bellman-Greenwood Date: Sat, 6 Feb 2021 01:03:26 -0500 Subject: [PATCH] updating to the latest versions of Unity and the Entities package --- .../Packages/packages-lock.json | 56 +++++++++---------- .../ProjectSettings/ProjectVersion.txt | 4 +- Runtime/Scripts/Utils/DotsUtil.cs | 3 +- package.json | 4 +- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json index d35dc4f..6de730b 100644 --- a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json +++ b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json @@ -5,11 +5,11 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.entities": "0.16.0-preview.21" + "com.unity.entities": "0.17.0-preview.41" } }, "com.unity.burst": { - "version": "1.3.7", + "version": "1.4.1", "depth": 2, "source": "registry", "dependencies": { @@ -18,31 +18,31 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "0.14.0-preview.16", + "version": "0.15.0-preview.21", "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework.performance": "2.3.1-preview", - "com.unity.burst": "1.3.7" + "com.unity.burst": "1.4.1" }, "url": "https://packages.unity.com" }, "com.unity.entities": { - "version": "0.16.0-preview.21", + "version": "0.17.0-preview.41", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.3.7", + "com.unity.burst": "1.4.1", "com.unity.properties": "1.5.0-preview", "com.unity.serialization": "1.5.0-preview", - "com.unity.collections": "0.14.0-preview.16", + "com.unity.collections": "0.15.0-preview.21", "com.unity.mathematics": "1.2.1", "com.unity.modules.assetbundle": "1.0.0", "com.unity.test-framework.performance": "2.3.1-preview", "com.unity.nuget.mono-cecil": "0.1.6-preview.2", - "com.unity.jobs": "0.7.0-preview.17", + "com.unity.jobs": "0.8.0-preview.23", "com.unity.scriptablebuildpipeline": "1.9.0", - "com.unity.platforms": "0.9.0-preview.9" + "com.unity.platforms": "0.10.0-preview.10" }, "url": "https://packages.unity.com" }, @@ -70,11 +70,11 @@ "url": "https://packages.unity.com" }, "com.unity.jobs": { - "version": "0.7.0-preview.17", + "version": "0.8.0-preview.23", "depth": 2, "source": "registry", "dependencies": { - "com.unity.collections": "0.14.0-preview.16", + "com.unity.collections": "0.15.0-preview.21", "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" @@ -103,34 +103,34 @@ "url": "https://packages.unity.com" }, "com.unity.platforms": { - "version": "0.9.0-preview.9", + "version": "0.10.0-preview.10", "depth": 2, "source": "registry", "dependencies": { - "com.unity.properties": "1.5.0-preview", - "com.unity.properties.ui": "1.5.0-preview", + "com.unity.properties": "1.6.0-preview", + "com.unity.properties.ui": "1.6.2-preview.1", "com.unity.scriptablebuildpipeline": "1.6.4-preview", - "com.unity.serialization": "1.5.0-preview" + "com.unity.serialization": "1.6.2-preview" }, "url": "https://packages.unity.com" }, "com.unity.properties": { - "version": "1.5.0-preview", - "depth": 2, + "version": "1.6.0-preview", + "depth": 3, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "0.1.6-preview.2", - "com.unity.test-framework.performance": "2.0.8-preview" + "com.unity.test-framework.performance": "2.3.1-preview" }, "url": "https://packages.unity.com" }, "com.unity.properties.ui": { - "version": "1.5.0-preview", + "version": "1.6.2-preview.1", "depth": 3, "source": "registry", "dependencies": { - "com.unity.properties": "1.5.0-preview", - "com.unity.serialization": "1.5.0-preview", + "com.unity.properties": "1.6.0-preview", + "com.unity.serialization": "1.6.1-preview", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" @@ -170,15 +170,15 @@ "url": "https://packages.unity.com" }, "com.unity.serialization": { - "version": "1.5.0-preview", - "depth": 2, + "version": "1.6.2-preview", + "depth": 3, "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.4.3-preview", - "com.unity.test-framework.performance": "2.0.8-preview" + "com.unity.collections": "0.12.0-preview.13", + "com.unity.burst": "1.3.5", + "com.unity.jobs": "0.5.0-preview.14", + "com.unity.properties": "1.6.0-preview", + "com.unity.test-framework.performance": "2.3.1-preview" }, "url": "https://packages.unity.com" }, diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt index 39ae3a3..4fbcff7 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.2f1 -m_EditorVersionWithRevision: 2020.2.2f1 (068178b99f32) +m_EditorVersion: 2020.2.3f1 +m_EditorVersionWithRevision: 2020.2.3f1 (8ff31bc5bf5b) \ No newline at end of file diff --git a/Runtime/Scripts/Utils/DotsUtil.cs b/Runtime/Scripts/Utils/DotsUtil.cs index a6cf4d0..482e12f 100644 --- a/Runtime/Scripts/Utils/DotsUtil.cs +++ b/Runtime/Scripts/Utils/DotsUtil.cs @@ -9,8 +9,7 @@ public static class DotsUtil { public static void Reset() { World.DisposeAllWorlds(); - WordStorage.Instance.Dispose(); - WordStorage.Instance = null; + WordStorage.Clear(); PlayerLoopUtil.ResetPlayerLoop(); diff --git a/package.json b/package.json index 1837fed..db3ae4b 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "com.10101software.dots.hybridsimulation", "description": "A framework for using FixedUpdate in a simulation world which is linked to a GameObject-based presentation layer.", - "version": "0.7.5", + "version": "0.7.6", "unity": "2020.2", "displayName": "DOTS Hybrid Simulation Worlds", "dependencies": { - "com.unity.entities": "0.16.0-preview.21" + "com.unity.entities": "0.17.0-preview.41" }, "repository": { "type": "git",