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

feedback from PR

Browse Source
This commit is contained in:
greerdv
2021-04-20 14:44:31 +01:00
parent 03350134c5
commit cc937e0809
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Math/Aabb.h
+4 -4
View File
@@ -134,16 +134,16 @@ namespace AZ
void MultiplyByScale(const Vector3& scale); void MultiplyByScale(const Vector3& scale);
//! Transforms an Aabb and returns the resulting Obb. //! Transforms an Aabb and returns the resulting Obb.
Obb GetTransformedObb(const Transform& transform) const; [[nodiscard]] Obb GetTransformedObb(const Transform& transform) const;
//! Transforms an Aabb and returns the resulting Obb. //! Transforms an Aabb and returns the resulting Obb.
Obb GetTransformedObb(const Matrix3x4& matrix3x4) const; [[nodiscard]] Obb GetTransformedObb(const Matrix3x4& matrix3x4) const;
//! Returns a new AABB containing the transformed AABB. //! Returns a new AABB containing the transformed AABB.
Aabb GetTransformedAabb(const Transform& transform) const; [[nodiscard]] Aabb GetTransformedAabb(const Transform& transform) const;
//! Returns a new AABB containing the transformed AABB. //! Returns a new AABB containing the transformed AABB.
Aabb GetTransformedAabb(const Matrix3x4& matrix3x4) const; [[nodiscard]] Aabb GetTransformedAabb(const Matrix3x4& matrix3x4) const;
//! Checks if this aabb is equal to another within a floating point tolerance. //! Checks if this aabb is equal to another within a floating point tolerance.
bool IsClose(const Aabb& rhs, float tolerance = Constants::Tolerance) const; bool IsClose(const Aabb& rhs, float tolerance = Constants::Tolerance) const;
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
+1 -2
View File
@@ -433,8 +433,7 @@ namespace AZ
if (model) if (model)
{ {
Aabb aabb = model->GetAabb(); Aabb aabb = model->GetAabb();
aabb.SetMin(aabb.GetMin() * m_cachedNonUniformScale); aabb.MultiplyByScale(m_cachedNonUniformScale);
aabb.SetMax(aabb.GetMax() * m_cachedNonUniformScale);
return aabb; return aabb;
} }
else else