Basic port to QBI (#253)

spatialos · Mar 6, 2020 · 5a7262f · 5a7262f
1 parent 979cf09
commit 5a7262f
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## Breaking Changes
+
+- The FPS starter project now uses [query-based interest](https://docs.improbable.io/reference/14.4/shared/authority-and-interest/interest/query-based-interest-qbi) instead of [chunk-based interest](https://docs.improbable.io/reference/14.4/shared/authority-and-interest/interest/chunk-based-interest-cbi). [#253](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/253)
+
 ## `0.3.3` - 2020-02-14
 
 ### Breaking Changes

diff --git a/cloud_launch_large.json b/cloud_launch_large.json
@@ -8,7 +8,13 @@
     "dimensions": {
       "xMeters": 1800,
       "zMeters": 1800
-    }
+    },
+    "legacy_flags": [
+      {
+        "name": "interest_queries_components_are_filtered_by_component_delivery",
+        "value": "false"
+      }
+    ]
   },
   "load_balancing": {
     "layer_configurations": [

diff --git a/cloud_launch_large_sim_players.json b/cloud_launch_large_sim_players.json
@@ -8,7 +8,13 @@
     "dimensions": {
       "xMeters": 1800,
       "zMeters": 1800
-    }
+    },
+    "legacy_flags": [
+      {
+        "name": "interest_queries_components_are_filtered_by_component_delivery",
+        "value": "false"
+      }
+    ]
   },
   "load_balancing": {
     "layer_configurations" : [

diff --git a/cloud_launch_small.json b/cloud_launch_small.json
@@ -8,7 +8,13 @@
     "dimensions": {
       "xMeters": 300,
       "zMeters": 300
-    }
+    },
+    "legacy_flags": [
+      {
+        "name": "interest_queries_components_are_filtered_by_component_delivery",
+        "value": "false"
+      }
+    ]
   },
   "load_balancing": {
     "layer_configurations": [

diff --git a/cloud_launch_small_sim_players.json b/cloud_launch_small_sim_players.json
@@ -8,7 +8,13 @@
     "dimensions": {
       "xMeters": 300,
       "zMeters": 300
-    }
+    },
+    "legacy_flags": [
+      {
+        "name": "interest_queries_components_are_filtered_by_component_delivery",
+        "value": "false"
+      }
+    ]
   },
   "load_balancing": {
     "layer_configurations": [

diff --git a/default_launch.json b/default_launch.json
@@ -8,7 +8,13 @@
     "dimensions": {
       "xMeters": 300,
       "zMeters": 300
-    }
+    },
+    "legacy_flags": [
+      {
+        "name": "interest_queries_components_are_filtered_by_component_delivery",
+        "value": "false"
+      }
+    ]
   },
   "load_balancing": {
     "layer_configurations": [
@@ -92,7 +98,7 @@
           "name": "world_size",
           "value": "4"
         }
-      ],      
+      ],
       "permissions": [{
           "all": {}
       }]

diff --git a/snapshots/cloud.snapshot b/snapshots/cloud.snapshot
diff --git a/snapshots/default.snapshot b/snapshots/default.snapshot
diff --git a/workers/unity/Assets/Fps/Scripts/Config/FpsEntityTemplates.cs b/workers/unity/Assets/Fps/Scripts/Config/FpsEntityTemplates.cs
@@ -5,6 +5,7 @@
 using Improbable;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.PlayerLifecycle;
+using Improbable.Gdk.QueryBasedInterest;
 
 namespace Fps.Config
 {
@@ -21,6 +22,11 @@ public static EntityTemplate Spawner(Coordinates spawnerCoordinates)
             template.AddComponent(new Persistence.Snapshot(), WorkerUtils.UnityGameLogic);
             template.AddComponent(new PlayerCreator.Snapshot(), WorkerUtils.UnityGameLogic);
 
+            var query = InterestQuery.Query(Constraint.RelativeCylinder(150));
+            var interest = InterestTemplate.Create()
+                .AddQueries<Position.Component>(query);
+            template.AddComponent(interest.ToSnapshot(), WorkerUtils.UnityGameLogic);
+
             template.SetReadAccess(WorkerUtils.UnityGameLogic);
             template.SetComponentWriteAccess(EntityAcl.ComponentId, WorkerUtils.UnityGameLogic);
 
@@ -81,6 +87,17 @@ public static EntityTemplate Player(string workerId, byte[] args)
 
             PlayerLifecycleHelper.AddPlayerLifecycleComponents(template, workerId, WorkerUtils.UnityGameLogic);
 
+            const int serverRadius = 150;
+            var clientRadius = workerId.Contains(WorkerUtils.MobileClient) ? 60 : 150;
+
+            var serverQuery = InterestQuery.Query(Constraint.RelativeCylinder(serverRadius));
+            var clientQuery = InterestQuery.Query(Constraint.RelativeCylinder(clientRadius));
+
+            var interest = InterestTemplate.Create()
+                .AddQueries<Position.Component>(serverQuery)
+                .AddQueries<ClientMovement.Component>(clientQuery);
+            template.AddComponent(interest.ToSnapshot(), WorkerUtils.UnityGameLogic);
+
             template.SetReadAccess(WorkerUtils.UnityClient, WorkerUtils.UnityGameLogic, WorkerUtils.MobileClient);
             template.SetComponentWriteAccess(EntityAcl.ComponentId, WorkerUtils.UnityGameLogic);
 

diff --git a/workers/unity/spatialos.MobileClient.worker.json b/workers/unity/spatialos.MobileClient.worker.json
@@ -21,14 +21,9 @@
         "MobileClient"
       ]
     },
-    "entity_interest": {
-      "range_entity_interest": {
-        "radius": 60
-      }
-    },
     "component_delivery": {
       "default": "RELIABLE_ORDERED",
-      "checkoutAllInitially": true
+      "checkoutAllInitially": false
     }
   },
   "external": {

diff --git a/workers/unity/spatialos.SimulatedPlayerCoordinator.worker.json b/workers/unity/spatialos.SimulatedPlayerCoordinator.worker.json
@@ -21,14 +21,9 @@
         "SimulatedPlayerCoordinator"
       ]
     },
-    "entity_interest": {
-      "range_entity_interest": {
-        "radius": 1
-      }
-    },
     "component_delivery": {
       "default": "RELIABLE_ORDERED",
-      "checkoutAllInitially": true
+      "checkoutAllInitially": false
     }
   },
   "external": {

diff --git a/workers/unity/spatialos.UnityClient.worker.json b/workers/unity/spatialos.UnityClient.worker.json
@@ -21,14 +21,9 @@
         "UnityClient"
       ]
     },
-    "entity_interest": {
-      "range_entity_interest": {
-        "radius": 150
-      }
-    },
     "component_delivery": {
       "default": "RELIABLE_ORDERED",
-      "checkoutAllInitially": true
+      "checkoutAllInitially": false
     }
   },
   "external": {

diff --git a/workers/unity/spatialos.UnityGameLogic.worker.json b/workers/unity/spatialos.UnityGameLogic.worker.json
@@ -21,14 +21,9 @@
         "UnityGameLogic"
       ]
     },
-    "entity_interest": {
-      "range_entity_interest": {
-        "radius": 150
-      }
-    },
     "component_delivery": {
       "default": "RELIABLE_ORDERED",
-      "checkoutAllInitially": true
+      "checkoutAllInitially": false
     }
   },
   "external": {