From 0547a1085a35f4952f744a55729cf1b5180465c9 Mon Sep 17 00:00:00 2001
From: Chris Burel <burelc@amazon.com>
Date: Thu, 3 Jun 2021 11:17:12 -0700
Subject: [PATCH] Add version converter for the game controller settings, since
 one of its field types has changed

Signed-off-by: Chris Burel <burelc@amazon.com>
---
 .../AnimGraphGameControllerSettings.cpp       | 22 +++++++++++++++++--
 .../Source/AnimGraphGameControllerSettings.h  |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
index 6f2d6083a1..970e2e913c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include <AzCore/Math/Crc.h>
+#include <AzCore/std/string/string_view.h>
 #include <EMotionFX/Source/AnimGraphGameControllerSettings.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
@@ -181,7 +183,7 @@ namespace EMotionFX
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     AnimGraphGameControllerSettings::AnimGraphGameControllerSettings()
-        : m_activePresetIndex(MCORE_INVALIDINDEX32)
+        : m_activePresetIndex(InvalidIndex)
     {
     }
 
@@ -369,6 +371,22 @@ namespace EMotionFX
     }
 
 
+    static bool AnimGraphGameControllerSettingsVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& element)
+    {
+        if (element.GetVersion() < 2)
+        {
+            constexpr AZStd::string_view activePresetIndex{"activePresetIndex"};
+            if (AZ::SerializeContext::DataElementNode* presetIndexElement = element.FindSubElement(AZ::Crc32(activePresetIndex)))
+            {
+                uint32 value;
+                presetIndexElement->GetData(value);
+                presetIndexElement->Convert<AZ::u64>(context);
+                presetIndexElement->SetData(context, static_cast<AZ::u64>(value));
+            }
+        }
+        return true;
+    }
+
     void AnimGraphGameControllerSettings::Reflect(AZ::ReflectContext* context)
     {
         ParameterInfo::Reflect(context);
@@ -383,7 +401,7 @@ namespace EMotionFX
         }
 
         serializeContext->Class<AnimGraphGameControllerSettings>()
-            ->Version(1)
+            ->Version(2, &AnimGraphGameControllerSettingsVersionConverter)
             ->Field("activePresetIndex", &AnimGraphGameControllerSettings::m_activePresetIndex)
             ->Field("presets", &AnimGraphGameControllerSettings::m_presets)
             ;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
index f543246599..d36a448be4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphGameControllerSettings.h
@@ -164,6 +164,6 @@ namespace EMotionFX
 
     private:
         AZStd::vector<Preset*>   m_presets;
-        size_t                   m_activePresetIndex;
+        AZ::u64                  m_activePresetIndex;
     };
 } // namespace EMotionFX