From 4bc91283c8448dc9ae84066340ce5bfd8be5877e Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Thu, 20 Oct 2022 10:10:43 +0800
Subject: [PATCH] Fixed primitive fields not being serialised

---
 .../src/Serialisation/ReflectionUtilities.cxx | 86 ++++++++++---------
 .../src/Serialisation/ReflectionUtilities.hxx |  3 +-
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/SHADE_Managed/src/Serialisation/ReflectionUtilities.cxx b/SHADE_Managed/src/Serialisation/ReflectionUtilities.cxx
index 8e5b1d38..3e963818 100644
--- a/SHADE_Managed/src/Serialisation/ReflectionUtilities.cxx
+++ b/SHADE_Managed/src/Serialisation/ReflectionUtilities.cxx
@@ -73,7 +73,7 @@ namespace SHADE
         // Create YAML object
         YAML::Node scriptNode;
         scriptNode.SetStyle(YAML::EmitterStyle::Block);
-        scriptNode[SCRIPT_TYPE_YAMLTAG] = Convert::ToNative(object->GetType()->FullName);
+        scriptNode[SCRIPT_TYPE_YAMLTAG.data()] = Convert::ToNative(object->GetType()->FullName);
 
         // Get all fields
         System::Collections::Generic::IEnumerable<FieldInfo^>^ fields = GetInstanceFields(object);
@@ -129,51 +129,53 @@ namespace SHADE
         YAML::Node fieldNode;
         
         // Retrieve string for the YAML
-        if (fieldInsertYaml<System::Int16> (fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<System::Int32> (fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<System::Int64> (fieldInfo, object, fieldNode) ||
+        const bool PRIMITIVE_SERIALIZED = fieldInsertYaml<System::Int16>(fieldInfo, object, fieldNode) ||
+            fieldInsertYaml<System::Int32>(fieldInfo, object, fieldNode) ||
+            fieldInsertYaml<System::Int64>(fieldInfo, object, fieldNode) ||
             fieldInsertYaml<System::UInt16>(fieldInfo, object, fieldNode) ||
             fieldInsertYaml<System::UInt32>(fieldInfo, object, fieldNode) ||
             fieldInsertYaml<System::UInt64>(fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<System::Byte>  (fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<bool>          (fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<float>         (fieldInfo, object, fieldNode) ||
-            fieldInsertYaml<double>        (fieldInfo, object, fieldNode))
+            fieldInsertYaml<System::Byte>(fieldInfo, object, fieldNode) ||
+            fieldInsertYaml<bool>(fieldInfo, object, fieldNode) ||
+            fieldInsertYaml<float>(fieldInfo, object, fieldNode) ||
+            fieldInsertYaml<double>(fieldInfo, object, fieldNode);
+        
+        // Serialization of more complex types
+        if (!PRIMITIVE_SERIALIZED)
         {
-            return;
-        }
-        else if (fieldInfo->FieldType->IsSubclassOf(System::Enum::typeid))
-        {
-            fieldNode = std::to_string(safe_cast<int>(fieldInfo->GetValue(object)));
-        }
-        else if (fieldInfo->FieldType == System::String::typeid)
-        {
-            System::String^ str = safe_cast<System::String^>(fieldInfo->GetValue(object));
-            fieldNode = Convert::ToNative(str);
-        }
-        else if (fieldInfo->FieldType == Vector2::typeid)
-        {
-            Vector2 vec = safe_cast<Vector2>(fieldInfo->GetValue(object));
-            fieldNode.SetStyle(YAML::EmitterStyle::Flow);
-            fieldNode.push_back(vec.x);
-            fieldNode.push_back(vec.y);
-        }
-        else if (fieldInfo->FieldType == Vector3::typeid)
-        {
-            Vector3 vec = safe_cast<Vector3>(fieldInfo->GetValue(object));
-            fieldNode.SetStyle(YAML::EmitterStyle::Flow);
-            fieldNode.push_back(vec.x);
-            fieldNode.push_back(vec.y);
-            fieldNode.push_back(vec.z);
-        }
-        else // Not any of the supported types
-        {
-            Debug::LogWarning(Convert::ToNative(System::String::Format
-            (
-                "[ReflectionUtilities] Failed to parse \"{0}\" of \"{1}\" type for serialization.",
-                fieldInfo->Name, fieldInfo->FieldType)
-            ));
-            return;
+            if (fieldInfo->FieldType->IsSubclassOf(System::Enum::typeid))
+            {
+                fieldNode = std::to_string(safe_cast<int>(fieldInfo->GetValue(object)));
+            }
+            else if (fieldInfo->FieldType == System::String::typeid)
+            {
+                System::String^ str = safe_cast<System::String^>(fieldInfo->GetValue(object));
+                fieldNode = Convert::ToNative(str);
+            }
+            else if (fieldInfo->FieldType == Vector2::typeid)
+            {
+                Vector2 vec = safe_cast<Vector2>(fieldInfo->GetValue(object));
+                fieldNode.SetStyle(YAML::EmitterStyle::Flow);
+                fieldNode.push_back(vec.x);
+                fieldNode.push_back(vec.y);
+            }
+            else if (fieldInfo->FieldType == Vector3::typeid)
+            {
+                Vector3 vec = safe_cast<Vector3>(fieldInfo->GetValue(object));
+                fieldNode.SetStyle(YAML::EmitterStyle::Flow);
+                fieldNode.push_back(vec.x);
+                fieldNode.push_back(vec.y);
+                fieldNode.push_back(vec.z);
+            }
+            else // Not any of the supported types
+            {
+                Debug::LogWarning(Convert::ToNative(System::String::Format
+                (
+                    "[ReflectionUtilities] Failed to parse \"{0}\" of \"{1}\" type for serialization.",
+                    fieldInfo->Name, fieldInfo->FieldType)
+                ));
+                return;
+            }
         }
         
         // Store the field into YAML
diff --git a/SHADE_Managed/src/Serialisation/ReflectionUtilities.hxx b/SHADE_Managed/src/Serialisation/ReflectionUtilities.hxx
index 4742c7ff..fbae5ee0 100644
--- a/SHADE_Managed/src/Serialisation/ReflectionUtilities.hxx
+++ b/SHADE_Managed/src/Serialisation/ReflectionUtilities.hxx
@@ -58,8 +58,7 @@ namespace SHADE
         /// deserialised data into the specified object if there are matching fields.
         /// </summary>
         /// <param name="yamlNode">
-        /// The JSON string that contains the data to copy into this PlushieScript
-        /// object.
+        /// The JSON string that contains the data to copy into this Script object.
         /// </param>
         /// <param name="object">The object to copy deserialised data into.</param>
         static void Deserialise(System::Object^ object, YAML::Node& yamlNode);