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

Terrain/jjjoness/3172 axis aligned box shape component (#3981)

Browse Source 
* CHanges to Push/Pop Matrix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed bad commit

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* REmoved the AxisAlignedBoxShapeComponentBux and AxisAlignedBoxShapeConfig

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed derivation of AxisAlignedBoxShape

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added ShowChildrenOnly to Component

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed cmake file

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Changes from review

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added tests for AxisAlignedBoxShape

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Addressed PR comments and added one further test.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Removed dead code.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Changes from review

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Spelling fix and changed link to docs

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed profile bug in Linux

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed problem with Unity Profile Build in Tests

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
This commit is contained in:
John Jones-Steele
2021-09-08 16:50:29 +01:00
committed by GitHub
parent 6863e9cf9e
commit 817f8ce4c1
21 changed files with 897 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp
+16 -16
View File
@@ -41,10 +41,10 @@ namespace
LmbrCentral::QuadShapeConfig(1.0f, 0.5f),
};
const uint32_t RayCount = 5;
const uint32_t RayCountQuad = 5;
// Various normalized offset directions from center of quad along quad's surface.
const AZStd::array<AZ::Vector3, RayCount> OffsetsFromCenter =
const AZStd::array<AZ::Vector3, RayCountQuad> OffsetsFromCenterQuad =
{
AZ::Vector3( 0.18f, -0.50f, 0.0f).GetNormalized(),
AZ::Vector3(-0.08f, 0.59f, 0.0f).GetNormalized(),
@@ -54,7 +54,7 @@ namespace
};
// Various directions away from a point on the quad's surface
const AZStd::array<AZ::Vector3, RayCount> OffsetsFromSurface =
const AZStd::array<AZ::Vector3, RayCountQuad> OffsetsFromSurfaceQuad =
{
AZ::Vector3( 0.69f, 0.38f, 0.09f).GetNormalized(),
AZ::Vector3(-0.98f, -0.68f, -0.28f).GetNormalized(),
@@ -64,7 +64,7 @@ namespace
};
// Various distance away from the surface for the rays
const AZStd::array<float, RayCount> RayDistances =
const AZStd::array<float, RayCountQuad> RayDistancesQuad =
{
0.5f, 1.0f, 2.0f, 4.0f, 8.0f
};
@@ -248,23 +248,23 @@ namespace UnitTest
// Construct rays and test against the different quads
for (uint32_t quadIndex = 0; quadIndex < QuadCount; ++quadIndex)
{
for (uint32_t rayIndex = 0; rayIndex < RayCount; ++rayIndex)
for (uint32_t rayIndex = 0; rayIndex < RayCountQuad; ++rayIndex)
{
// OffsetsFromCenter are all less than 1, so scale by the dimensions of the quad.
// OffsetsFromCenterQuad are all less than 1, so scale by the dimensions of the quad.
AZ::Vector3 scaledWidthHeight = AZ::Vector3(QuadDims[quadIndex].m_width, QuadDims[quadIndex].m_height, 0.0f);
// Scale the offset and multiply by 0.5 because distance from center is half the width/height
AZ::Vector3 scaledOffsetFromCenter = OffsetsFromCenter[rayIndex] * scaledWidthHeight * 0.5f;
AZ::Vector3 scaledOffsetFromCenter = OffsetsFromCenterQuad[rayIndex] * scaledWidthHeight * 0.5f;
AZ::Vector3 positionOnQuadSurface = QuadTransforms[quadIndex].TransformPoint(scaledOffsetFromCenter);
AZ::Vector3 rayOrigin = positionOnQuadSurface + OffsetsFromSurface[rayIndex] * RayDistances[rayIndex];
AZ::Vector3 rayOrigin = positionOnQuadSurface + OffsetsFromSurfaceQuad[rayIndex] * RayDistancesQuad[rayIndex];
bool rayHit2 = false;
float distance2;
LmbrCentral::ShapeComponentRequestsBus::EventResult(
rayHit2, quadEntities[quadIndex].GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay,
rayOrigin, -OffsetsFromSurface[rayIndex], distance2);
rayOrigin, -OffsetsFromSurfaceQuad[rayIndex], distance2);
EXPECT_TRUE(rayHit2);
EXPECT_NEAR(distance2, RayDistances[rayIndex], 1e-4f);
EXPECT_NEAR(distance2, RayDistancesQuad[rayIndex], 1e-4f);
}
}
@@ -297,20 +297,20 @@ namespace UnitTest
// Construct rays and test against the different quads
for (uint32_t quadIndex = 0; quadIndex < QuadCount; ++quadIndex)
{
for (uint32_t rayIndex = 0; rayIndex < RayCount; ++rayIndex)
for (uint32_t rayIndex = 0; rayIndex < RayCountQuad; ++rayIndex)
{
// OffsetsFromCenter are all less than 1, so scale by the dimensions of the quad.
// OffsetsFromCenterQuad are all less than 1, so scale by the dimensions of the quad.
AZ::Vector3 scaledWidthHeight = AZ::Vector3(QuadDims[quadIndex].m_width, QuadDims[quadIndex].m_height, 0.0f);
// Scale the offset and add 1.0 to OffsetsFromCenter to ensure the point is outside the quad.
AZ::Vector3 scaledOffsetFromCenter = (AZ::Vector3::CreateOne() + OffsetsFromCenter[rayIndex]) * scaledWidthHeight;
// Scale the offset and add 1.0 to OffsetsFromCenterQuad to ensure the point is outside the quad.
AZ::Vector3 scaledOffsetFromCenter = (AZ::Vector3::CreateOne() + OffsetsFromCenterQuad[rayIndex]) * scaledWidthHeight;
AZ::Vector3 positionOnQuadSurface = QuadTransforms[quadIndex].TransformPoint(scaledOffsetFromCenter);
AZ::Vector3 rayOrigin = positionOnQuadSurface + OffsetsFromSurface[rayIndex] * RayDistances[rayIndex];
AZ::Vector3 rayOrigin = positionOnQuadSurface + OffsetsFromSurfaceQuad[rayIndex] * RayDistancesQuad[rayIndex];
bool rayHit2 = false;
float distance2;
LmbrCentral::ShapeComponentRequestsBus::EventResult(
rayHit2, quadEntities[quadIndex].GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay,
rayOrigin, -OffsetsFromSurface[rayIndex], distance2);
rayOrigin, -OffsetsFromSurfaceQuad[rayIndex], distance2);
EXPECT_FALSE(rayHit2);
}