From 577efe6dcd8b786e87d3c6c2fe9f552767af8c2a Mon Sep 17 00:00:00 2001 From: Tristan Bellman-Greenwood Date: Sat, 28 Nov 2020 14:43:51 -0500 Subject: [PATCH] making the removal flag component public --- .../Assets/Materials/Test.mat | 2 +- .../Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 12 ++++++------ .../BurstAotSettings_StandaloneWindows.json | 4 ++-- .../ProjectSettings/ProjectVersion.txt | 4 ++-- .../ProjectSettings/URPProjectSettings.asset | 2 +- Runtime/Scripts/Data/DestroyFlagComponentData.cs | 2 +- package.json | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Examples~/Hybrid Simulation Test Project/Assets/Materials/Test.mat b/Examples~/Hybrid Simulation Test Project/Assets/Materials/Test.mat index 0b36669..f5ffb19 100644 --- 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: 3 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/Examples~/Hybrid Simulation Test Project/Packages/manifest.json b/Examples~/Hybrid Simulation Test Project/Packages/manifest.json index d6459c8..1ca9668 100644 --- a/Examples~/Hybrid Simulation Test Project/Packages/manifest.json +++ b/Examples~/Hybrid Simulation Test Project/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.10101software.dots.hybridsimulation": "file:../../..", "com.unity.ide.rider": "2.0.7", - "com.unity.render-pipelines.universal": "10.1.0", + "com.unity.render-pipelines.universal": "10.2.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 index 247252e..e90e6c9 100644 --- a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json +++ b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json @@ -129,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.1.0", + "version": "10.2.0", "depth": 1, "source": "registry", "dependencies": { @@ -138,13 +138,13 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.universal": { - "version": "10.1.0", + "version": "10.2.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.1.0", - "com.unity.shadergraph": "10.1.0" + "com.unity.render-pipelines.core": "10.2.0", + "com.unity.shadergraph": "10.2.0" }, "url": "https://packages.unity.com" }, @@ -176,11 +176,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.1.0", + "version": "10.2.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "10.1.0", + "com.unity.render-pipelines.core": "10.2.0", "com.unity.searcher": "4.3.1" }, "url": "https://packages.unity.com" diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/Examples~/Hybrid Simulation Test Project/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 2144f6d..fe76bef 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -10,7 +10,7 @@ "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, - "CpuTargetsX32": 6, - "CpuTargetsX64": 72 + "CpuTargetsX32": -1, + "CpuTargetsX64": -1 } } diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt index ccec535..28c4dcc 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.0b9 -m_EditorVersionWithRevision: 2020.2.0b9 (ef2968fa77ae) +m_EditorVersion: 2020.2.0b13 +m_EditorVersionWithRevision: 2020.2.0b13 (655e1a328b90) diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/URPProjectSettings.asset b/Examples~/Hybrid Simulation Test Project/ProjectSettings/URPProjectSettings.asset index 92ab7fb..3077404 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/URPProjectSettings.asset +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 3 + m_LastMaterialVersion: 4 diff --git a/Runtime/Scripts/Data/DestroyFlagComponentData.cs b/Runtime/Scripts/Data/DestroyFlagComponentData.cs index bc91971..e4d56af 100644 --- a/Runtime/Scripts/Data/DestroyFlagComponentData.cs +++ b/Runtime/Scripts/Data/DestroyFlagComponentData.cs @@ -1,5 +1,5 @@ using Unity.Entities; namespace Software10101.DOTS.Data { - internal struct DestroyFlagComponentData : IComponentData { } + public struct DestroyFlagComponentData : IComponentData { } } diff --git a/package.json b/package.json index 35c77cf..95b3ffd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "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.0", + "version": "0.7.1", "unity": "2020.2", "displayName": "DOTS Hybrid Simulation Worlds", "dependencies": {