Better gameobject initialization (#261)

Author: Paul Balaji

CHANGELOG.md

@@ -2,16 +2,15 @@
 
 ## Unreleased
 
-## `0.3.4` - 2020-03-16
-
-### Changed
-
-- Upgraded to GDK for Unity version `0.3.4`
 ## 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)
 - You must now pass in an `EntityId` to create a player `EntityTemplate`. [#254](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/254)
 
+## Changed
+
+- Added the new `PopulateEntityTypeExpectations` method required by `IEntityGameObjectCreator` to the `AdvancedEntityPipeline`. [#261](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/261)
+
 ## `0.3.3` - 2020-02-14
 
 ### Breaking Changes

gdk.pinned

@@ -1 +1 @@
-develop 96405d6404cd94bf1681c24512058dfc9a25e4d6
+develop 9c0b93fddff03ba8610fc1d08410a95cd1a5408b

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

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Fps.Movement;
 using Fps.SchemaExtensions;
-using Improbable;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.GameObjectCreation;
 using Improbable.Gdk.PlayerLifecycle;
@@ -31,8 +30,7 @@ public class AdvancedEntityPipeline : IEntityGameObjectCreator
 
         private readonly Type[] componentsToAdd =
         {
-            typeof(Transform),
-            typeof(Rigidbody)
+            typeof(Transform), typeof(Rigidbody)
         };
 
         public AdvancedEntityPipeline(WorkerInWorld worker, string authPlayer, string nonAuthPlayer)
@@ -46,30 +44,34 @@ public AdvancedEntityPipeline(WorkerInWorld worker, string authPlayer, string no
             cachedNonAuthPlayer = Resources.Load<GameObject>(nonAuthPlayer);
         }
 
-        public void OnEntityCreated(SpatialOSEntity entity, EntityGameObjectLinker linker)
+        public void PopulateEntityTypeExpectations(EntityTypeExpectations entityTypeExpectations)
         {
-            if (!entity.TryGetComponent<Metadata.Component>(out var metadata))
+            entityTypeExpectations.RegisterEntityType(PlayerEntityType, new[]
             {
-                return;
-            }
-
-            if (metadata.EntityType == PlayerEntityType)
-            {
-                CreatePlayerGameObject(entity, linker);
-                return;
-            }
+                typeof(OwningWorker.Component), typeof(ServerMovement.Component)
+            });
 
-            fallback.OnEntityCreated(entity, linker);
+            fallback.PopulateEntityTypeExpectations(entityTypeExpectations);
         }
 
-        private void CreatePlayerGameObject(SpatialOSEntity entity, EntityGameObjectLinker linker)
+        public void OnEntityCreated(string entityType, SpatialOSEntity entity, EntityGameObjectLinker linker)
         {
-            if (!entity.TryGetComponent<OwningWorker.Component>(out var owningWorker))
+            switch (entityType)
             {
-                throw new InvalidOperationException("Player entity does not have the OwningWorker component");
+                case PlayerEntityType:
+                    CreatePlayerGameObject(entity, linker);
+                    break;
+                default:
+                    fallback.OnEntityCreated(entityType, entity, linker);
+                    break;
             }
+        }
 
+        private void CreatePlayerGameObject(SpatialOSEntity entity, EntityGameObjectLinker linker)
+        {
+            var owningWorker = entity.GetComponent<OwningWorker.Component>();
             var serverPosition = entity.GetComponent<ServerMovement.Component>();
+
             var position = serverPosition.Latest.Position.ToVector3() + workerOrigin;
 
             var prefab = owningWorker.WorkerId == workerId ? cachedAuthPlayer : cachedNonAuthPlayer;