From 9e8674859c768fb08c9fedfd53709c493df65a3a Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Mon, 14 Nov 2022 17:05:54 +0800
Subject: [PATCH] Fixed script serialization for objects with no default values
 set

---
 .../MiddleEnd/Interface/SHRenderable.cpp      |  7 +++-
 .../src/Serialization/SHYAMLConverters.h      | 10 ++++-
 .../Serialisation/SerialisationUtilities.h++  | 42 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp
index 57762324..c5511606 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp
@@ -34,8 +34,11 @@ namespace SHADE
   void SHRenderable::OnDestroy()
   {
     // Remove from SuperBatch
-    Handle<SHSuperBatch> superBatch = sharedMaterial->GetBaseMaterial()->GetPipeline()->GetPipelineState().GetSubpass()->GetSuperBatch();
-	superBatch->Remove(this);
+    if (sharedMaterial)
+    {
+      Handle<SHSuperBatch> superBatch = sharedMaterial->GetBaseMaterial()->GetPipeline()->GetPipelineState().GetSubpass()->GetSuperBatch();
+      superBatch->Remove(this);
+    }
 
     // Free resources
     if (material)
diff --git a/SHADE_Engine/src/Serialization/SHYAMLConverters.h b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
index 0f8933e2..6df65bc3 100644
--- a/SHADE_Engine/src/Serialization/SHYAMLConverters.h
+++ b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
@@ -288,7 +288,15 @@ namespace YAML
     {
       YAML::Node node;
       node[MESH_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMesh>(rhs.GetMesh()).value_or(0);
-      node[MAT_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMaterial>(rhs.GetMaterial()->GetBaseMaterial()).value_or(0);
+      auto mat = rhs.GetMaterial();
+      if (mat)
+      {
+        node[MAT_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMaterial>(rhs.GetMaterial()->GetBaseMaterial()).value_or(0);
+      }
+      else
+      {
+        node[MAT_YAML_TAG.data()] = 0;
+      }
       return node;
     }
     static bool decode(YAML::Node const& node, SHRenderable& rhs)
diff --git a/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++ b/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
index 3e756ce4..dde6705a 100644
--- a/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
+++ b/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
@@ -28,7 +28,47 @@ namespace SHADE
     template<typename FieldType>
     bool SerialisationUtilities::fieldInsertYaml(System::Reflection::FieldInfo^ fieldInfo, System::Object^ object, YAML::Node& fieldNode)
     {
-        return varInsertYamlInternal<FieldType>(fieldInfo->GetValue(object), fieldNode);
+        // Handle null objects
+        System::Object^ fieldObject = fieldInfo->GetValue(object);
+        if (fieldObject == nullptr)
+        {
+            // Default construct if null
+            if (fieldInfo->FieldType == FieldType::typeid)
+            {
+                if constexpr (std::is_same_v<FieldType, System::Enum>)
+                {
+                    fieldNode = 0;
+                }
+                else if constexpr (std::is_same_v<FieldType, System::String>)
+                {
+                    fieldNode = "";
+                }
+                else if constexpr (std::is_same_v<FieldType, Vector2>)
+                {
+                    fieldNode.SetStyle(YAML::EmitterStyle::Flow);
+                    fieldNode.push_back(0.0f);
+                    fieldNode.push_back(0.0f);
+                }
+                else if constexpr (std::is_same_v<FieldType, Vector3>)
+                {
+                    fieldNode.SetStyle(YAML::EmitterStyle::Flow);
+                    fieldNode.push_back(0.0f);
+                    fieldNode.push_back(0.0f);
+                    fieldNode.push_back(0.0f);
+                }
+                else if constexpr (std::is_same_v<FieldType, GameObject>)
+                {
+                    fieldNode = MAX_EID;
+                }
+                else
+                {
+                    fieldNode = FieldType();
+                }
+                return true;
+            }
+            return false;
+        }
+        return varInsertYamlInternal<FieldType>(fieldObject, fieldNode);
     }
     template<typename FieldType>
     bool SerialisationUtilities::varInsertYamlInternal(System::Object^ object, YAML::Node& fieldNode)