From e9718d9ce87ceb09c209777174ca46d37ef4a288 Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <jillich@amazon.com>
Date: Wed, 28 Jul 2021 15:30:34 +0200
Subject: [PATCH] Converted the EMFX Mesh to use AZ::Aabb instead of
 MCore::AABB

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
---
 Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp | 9 +++------
 Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h   | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
index 51486c39b5..60ebd9a2dc 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
@@ -1372,20 +1372,17 @@ namespace EMotionFX
     }
 
 
-    void Mesh::CalcAABB(MCore::AABB* outBoundingBox, const Transform& transform, uint32 vertexFrequency)
+    void Mesh::CalcAabb(AZ::Aabb* outBoundingBox, const Transform& transform, uint32 vertexFrequency)
     {
         MCORE_ASSERT(vertexFrequency >= 1);
+        *outBoundingBox = AZ::Aabb::CreateNull();
 
-        // init the bounding box
-        outBoundingBox->Init();
-
-        // get the position data
         AZ::Vector3* positions = (AZ::Vector3*)FindVertexData(ATTRIB_POSITIONS);
 
         const uint32 numVerts = GetNumVertices();
         for (uint32 i = 0; i < numVerts; i += vertexFrequency)
         {
-            outBoundingBox->Encapsulate(transform.TransformPoint(positions[i]));
+            outBoundingBox->AddPoint(transform.TransformPoint(positions[i]));
         }
     }
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
index f9a9f960ce..cb929dc7db 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "EMotionFXConfig.h"
+#include <AzCore/Math/Aabb.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/std/string/string.h>
@@ -571,7 +572,7 @@ namespace EMotionFX
          * @param vertexFrequency This is the for loop increase counter value. A value of 1 means every vertex will be processed
          *                        while a value of 2 means every second vertex, etc. The value must be 1 or higher.
          */
-        void CalcAABB(MCore::AABB* outBoundingBox, const Transform& transform, uint32 vertexFrequency = 1);
+        void CalcAabb(AZ::Aabb* outBoundingBox, const Transform& transform, uint32 vertexFrequency = 1);
 
         /**
          * The mesh type used to indicate if a mesh is either static, like a cube or building, cpu deformed, if it needs to be processed on the CPU, or GPU deformed if it can be processed fully on the GPU.