Integrating up through commit 90f050496

Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h

@@ -19,6 +19,13 @@
 #include <AzCore/std/containers/fixed_unordered_map.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/string/string.h>
+#include <AzCore/Math/Vector2.h>
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/Math/Vector4.h>
+#include <AzCore/Math/Quaternion.h>
+#include <AzCore/Math/Transform.h>
+#include <AzCore/Math/Frustum.h>
+#include <AzCore/Math/Aabb.h>
 #include <limits>
 
 namespace AzNetworking
@@ -238,4 +245,66 @@ namespace AzNetworking
             return SerializeAzContainer<TYPE>::Serialize(serializer, container);
         }
     };
+
+    // Az Types
+    template <>
+    struct SerializeObjectHelper<AZ::Vector2>
+    {
+        static bool SerializeObject(ISerializer& serializer, AZ::Vector2& value)
+        {
+            float values[4];
+            value.StoreToFloat2(values);
+            serializer.Serialize(values[0], "xValue");
+            serializer.Serialize(values[1], "yValue");
+            value = AZ::Vector2::CreateFromFloat2(values);
+            return serializer.IsValid();
+        }
+    };
+
+    template <>
+    struct SerializeObjectHelper<AZ::Vector3>
+    {
+        static bool SerializeObject(ISerializer& serializer, AZ::Vector3& value)
+        {
+            float values[4];
+            value.StoreToFloat3(values);
+            serializer.Serialize(values[0], "xValue");
+            serializer.Serialize(values[1], "yValue");
+            serializer.Serialize(values[1], "zValue");
+            value = AZ::Vector3::CreateFromFloat3(values);
+            return serializer.IsValid();
+        }
+    };
+
+    template <>
+    struct SerializeObjectHelper<AZ::Vector4>
+    {
+        static bool SerializeObject(ISerializer& serializer, AZ::Vector4& value)
+        {
+            float values[4];
+            value.StoreToFloat4(values);
+            serializer.Serialize(values[0], "xValue");
+            serializer.Serialize(values[1], "yValue");
+            serializer.Serialize(values[1], "zValue");
+            serializer.Serialize(values[1], "wValue");
+            value = AZ::Vector4::CreateFromFloat4(values);
+            return serializer.IsValid();
+        }
+    };
+
+    template <>
+    struct SerializeObjectHelper<AZ::Quaternion>
+    {
+        static bool SerializeObject(ISerializer& serializer, AZ::Quaternion& value)
+        {
+            float values[4];
+            value.StoreToFloat4(values);
+            serializer.Serialize(values[0], "xValue");
+            serializer.Serialize(values[1], "yValue");
+            serializer.Serialize(values[1], "zValue");
+            serializer.Serialize(values[1], "wValue");
+            value = AZ::Quaternion::CreateFromFloat4(values);
+            return serializer.IsValid();
+        }
+    };
 }

Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp

@@ -157,7 +157,7 @@ namespace AzNetworking
         }
         else if (receivedBytes == 0)
         {
-            // Clean disconnect, force the endpoint to disconnect and cleanup
+            // Clean disconnect, force the endpoint to disconnect and cleanup
             return SocketOpResultDisconnected;
         }
 

Code/Framework/AzNetworking/AzNetworking/TcpTransport/TlsSocket.cpp

@@ -222,7 +222,7 @@ namespace AzNetworking
         }
         else if (receivedBytes == 0)
         {
-            // Clean disconnect, force the endpoint to disconnect and cleanup
+            // Clean disconnect, force the endpoint to disconnect and cleanup
             return SocketOpResultDisconnected;
         }
         return receivedBytes;