Upgrade FPS to fully use player lifecycle module (#149)

Author: paulbalaji

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Updated the `ConnectionController` and `ClientWorkerConnector` to make full use of the updated Player Lifecycle Feature Module.
+
 ### Internal
 
 - Fixed package dependencies.
@@ -30,7 +34,7 @@
 	- Now make use of nested prefabs.
 	- Completely new set of default tiles used to populate the world.
 - Updated the build configuration asset.
-- Reduced the amount of health that gets regenerated. 
+- Reduced the amount of health that gets regenerated.
 - Map generation is now asynchronous.
 
 ### Fixed

README.md

@@ -4,6 +4,6 @@ This starter project is designed to help you get started quickly with the [Spati
 
 ## Getting started
 
-For information on installing, running and playing the FPS Starter Project, please see our [getting started guide](https://docs.improbable.io/unity/alpha/content/get-started/get-started).
+For information on installing, running and playing the FPS Starter Project, please see our [getting started guide](https://docs.improbable.io/unity/alpha/projects/fps/get-started/get-started).
 
 © 2019 Improbable

gdk.pinned

@@ -1 +1 @@
-bf7978a2dacfe9b95892d05d39c0b5cff348e707
+9ffeb3a183dcfe5407172d82eac79fdd7ec1b5e3

workers/unity/Assets/Fps/Scripts/Config/FpsEntityTemplates.cs

@@ -13,10 +13,10 @@ namespace Fps
 {
     public static class FpsEntityTemplates
     {
-        public static EntityTemplate Spawner()
+        public static EntityTemplate Spawner(Coordinates spawnerCoordinates)
         {
-            var position = new Position.Snapshot { Coords = new Vector3().ToSpatialCoordinates() };
-            var metadata = new Metadata.Snapshot { EntityType = "PlayerCreator" };
+            var position = new Position.Snapshot(spawnerCoordinates);
+            var metadata = new Metadata.Snapshot("PlayerCreator");
 
             var template = new EntityTemplate();
             template.AddComponent(position, WorkerUtils.UnityGameLogic);
@@ -47,7 +47,7 @@ public static EntityTemplate SimulatedPlayerCoordinatorTrigger()
 
         public static EntityTemplate Player(string workerId, byte[] args)
         {
-            var client = $"workerId:{workerId}";
+            var client = EntityTemplate.GetWorkerAccessAttribute(workerId);
 
             var (spawnPosition, spawnYaw, spawnPitch) = SpawnPoints.GetRandomSpawnPoint();
 
@@ -96,7 +96,7 @@ public static EntityTemplate Player(string workerId, byte[] args)
             template.AddComponent(gunStateComponent, client);
             template.AddComponent(healthComponent, WorkerUtils.UnityGameLogic);
             template.AddComponent(healthRegenComponent, WorkerUtils.UnityGameLogic);
-            PlayerLifecycleHelper.AddPlayerLifecycleComponents(template, workerId, client, WorkerUtils.UnityGameLogic);
+            PlayerLifecycleHelper.AddPlayerLifecycleComponents(template, workerId, WorkerUtils.UnityGameLogic);
 
             template.SetReadAccess(WorkerUtils.UnityClient, WorkerUtils.UnityGameLogic, WorkerUtils.AndroidClient, WorkerUtils.iOSClient);
             template.SetComponentWriteAccess(EntityAcl.ComponentId, WorkerUtils.UnityGameLogic);

workers/unity/Assets/Fps/Scripts/Editor/SnapshotGenerator/SnapshotMenu.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using Improbable;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.DeploymentManager;
 using UnityEditor;
@@ -16,8 +17,7 @@ public class SnapshotMenu : MonoBehaviour
 
         private static void GenerateSnapshot(Snapshot snapshot)
         {
-            var spawner = FpsEntityTemplates.Spawner();
-            snapshot.AddEntity(spawner);
+            snapshot.AddEntity(FpsEntityTemplates.Spawner(Coordinates.Zero));
         }
 
         [MenuItem("SpatialOS/Generate FPS Snapshot")]

workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs

@@ -32,8 +32,8 @@ protected override void HandleWorkerConnectionEstablished()
         {
             var world = Worker.World;
 
-            // Only take the Heartbeat from the PlayerLifecycleConfig Client Systems.
-            world.GetOrCreateManager<HandlePlayerHeartbeatRequestSystem>();
+            PlayerLifecycleHelper.AddClientSystems(world, autoRequestPlayerCreation: false);
+            PlayerLifecycleConfig.MaxPlayerCreationRetries = 0;
 
             var fallback = new GameObjectCreatorFromMetadata(Worker.WorkerType, Worker.Origin, Worker.LogDispatcher);
 

workers/unity/Assets/Fps/Scripts/SetupLogic/ConnectionController.cs

@@ -1,5 +1,6 @@
 using Improbable;
 using Improbable.Gdk.Core;
+using Improbable.Gdk.PlayerLifecycle;
 using Improbable.Gdk.Subscriptions;
 using Improbable.PlayerLifecycle;
 using Improbable.Worker.CInterop;
@@ -81,8 +82,8 @@ public void OnReadyToSpawn()
 
         private void SpawnPlayer()
         {
-            var request = new CreatePlayerRequestType();
-            commandSender.SendCreatePlayerCommand(new EntityId(1), request, OnCreatePlayerResponse);
+            clientWorkerConnector.Worker.World.GetExistingManager<SendCreatePlayerRequestSystem>()
+                .RequestPlayerCreation(callback: OnCreatePlayerResponse);
         }
 
         public void ConnectAction()