spatialos · jamiebrynes7 · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 - `DynamicSnapshot` and `DynamicConverter` have been collapsed into `Dynamic`. [#1053](https://github.com/spatialos/gdk-for-unity/pull/1053)
     - The delegates from all of these classes are now available in the `Dynamic.VTable<TData, TUpdate, TSnapshot>` struct.
     - `Dynamic.IHandler.Accept` now takes a `Dynamic.Vtable<TData, TUpdate, TSnapshot` parameter.
+- Reactive components are now **opt in** instead of **opt out**. Use the scripting define `USE_LEGACY_REACTIVE_COMPONENTS` to re-enable them. [#1059](https://github.com/spatialos/gdk-for-unity/pull/1059)
+    - Note that these will be removed in a future release.
 
 ### Added
 
@@ -20,6 +22,10 @@
 - Upgraded to Worker SDK 13.8.2. [#1052](https://github.com/spatialos/gdk-for-unity/pull/1052)
     - The new [`Entity` schema type](https://docs.improbable.io/reference/13.8/shared/schema/reference#primitive-types) is deserialized as an `Improbable.Gdk.Core.EntitySnapshot`. [#1053](https://github.com/spatialos/gdk-for-unity/pull/1053)
 
+### Fixed
+
+- The world command sender reactive components and reactive component systems are now properly conditionally compiled. [#1059](https://github.com/spatialos/gdk-for-unity/pull/1059)
+
 ### Internal
 
 - Added extension methods on the `SchemaObject` struct for easy serializing/deserializing of the `Entity` schema type. [#1053](https://github.com/spatialos/gdk-for-unity/pull/1053)

diff --git a/UPGRADE_GUIDE.md b/UPGRADE_GUIDE.md
@@ -69,6 +69,14 @@ private class MyDynamicHandler : Dynamic.IHandler
 }
 ```
 
+#### Reactive components
+
+> If you were not using reactive components previously, no action is required.
+
+Reactive components are now **opt in** instead of **opt out**. To enable them, add the scripting define `USE_LEGACY_REACTIVE_COMPONENTS` to your project.
+
+Reactive components will be removed in a future release, **we strongly recommend to migrate off reactive components**. You can find the APIs to replace reactive components in the [ECS workflows documentation](https://docs.improbable.io/unity/alpha/reference/workflows/overview).
+
 ## From `0.2.4` to `0.2.5`
 
 ### NPM Packages

diff --git a/test-project/Assets/Generated/Source/improbable/dependentschema/DependentComponent.cs b/test-project/Assets/Generated/Source/improbable/dependentschema/DependentComponent.cs
@@ -852,7 +852,9 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<global::Improbable.TestSchema.ExhaustiveRepeatedData> A;
             public Option<global::Improbable.TestSchema.SomeEnum> B;
@@ -861,7 +863,7 @@ public struct Update : ISpatialComponentUpdate
             public Option<global::System.Collections.Generic.Dictionary<global::Improbable.TestSchema.SomeEnum,global::Improbable.TestSchema.SomeType>> E;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/...project/Assets/Generated/Source/improbable/dependentschema/DependentComponentProviders.cs b/...project/Assets/Generated/Source/improbable/dependentschema/DependentComponentProviders.cs
@@ -13,7 +13,7 @@ public partial class DependentComponent
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.DependentSchema.DependentComponent.Update>> Storage = new Dictionary<uint, List<global::Improbable.DependentSchema.DependentComponent.Update>>();

diff --git a/...ssets/Generated/Source/improbable/dependentschema/DependentComponentReactiveComponents.cs b/...ssets/Generated/Source/improbable/dependentschema/DependentComponentReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/.../Assets/Generated/Source/improbable/dependentschema/DependentComponentReactiveHandlers.cs b/.../Assets/Generated/Source/improbable/dependentschema/DependentComponentReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/dependentschema/DependentDataComponent.cs b/test-project/Assets/Generated/Source/improbable/dependentschema/DependentDataComponent.cs
@@ -2884,7 +2884,9 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<bool?> Field1;
             public Option<float?> Field2;
@@ -2906,7 +2908,7 @@ public struct Update : ISpatialComponentUpdate
             public Option<global::Improbable.TestSchema.SomeEnum?> Field18;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/...ts/Generated/Source/improbable/dependentschema/DependentDataComponentCommandComponents.cs b/...ts/Generated/Source/improbable/dependentschema/DependentDataComponentCommandComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 

diff --git a/...roject/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentEvents.cs b/...roject/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentEvents.cs
@@ -25,7 +25,7 @@ public Event(global::Improbable.TestSchema.SomeType payload)
         }
 
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public static class ReceivedEvents
         {
             public struct FooEvent : IComponentData

diff --git a/...ect/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentProviders.cs b/...ect/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentProviders.cs
@@ -13,7 +13,7 @@ public partial class DependentDataComponent
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.DependentSchema.DependentDataComponent.Update>> Storage = new Dictionary<uint, List<global::Improbable.DependentSchema.DependentDataComponent.Update>>();

diff --git a/...ated/Source/improbable/dependentschema/DependentDataComponentReactiveCommandComponents.cs b/...ated/Source/improbable/dependentschema/DependentDataComponentReactiveCommandComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using Unity.Entities;

diff --git a/...s/Generated/Source/improbable/dependentschema/DependentDataComponentReactiveComponents.cs b/...s/Generated/Source/improbable/dependentschema/DependentDataComponentReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/...ets/Generated/Source/improbable/dependentschema/DependentDataComponentReactiveHandlers.cs b/...ets/Generated/Source/improbable/dependentschema/DependentDataComponentReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTest.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTest.cs
@@ -286,12 +286,14 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<uint> Root;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChild.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChild.cs
@@ -286,12 +286,14 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<uint> Child;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChildProviders.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChildProviders.cs
@@ -13,7 +13,7 @@ public partial class DependencyTestChild
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.Tests.DependencyTestChild.Update>> Storage = new Dictionary<uint, List<global::Improbable.Tests.DependencyTestChild.Update>>();

diff --git a/...project/Assets/Generated/Source/improbable/tests/DependencyTestChildReactiveComponents.cs b/...project/Assets/Generated/Source/improbable/tests/DependencyTestChildReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChildReactiveHandlers.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestChildReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestGrandchild.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestGrandchild.cs
@@ -286,12 +286,14 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<uint> Grandchild;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildProviders.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildProviders.cs
@@ -13,7 +13,7 @@ public partial class DependencyTestGrandchild
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.Tests.DependencyTestGrandchild.Update>> Storage = new Dictionary<uint, List<global::Improbable.Tests.DependencyTestGrandchild.Update>>();

diff --git a/...ct/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildReactiveComponents.cs b/...ct/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/...ject/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildReactiveHandlers.cs b/...ject/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestProviders.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestProviders.cs
@@ -13,7 +13,7 @@ public partial class DependencyTest
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.Tests.DependencyTest.Update>> Storage = new Dictionary<uint, List<global::Improbable.Tests.DependencyTest.Update>>();

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestReactiveComponents.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/test-project/Assets/Generated/Source/improbable/tests/DependencyTestReactiveHandlers.cs b/test-project/Assets/Generated/Source/improbable/tests/DependencyTestReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntity.cs b/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntity.cs
@@ -960,7 +960,9 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<global::Improbable.Gdk.Core.EntitySnapshot> Field1;
             public Option<global::Improbable.Gdk.Core.EntitySnapshot?> Field2;
@@ -969,7 +971,7 @@ public struct Update : ISpatialComponentUpdate
             public Option<global::System.Collections.Generic.Dictionary<string,global::Improbable.Gdk.Core.EntitySnapshot>> Field5;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityProviders.cs b/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityProviders.cs
@@ -13,7 +13,7 @@ public partial class ExhaustiveEntity
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.TestSchema.ExhaustiveEntity.Update>> Storage = new Dictionary<uint, List<global::Improbable.TestSchema.ExhaustiveEntity.Update>>();

diff --git a/...oject/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityReactiveComponents.cs b/...oject/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/...project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityReactiveHandlers.cs b/...project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKey.cs b/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKey.cs
@@ -3478,7 +3478,9 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<global::System.Collections.Generic.Dictionary<bool,string>> Field1;
             public Option<global::System.Collections.Generic.Dictionary<float,string>> Field2;
@@ -3500,7 +3502,7 @@ public struct Update : ISpatialComponentUpdate
             public Option<global::System.Collections.Generic.Dictionary<global::Improbable.TestSchema.SomeEnum,string>> Field18;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;

diff --git a/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyProviders.cs b/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyProviders.cs
@@ -13,7 +13,7 @@ public partial class ExhaustiveMapKey
     {
         internal static class ReferenceTypeProviders
         {
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
             public static class UpdatesProvider 
             {
                 private static readonly Dictionary<uint, List<global::Improbable.TestSchema.ExhaustiveMapKey.Update>> Storage = new Dictionary<uint, List<global::Improbable.TestSchema.ExhaustiveMapKey.Update>>();

diff --git a/...oject/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyReactiveComponents.cs b/...oject/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyReactiveComponents.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System.Collections.Generic;
 using Unity.Entities;
 using Improbable.Gdk.Core;

diff --git a/...project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyReactiveHandlers.cs b/...project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyReactiveHandlers.cs
@@ -2,7 +2,7 @@
 // DO NOT EDIT - this file is automatically regenerated.
 // ===========
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
 using System;
 using System.Collections.Generic;
 using UnityEngine;

diff --git a/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapValue.cs b/test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapValue.cs
@@ -3478,7 +3478,9 @@ public static void ApplyUpdate(global::Improbable.Worker.CInterop.SchemaComponen
 
         public struct Update : ISpatialComponentUpdate
         {
+#if USE_LEGACY_REACTIVE_COMPONENTS
             internal static Stack<List<Update>> Pool = new Stack<List<Update>>();
+#endif
 
             public Option<global::System.Collections.Generic.Dictionary<string,bool>> Field1;
             public Option<global::System.Collections.Generic.Dictionary<string,float>> Field2;
@@ -3500,7 +3502,7 @@ public struct Update : ISpatialComponentUpdate
             public Option<global::System.Collections.Generic.Dictionary<string,global::Improbable.TestSchema.SomeEnum>> Field18;
         }
 
-#if !DISABLE_REACTIVE_COMPONENTS
+#if USE_LEGACY_REACTIVE_COMPONENTS
         public struct ReceivedUpdates : IComponentData
         {
             internal uint handle;