FPS & 14.0.1 Worker SDK (#226)

Jamie Brynes · web-flow · commit 103d80f8faf6 · 2019-08-16T15:35:29.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,15 @@
 ### Breaking Changes
 
 - Moved `ChosenDeploymentAlphaLocatorFlow` and `SessionConnectionFlowInitializer` into the `Fps.Connection` namespace and made them `public`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)
+- Renamed `ChosenDeploymentAlphaLocatorFlow` to `ChosenDeploymentLocatorFlow`. [#226](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/226)
+- Removed `Improbable.Gdk.StandardTypes.Vector3Extensions.ToVector3(this Coordinates coordinates)` since there is now the option of:
+    - Using the `Coordinates.FromUnityVector(Vector3 vector)` static method.
+    - Using the `TransformUtils.ToCoordinates(this Vector3 vector)` extension method in the Transform Synchronization feature module.
 
 ### Internal
 
-- Added tests for the `ChosenDeploymentAlphaLocatorFlow`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)
+- Added tests for the `ChosenDeploymentLocatorFlow`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)
+- Removed old arguments from the worker JSON files. [#226](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/226)
 
 ## `0.2.6` - 2019-08-05
 
diff --git a/gdk.pinned b/gdk.pinned
@@ -1 +1 @@
-0674de43bb32efe4abbeaa5a401e3978ea84258d
+618c28ce0a3d13d17859aab25d8818ca159f4c6c
diff --git a/spatialos.json b/spatialos.json
@@ -1,8 +1,8 @@
 {
     "name": "unity_gdk",
     "project_version": "0.0.1",
-    "sdk_version": "13.8.2",
+    "sdk_version": "14.0.1",
     "dependencies": [
-        {"name": "standard_library", "version": "13.8.2"}
+        {"name": "standard_library", "version": "14.0.1"}
     ]
 }
diff --git a/workers/unity/Assets/Fps/Scripts/Config/FpsEntityTemplates.cs b/workers/unity/Assets/Fps/Scripts/Config/FpsEntityTemplates.cs
@@ -68,7 +68,7 @@ public static EntityTemplate Player(string workerId, byte[] args)
                 Pitch = spawnPitch.ToInt1k()
             };
 
-            var pos = new Position.Snapshot { Coords = spawnPosition.ToSpatialCoordinates() };
+            var pos = new Position.Snapshot { Coords = Coordinates.FromUnityVector(spawnPosition) };
             var serverMovement = new ServerMovement.Snapshot { Latest = serverResponse };
             var clientMovement = new ClientMovement.Snapshot { Latest = new ClientRequest() };
             var clientRotation = new ClientRotation.Snapshot { Latest = rotationUpdate };
diff --git a/workers/unity/Assets/Fps/Scripts/GameLogic/Respawning/RespawnHandler.cs b/workers/unity/Assets/Fps/Scripts/GameLogic/Respawning/RespawnHandler.cs
@@ -76,7 +76,7 @@ private IEnumerator SetSpatialPosition(Vector3 position)
             yield return null;
             var spatialPositionUpdate = new Position.Update
             {
-                Coords = position.ToSpatialCoordinates()
+                Coords = Coordinates.FromUnityVector(position)
             };
             spatialPosition.SendUpdate(spatialPositionUpdate);
         }
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs
@@ -70,7 +70,7 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()
             if (UseSessionFlow)
             {
                 connectionParams.Network.UseExternalIp = true;
-                builder.SetConnectionFlow(new ChosenDeploymentAlphaLocatorFlow(deployment,
+                builder.SetConnectionFlow(new ChosenDeploymentLocatorFlow(deployment,
                     new SessionConnectionFlowInitializer(new CommandLineConnectionFlowInitializer())));
             }
             else if (Application.isEditor)
@@ -91,10 +91,6 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()
                         connectionParams.Network.UseExternalIp = true;
                         builder.SetConnectionFlow(new LocatorFlow(initializer));
                         break;
-                    case ConnectionService.AlphaLocator:
-                        connectionParams.Network.UseExternalIp = true;
-                        builder.SetConnectionFlow(new AlphaLocatorFlow(initializer));
-                        break;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/ChosenDeploymentLocatorFlow.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/ChosenDeploymentLocatorFlow.cs
@@ -6,12 +6,12 @@
 
 namespace Fps.Connection
 {
-    public class ChosenDeploymentAlphaLocatorFlow : AlphaLocatorFlow
+    public class ChosenDeploymentLocatorFlow : LocatorFlow
     {
         private readonly string targetDeployment;
 
-        public ChosenDeploymentAlphaLocatorFlow(string targetDeployment,
-            IConnectionFlowInitializer<AlphaLocatorFlow> initializer = null) : base(initializer)
+        public ChosenDeploymentLocatorFlow(string targetDeployment,
+            IConnectionFlowInitializer<LocatorFlow> initializer = null) : base(initializer)
         {
             this.targetDeployment = targetDeployment;
         }
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/ChosenDeploymentLocatorFlow.cs.meta b/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/ChosenDeploymentLocatorFlow.cs.meta
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/SessionConnectionFlowInitializer.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/SessionConnectionFlowInitializer.cs
@@ -3,16 +3,16 @@
 
 namespace Fps.Connection
 {
-    public class SessionConnectionFlowInitializer : IConnectionFlowInitializer<AlphaLocatorFlow>
+    public class SessionConnectionFlowInitializer : IConnectionFlowInitializer<LocatorFlow>
     {
-        private readonly IConnectionFlowInitializer<AlphaLocatorFlow> initializer;
+        private readonly IConnectionFlowInitializer<LocatorFlow> initializer;
 
-        public SessionConnectionFlowInitializer(IConnectionFlowInitializer<AlphaLocatorFlow> standaloneInitializer)
+        public SessionConnectionFlowInitializer(IConnectionFlowInitializer<LocatorFlow> standaloneInitializer)
         {
             initializer = standaloneInitializer;
         }
 
-        public void Initialize(AlphaLocatorFlow flow)
+        public void Initialize(LocatorFlow flow)
         {
             if (Application.isEditor)
             {
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/MobileWorkerConnector.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/MobileWorkerConnector.cs
@@ -48,7 +48,7 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()
 
             if (UseSessionFlow)
             {
-                builder.SetConnectionFlow(new ChosenDeploymentAlphaLocatorFlow(deployment,
+                builder.SetConnectionFlow(new ChosenDeploymentLocatorFlow(deployment,
                     new SessionConnectionFlowInitializer(initializer)));
                 return builder;
             }
@@ -59,8 +59,8 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()
                     builder.SetConnectionFlow(new ReceptionistFlow(CreateNewWorkerId(WorkerUtils.MobileClient),
                         initializer));
                     break;
-                case ConnectionService.AlphaLocator:
-                    builder.SetConnectionFlow(new AlphaLocatorFlow(initializer));
+                case ConnectionService.Locator:
+                    builder.SetConnectionFlow(new LocatorFlow(initializer));
                     break;
                 default:
                     throw new ArgumentException("Received unsupported connection service.");
diff --git a/workers/unity/Assets/Fps/Scripts/SetupLogic/SimulatedPlayerWorkerConnector.cs b/workers/unity/Assets/Fps/Scripts/SetupLogic/SimulatedPlayerWorkerConnector.cs
@@ -22,7 +22,7 @@ public async Task ConnectSimulatedPlayer(string simulatedPlayerDevAuthToken,
 
             var builder = new SpatialOSConnectionHandlerBuilder()
                 .SetConnectionParameters(connectionParams)
-                .SetConnectionFlow(new ChosenDeploymentAlphaLocatorFlow(simulatedPlayerTargetDeployment)
+                .SetConnectionFlow(new ChosenDeploymentLocatorFlow(simulatedPlayerTargetDeployment)
                 {
                     DevAuthToken = simulatedPlayerDevAuthToken
                 });
diff --git a/workers/unity/Assets/Fps/Tests/EditmodeTests/ChosenDeploymentLocatorFlowTests.cs b/workers/unity/Assets/Fps/Tests/EditmodeTests/ChosenDeploymentLocatorFlowTests.cs
@@ -8,7 +8,7 @@
 namespace Fps.EditmodeTests
 {
     [TestFixture]
-    public class ChosenDeploymentAlphaLocatorFlowTests
+    public class ChosenDeploymentLocatorFlowTests
     {
         private const string LaunchConfigName = "default_launch.json";
 
@@ -69,16 +69,13 @@ public void CreateAsync_fails_if_no_matching_deployment()
             }
         }
 
-        private static ChosenDeploymentAlphaLocatorFlow GetFlow(string targetDeployment)
+        private static ChosenDeploymentLocatorFlow GetFlow(string targetDeployment)
         {
-            return new ChosenDeploymentAlphaLocatorFlow(targetDeployment)
+            return new ChosenDeploymentLocatorFlow(targetDeployment)
             {
                 LocatorHost = "localhost",
                 LocatorPort = 9876,
-                LocatorParameters =
-                {
-                    UseInsecureConnection = true
-                }
+                UseInsecureConnection = true
             };
         }
 
diff --git a/workers/unity/Assets/Fps/Tests/EditmodeTests/ChosenDeploymentLocatorFlowTests.cs.meta b/workers/unity/Assets/Fps/Tests/EditmodeTests/ChosenDeploymentLocatorFlowTests.cs.meta
diff --git a/workers/unity/Packages/io.improbable.gdk.movement/Behaviours/ServerMovementDriver.cs b/workers/unity/Packages/io.improbable.gdk.movement/Behaviours/ServerMovementDriver.cs
@@ -61,7 +61,7 @@ private void OnClientUpdate(ClientRequest request)
 
             if (Time.time - lastSpatialPositionTime > spatialPositionUpdateDelta)
             {
-                var positionUpdate = new Position.Update { Coords = positionNoOffset.ToSpatialCoordinates() };
+                var positionUpdate = new Position.Update { Coords = Coordinates.FromUnityVector(positionNoOffset) };
                 spatialPosition.SendUpdate(positionUpdate);
                 lastSpatialPositionTime = Time.time;
             }
diff --git a/workers/unity/Packages/io.improbable.gdk.standardtypes/Vector3Extensions.cs b/workers/unity/Packages/io.improbable.gdk.standardtypes/Vector3Extensions.cs
@@ -44,40 +44,5 @@ public static Vector3 ToVector3(this IntDelta value)
         {
             return new Vector3(value.X.ToFloat1k(), value.Y.ToFloat1k(), value.Z.ToFloat1k());
         }
-
-        public static Vector3 ToUnityVector3(this Vector3f vector3f)
-        {
-            return new Vector3(vector3f.X, vector3f.Y, vector3f.Z);
-        }
-
-        public static Vector3f ToSpatialVector3f(this Vector3 unityVector3)
-        {
-            return new Vector3f
-            {
-                X = unityVector3.x,
-                Y = unityVector3.y,
-                Z = unityVector3.z
-            };
-        }
-
-        public static Vector3d ToSpatialVector3d(this Vector3 unityVector3)
-        {
-            return new Vector3d
-            {
-                X = unityVector3.x,
-                Y = unityVector3.y,
-                Z = unityVector3.z
-            };
-        }
-
-        public static Coordinates ToSpatialCoordinates(this Vector3 unityVector3)
-        {
-            return new Coordinates
-            {
-                X = unityVector3.x,
-                Y = unityVector3.y,
-                Z = unityVector3.z
-            };
-        }
     }
 }
diff --git a/workers/unity/spatialos.SimulatedPlayerCoordinator.worker.json b/workers/unity/spatialos.SimulatedPlayerCoordinator.worker.json
@@ -39,12 +39,6 @@
         "arguments": [
           "+workerType",
           "SimulatedPlayerCoordinator",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+deploymentName",
-          "${IMPROBABLE_DEPLOYMENT_NAME}",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -57,16 +51,8 @@
           "-n",
           "./build/worker/SimulatedPlayerCoordinator@Mac/SimulatedPlayerCoordinator@Mac.app",
           "--args",
-          "+assemblyName",
-          "local_assembly",
-          "+deploymentName",
-          "${IMPROBABLE_DEPLOYMENT_NAME}",
           "+workerType",
           "SimulatedPlayerCoordinator",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -84,16 +70,12 @@
         "SimulatedPlayerCoordinator",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
-        "+deploymentName",
-        "${IMPROBABLE_DEPLOYMENT_NAME}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -108,16 +90,12 @@
         "SimulatedPlayerCoordinator",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
-        "+deploymentName",
-        "${IMPROBABLE_DEPLOYMENT_NAME}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -132,16 +110,12 @@
         "SimulatedPlayerCoordinator",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
-        "+deploymentName",
-        "${IMPROBABLE_DEPLOYMENT_NAME}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
diff --git a/workers/unity/spatialos.UnityClient.worker.json b/workers/unity/spatialos.UnityClient.worker.json
@@ -39,10 +39,6 @@
         "arguments": [
           "+workerType",
           "UnityClient",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-logfile",
           "../../logs/external-default-unityclient.log"
         ]
@@ -53,14 +49,8 @@
           "-n",
           "./build/worker/UnityClient@Mac/UnityClient@Mac.app",
           "--args",
-          "+assemblyName",
-          "local_assembly",
           "+workerType",
           "UnityClient",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-logfile",
           "../../logs/external-default-unityclient.log"
         ]
diff --git a/workers/unity/spatialos.UnityGameLogic.worker.json b/workers/unity/spatialos.UnityGameLogic.worker.json
@@ -39,10 +39,6 @@
         "arguments": [
           "+workerType",
           "UnityGameLogic",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -55,14 +51,8 @@
           "-n",
           "./build/worker/UnityGameLogic@Mac/UnityGameLogic@Mac.app",
           "--args",
-          "+assemblyName",
-          "local_assembly",
           "+workerType",
           "UnityGameLogic",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -80,14 +70,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -102,14 +90,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -124,14 +110,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0674de43bb32efe4abbeaa5a401e3978ea84258d`
	`1`	`+618c28ce0a3d13d17859aab25d8818ca159f4c6c`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "unity_gdk",`
`3`	`3`	`"project_version": "0.0.1",`
`4`		`- "sdk_version": "13.8.2",`
	`4`	`+ "sdk_version": "14.0.1",`
`5`	`5`	`"dependencies": [`
`6`		`- {"name": "standard_library", "version": "13.8.2"}`
	`6`	`+ {"name": "standard_library", "version": "14.0.1"}`
`7`	`7`	`]`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private IEnumerator SetSpatialPosition(Vector3 position)`
`76`	`76`	`yield return null;`
`77`	`77`	`var spatialPositionUpdate = new Position.Update`
`78`	`78`	`{`
`79`		`- Coords = position.ToSpatialCoordinates()`
	`79`	`+ Coords = Coordinates.FromUnityVector(position)`
`80`	`80`	`};`
`81`	`81`	`spatialPosition.SendUpdate(spatialPositionUpdate);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()`
`70`	`70`	`if (UseSessionFlow)`
`71`	`71`	`{`
`72`	`72`	`connectionParams.Network.UseExternalIp = true;`
`73`		`- builder.SetConnectionFlow(new ChosenDeploymentAlphaLocatorFlow(deployment,`
	`73`	`+ builder.SetConnectionFlow(new ChosenDeploymentLocatorFlow(deployment,`
`74`	`74`	`new SessionConnectionFlowInitializer(new CommandLineConnectionFlowInitializer())));`
`75`	`75`	`}`
`76`	`76`	`else if (Application.isEditor)`
`@@ -91,10 +91,6 @@ protected override IConnectionHandlerBuilder GetConnectionHandlerBuilder()`
`91`	`91`	`connectionParams.Network.UseExternalIp = true;`
`92`	`92`	`builder.SetConnectionFlow(new LocatorFlow(initializer));`
`93`	`93`	`break;`
`94`		`- case ConnectionService.AlphaLocator:`
`95`		`- connectionParams.Network.UseExternalIp = true;`
`96`		`- builder.SetConnectionFlow(new AlphaLocatorFlow(initializer));`
`97`		`- break;`
`98`	`94`	`default:`
`99`	`95`	`throw new ArgumentOutOfRangeException();`
`100`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`namespace Fps.Connection`
`8`	`8`	`{`
`9`		`- public class ChosenDeploymentAlphaLocatorFlow : AlphaLocatorFlow`
	`9`	`+ public class ChosenDeploymentLocatorFlow : LocatorFlow`
`10`	`10`	`{`
`11`	`11`	`private readonly string targetDeployment;`
`12`	`12`
`13`		`- public ChosenDeploymentAlphaLocatorFlow(string targetDeployment,`
`14`		`- IConnectionFlowInitializer<AlphaLocatorFlow> initializer = null) : base(initializer)`
	`13`	`+ public ChosenDeploymentLocatorFlow(string targetDeployment,`
	`14`	`+ IConnectionFlowInitializer<LocatorFlow> initializer = null) : base(initializer)`
`15`	`15`	`{`
`16`	`16`	`this.targetDeployment = targetDeployment;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,16 @@`
`3`	`3`
`4`	`4`	`namespace Fps.Connection`
`5`	`5`	`{`
`6`		`- public class SessionConnectionFlowInitializer : IConnectionFlowInitializer<AlphaLocatorFlow>`
	`6`	`+ public class SessionConnectionFlowInitializer : IConnectionFlowInitializer<LocatorFlow>`
`7`	`7`	`{`
`8`		`- private readonly IConnectionFlowInitializer<AlphaLocatorFlow> initializer;`
	`8`	`+ private readonly IConnectionFlowInitializer<LocatorFlow> initializer;`
`9`	`9`
`10`		`- public SessionConnectionFlowInitializer(IConnectionFlowInitializer<AlphaLocatorFlow> standaloneInitializer)`
	`10`	`+ public SessionConnectionFlowInitializer(IConnectionFlowInitializer<LocatorFlow> standaloneInitializer)`
`11`	`11`	`{`
`12`	`12`	`initializer = standaloneInitializer;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public void Initialize(AlphaLocatorFlow flow)`
	`15`	`+ public void Initialize(LocatorFlow flow)`
`16`	`16`	`{`
`17`	`17`	`if (Application.isEditor)`
`18`	`18`	`{`