Cleanup FPS Project for 0.3.0 (#239)

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+- Restructured the project's layout. [#239](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/239)
+    - Moved all code and schema from FPS "packages" into the project directly.
+    - Cleaned up namespaces to make it clearer that this is game-specific schema and code.
+    - Flattened and tidied up the `Assets/Fps/Scripts` folder.
+
 ### Changed
 
 - Changed the default client and simulated player network connection types to Modular UDP with compression enabled. [#238](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/238)

schema/fps/common.schema

@@ -0,0 +1,7 @@
+package fps;
+
+type Vector3Int {
+    int32 x = 1;
+    int32 y = 2;
+    int32 z = 3;
+}

workers/unity/Packages/io.improbable.gdk.guns/.schema/improbable/gdk/guns/gun.schema → schema/fps/gun.schema

@@ -1,4 +1,4 @@
-package improbable.gdk.guns;
+package fps;
 
 component GunComponent {
   id = 2051;

workers/unity/Packages/io.improbable.gdk.health/.schema/improbable/gdk/health/health-regen.schema → schema/fps/health-regen.schema

@@ -1,4 +1,4 @@
-package improbable.gdk.health;
+package fps;
 
 component HealthRegenComponent {
   id = 2041;

workers/unity/Packages/io.improbable.gdk.health/.schema/improbable/gdk/health/health.schema → schema/fps/health.schema

@@ -1,22 +1,22 @@
-package improbable.gdk.health;
+package fps;
 
 import "improbable/gdk/core/common.schema";
-import "improbable/gdk/standardtypes/standardtypes.schema";
+import "fps/common.schema";
 
 type HealthModifier {
   uint32 type = 1;
   float amount = 2;
-  improbable.gdk.standardtypes.IntAbsolute applied_location = 3;
-  improbable.gdk.standardtypes.IntAbsolute origin = 4;
-  int64 owner = 5;
+  fps.Vector3Int applied_location = 3;
+  fps.Vector3Int origin = 4;
+  EntityId owner = 5;
 }
 
 type HealthModifiedInfo {
   HealthModifier modifier = 1;
   float health_before = 2;
   float health_after = 3;
   bool died = 4;
-  int64 owner = 5;
+  EntityId owner = 5;
 }
 
 component HealthComponent {

workers/unity/Packages/io.improbable.gdk.movement/.schema/improbable/gdk/movement/movement.schema → schema/fps/movement.schema

@@ -1,16 +1,16 @@
-package improbable.gdk.movement;
+package fps;
 
-import "improbable/gdk/standardtypes/standardtypes.schema";
+import "fps/common.schema";
 
 type ClientRequest {
-	improbable.gdk.standardtypes.IntDelta movement = 1;
+	fps.Vector3Int movement = 1;
 	int32 timestamp = 2;
 	float time_delta = 3;
 	bool includes_jump = 4;
 }
 
 type ServerResponse {
-	improbable.gdk.standardtypes.IntAbsolute position = 1;
+	fps.Vector3Int position = 1;
 	int32 timestamp = 2;
 	float time_delta = 3;
 	bool includes_jump = 4;

schema/fps/shooting.schema

@@ -0,0 +1,16 @@
+package fps;
+
+import "fps/common.schema";
+
+type ShotInfo {
+  bool hit_something = 1;
+  EntityId entity_id = 2;
+  fps.Vector3Int hit_location = 3;
+  fps.Vector3Int hit_origin = 4;
+}
+
+component ShootingComponent {
+  id = 2050;
+
+  event ShotInfo shots;
+}

workers/unity/Assets/Config/GdkToolsConfiguration.json

@@ -1,9 +1,11 @@
 {
-    "SchemaStdLibDir": "../../build/dependencies/schema/standard_library",
-    "SchemaSourceDirs": [],
+    "SchemaSourceDirs": [
+        "../../schema"
+    ],
     "CodegenOutputDir": "Assets/Generated/Source",
     "DescriptorOutputDir": "../../build/assembly/schema",
     "DevAuthTokenDir": "Resources",
     "DevAuthTokenLifetimeDays": 1,
-    "SaveDevAuthTokenToFile": false
+    "SaveDevAuthTokenToFile": false,
+    "SerializationOverrides": []
 }

workers/unity/Assets/Fps/Improbable.Fps.asmdef

@@ -4,25 +4,19 @@
         "Improbable.Gdk.Core",
         "Improbable.Gdk.GameObjectCreation",
         "Improbable.Gdk.Generated",
-        "Improbable.Gdk.Guns",
-        "Improbable.Gdk.Health",
-        "Improbable.Gdk.Movement",
         "Improbable.Gdk.Mobile",
-        "Improbable.Gdk.ObjectPooling",
         "Improbable.Gdk.PlayerLifecycle",
         "Improbable.Gdk.QueryBasedInterestHelper",
-        "Improbable.Gdk.Ragdoll",
-        "Improbable.Gdk.StandardTypes",
         "Unity.Entities",
         "Unity.Entities.Hybrid",
         "Unity.Postprocessing.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
-}
+    "defineConstraints": [],
+    "versionDefines": []
+}

workers/unity/Assets/Fps/Scripts/GameLogic/Animation/FpsAnimator.cs → workers/unity/Assets/Fps/Scripts/Animation/FpsAnimator.cs

@@ -1,7 +1,7 @@
-using Improbable.Gdk.Movement;
+using Fps.Movement;
 using UnityEngine;
 
-namespace Fps
+namespace Fps.Animation
 {
     public class FpsAnimator : MonoBehaviour
     {

workers/unity/Assets/Fps/Scripts/GameLogic/Animation/ProxyAnimation.cs → workers/unity/Assets/Fps/Scripts/Animation/ProxyAnimation.cs

@@ -1,11 +1,9 @@
-using Improbable.Gdk.Core;
+using Fps.Movement;
+using Fps.SchemaExtensions;
 using Improbable.Gdk.Subscriptions;
-using Improbable.Gdk.Guns;
-using Improbable.Gdk.Movement;
-using Improbable.Gdk.StandardTypes;
 using UnityEngine;
 
-namespace Fps
+namespace Fps.Animation
 {
     [RequireComponent(typeof(FpsAnimator), typeof(ProxyMovementDriver))]
     public class ProxyAnimation : MonoBehaviour

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

@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
+using Fps.Movement;
+using Fps.SchemaExtensions;
 using Improbable;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.GameObjectCreation;
-using Improbable.Gdk.Movement;
 using Improbable.Gdk.PlayerLifecycle;
-using Improbable.Gdk.StandardTypes;
 using Improbable.Gdk.Subscriptions;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
-namespace Fps
+namespace Fps.Config
 {
     public class AdvancedEntityPipeline : IEntityGameObjectCreator
     {

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

@@ -1,15 +1,15 @@
 using System.Text;
+using Fps.Guns;
+using Fps.Health;
+using Fps.Respawning;
+using Fps.SchemaExtensions;
 using Improbable;
 using Improbable.Gdk.Core;
-using Improbable.Gdk.Guns;
-using Improbable.Gdk.Health;
-using Improbable.Gdk.Movement;
 using Improbable.Gdk.PlayerLifecycle;
 using Improbable.Gdk.QueryBasedInterest;
 using Improbable.Gdk.Session;
-using Improbable.Gdk.StandardTypes;
 
-namespace Fps
+namespace Fps.Config
 {
     public static class FpsEntityTemplates
     {
@@ -24,7 +24,7 @@ public static EntityTemplate DeploymentState()
             template.AddComponent(position, WorkerUtils.UnityGameLogic);
             template.AddComponent(metadata, WorkerUtils.UnityGameLogic);
             template.AddComponent(new Persistence.Snapshot(), WorkerUtils.UnityGameLogic);
-            template.AddComponent(new Session.Snapshot(Status.LOBBY), WorkerUtils.UnityGameLogic);
+            template.AddComponent(new Improbable.Gdk.Session.Session.Snapshot(Status.LOBBY), WorkerUtils.UnityGameLogic);
             template.AddComponent(new Deployment.Snapshot(), WorkerUtils.DeploymentManager);
             template.AddComponent(new Timer.Snapshot(0, sessionTimeSeconds), WorkerUtils.UnityGameLogic);
 
@@ -59,7 +59,7 @@ public static EntityTemplate Player(string workerId, byte[] args)
 
             var serverResponse = new ServerResponse
             {
-                Position = spawnPosition.ToIntAbsolute()
+                Position = spawnPosition.ToVector3Int()
             };
 
             var rotationUpdate = new RotationUpdate
@@ -91,7 +91,7 @@ public static EntityTemplate Player(string workerId, byte[] args)
                 RegenPauseTime = 0,
             };
 
-            var sessionQuery = InterestQuery.Query(Constraint.Component<Session.Component>());
+            var sessionQuery = InterestQuery.Query(Constraint.Component<Improbable.Gdk.Session.Session.Component>());
             var checkoutQuery = InterestQuery.Query(Constraint.RelativeCylinder(150));
 
             var interestTemplate = InterestTemplate.Create().AddQueries<ClientMovement.Component>(sessionQuery, checkoutQuery);

workers/unity/Assets/Fps/Scripts/SetupLogic/OneTimeInitialisation.cs → workers/unity/Assets/Fps/Scripts/Config/OneTimeInitialisation.cs

@@ -3,7 +3,7 @@
 using Unity.Entities;
 using UnityEngine;
 
-namespace Fps
+namespace Fps.Config
 {
     public static class OneTimeInitialisation
     {

workers/unity/Assets/Fps/Scripts/SetupLogic/SettingsPublisher.cs → workers/unity/Assets/Fps/Scripts/Config/SettingsPublisher.cs

@@ -1,6 +1,7 @@
-using UnityEngine;
+using Fps.Config;
+using UnityEngine;
 
-namespace Fps
+namespace Fps.Config
 {
     public class SettingsPublisher : MonoBehaviour
     {

workers/unity/Assets/Fps/Scripts/SetupLogic/SettingsPublishers/GunDictionaryPublisher.cs → workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/GunDictionaryPublisher.cs

@@ -1,7 +1,7 @@
-using Improbable.Gdk.Guns;
+using Fps.Guns;
 using UnityEngine;
 
-namespace Fps
+namespace Fps.Config
 {
     public class GunDictionaryPublisher : MonoBehaviour, ISettingsPublisher
     {

workers/unity/Assets/Fps/Scripts/SetupLogic/SettingsPublishers/ISettingsPublisher.cs → workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/ISettingsPublisher.cs

@@ -1,4 +1,4 @@
-namespace Fps
+namespace Fps.Config
 {
     public interface ISettingsPublisher
     {

workers/unity/Assets/Fps/Scripts/WorldTiles/MapQualitySettingsPublisher.cs → workers/unity/Assets/Fps/Scripts/Config/SettingsPublishers/MapQualitySettingsPublisher.cs

@@ -1,6 +1,7 @@
-using UnityEngine;
+using Fps.WorldTiles;
+using UnityEngine;
 
-namespace Fps
+namespace Fps.Config
 {
     public class MapQualitySettingsPublisher : MonoBehaviour, ISettingsPublisher
     {

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

@@ -1,4 +1,4 @@
-namespace Fps
+namespace Fps.Config
 {
     public static class WorkerUtils
     {