From 542a8cc3600fe77080458ae18a2f66625b300b46 Mon Sep 17 00:00:00 2001
From: teascade <teascade@gmail.com>
Date: Fri, 12 May 2017 01:41:57 +0300
Subject: [PATCH] Create InteractionType and network it and fix some docs

---
 Assets/Scripts/Controls/PlayerController.cs          |  3 ++-
 Assets/Scripts/Entities/InteractionType.cs           | 12 ++++++++++++
 Assets/Scripts/Entities/InteractionType.cs.meta      | 12 ++++++++++++
 Assets/Scripts/Entities/Spawner.cs                   |  4 ++++
 Assets/Scripts/Networking/Messages/InteractionPkt.cs | 12 +++++++++++-
 .../Networking/Serverside/ServerSyncHandler.cs       |  4 ++++
 6 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 Assets/Scripts/Entities/InteractionType.cs
 create mode 100644 Assets/Scripts/Entities/InteractionType.cs.meta

diff --git a/Assets/Scripts/Controls/PlayerController.cs b/Assets/Scripts/Controls/PlayerController.cs
index 2cd517e..3cbd41f 100644
--- a/Assets/Scripts/Controls/PlayerController.cs
+++ b/Assets/Scripts/Controls/PlayerController.cs
@@ -4,6 +4,7 @@ using Cyber.Console;
 using Cyber.Networking.Clientside;
 using Cyber.Networking;
 using Cyber.Networking.Messages;
+using Cyber.Entities;
 
 namespace Cyber.Controls {
     
@@ -56,7 +57,7 @@ namespace Cyber.Controls {
                         if (LookingAt != null && (LookingAt.transform.position - Character.GetPosition()).magnitude < Character.InteractionDistance) {
                             LookingAt.Interact(Character);
                             if (LookingAt.GetInteractableSyncdata().PublicInteractions) {
-                                Client.Send(PktType.Interact, new InteractionPkt(LookingAt.ID));
+                                Client.Send(PktType.Interact, new InteractionPkt(LookingAt.ID, InteractionType.Press));
                             }
                         }
                     }
diff --git a/Assets/Scripts/Entities/InteractionType.cs b/Assets/Scripts/Entities/InteractionType.cs
new file mode 100644
index 0000000..3d20b64
--- /dev/null
+++ b/Assets/Scripts/Entities/InteractionType.cs
@@ -0,0 +1,12 @@
+
+namespace Cyber.Entities {
+
+    /// <summary>
+    /// Describes the type of interaction being made.
+    /// </summary>
+    public enum InteractionType : byte {
+
+        Press, Release, Enter, Exit
+
+    }
+}
diff --git a/Assets/Scripts/Entities/InteractionType.cs.meta b/Assets/Scripts/Entities/InteractionType.cs.meta
new file mode 100644
index 0000000..57a44b8
--- /dev/null
+++ b/Assets/Scripts/Entities/InteractionType.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d4438a8b75336fd46ab611ac2f2e745f
+timeCreated: 1494542205
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Entities/Spawner.cs b/Assets/Scripts/Entities/Spawner.cs
index 66c7e9c..555ca25 100644
--- a/Assets/Scripts/Entities/Spawner.cs
+++ b/Assets/Scripts/Entities/Spawner.cs
@@ -54,6 +54,10 @@ namespace Cyber.Entities {
             return Spawned;
         }
 
+        /// <summary>
+        /// Removes the gameobject that was given as an argument from the world.
+        /// </summary>
+        /// <param name="gameObject">Gameobject to be removed.</param>
         public void Remove(GameObject gameObject) {
             SyncDB.RemoveEntity(gameObject);
             Destroy(gameObject);
diff --git a/Assets/Scripts/Networking/Messages/InteractionPkt.cs b/Assets/Scripts/Networking/Messages/InteractionPkt.cs
index 63cf651..ddfa02e 100644
--- a/Assets/Scripts/Networking/Messages/InteractionPkt.cs
+++ b/Assets/Scripts/Networking/Messages/InteractionPkt.cs
@@ -1,4 +1,5 @@
 
+using Cyber.Entities;
 using UnityEngine.Networking;
 
 namespace Cyber.Networking.Messages {
@@ -18,12 +19,19 @@ namespace Cyber.Networking.Messages {
         /// </summary>
         public int OwnerSyncBaseID;
 
+        /// <summary>
+        /// The interaction type that was made.
+        /// </summary>
+        public InteractionType InteractionType;
+
         /// <summary>
         /// Creates an InteraktionPkt, which contains the message "someone interacted".
         /// </summary>
         /// <param name="syncBaseID">The Sync Base ID of the interacted thing.</param>
-        public InteractionPkt(int syncBaseID) {
+        /// <param name="interactionType">The type of interaction that was made.</param>
+        public InteractionPkt(int syncBaseID, InteractionType interactionType) {
             InteractSyncBaseID = syncBaseID;
+            InteractionType = interactionType;
         }
 
         /// <summary>
@@ -38,6 +46,7 @@ namespace Cyber.Networking.Messages {
         public override void Deserialize(NetworkReader reader) {
             InteractSyncBaseID = reader.ReadInt32();
             OwnerSyncBaseID = reader.ReadInt32();
+            InteractionType = (InteractionType) reader.ReadByte();
         }
 
         /// <summary>
@@ -47,6 +56,7 @@ namespace Cyber.Networking.Messages {
         public override void Serialize(NetworkWriter writer) {
             writer.Write(InteractSyncBaseID);
             writer.Write(OwnerSyncBaseID);
+            writer.Write((byte) InteractionType);
         }
 
     }
diff --git a/Assets/Scripts/Networking/Serverside/ServerSyncHandler.cs b/Assets/Scripts/Networking/Serverside/ServerSyncHandler.cs
index e95ae08..1ff5cc5 100644
--- a/Assets/Scripts/Networking/Serverside/ServerSyncHandler.cs
+++ b/Assets/Scripts/Networking/Serverside/ServerSyncHandler.cs
@@ -44,6 +44,10 @@ namespace Cyber.Networking.Serverside {
             // Disregard the package, it's too old.
         }
 
+        /// <summary>
+        /// Clears the 'LastSyncIDReceived' from the given connection id, making sure that any new connections re-using this connectionID will be properly synced.
+        /// </summary>
+        /// <param name="connectionID">The connectionID to be cleared.</param>
         public void ClearConnectionFromSyncDict(int connectionID) {
             LastSyncIDReceived.Remove(connectionID);
         }