birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted the EMFX Mesh to use AZ::Aabb instead of MCore::AABB

Browse Source 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2021-07-28 15:30:34 +02:00
parent 416f9aecf7
commit e9718d9ce8
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/Mesh.cpp
+3 -6
View File
@@ -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]));
}
}
Gems/EMotionFX/Code/EMotionFX/Source/Mesh.h
+2 -1
View File
@@ -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.