KJ16609/FGL-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup some of the frustum tests

Browse Source
This commit is contained in:
kj16609
2024-02-22 01:29:13 -05:00
parent cd3949f68d
commit fe5241e2a7
2 changed files with 88 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/primitives/Frustum.hpp
View File

@@ -5,6 +5,7 @@
#pragma once
#include "Coordinate.hpp"
#include "Line.hpp"
#include "Matrix.hpp"
#include "Plane.hpp"
@@ -57,15 +58,19 @@ namespace fgl::engine
assert( near_plane.direction() != far_plane.direction() );
}
//! Tests if a point is inside of the frustum
bool pointInside( const WorldCoordinate coord ) const
{
static_assert(
CType == CoordinateSpace::World, "pointInside can only be called on World coordinate Frustums" );
return near.isForward( coord ) && far.isForward( coord ) && top.isForward( coord )
&& bottom.isForward( coord ) && right.isForward( coord ) && left.isForward( coord );
return far.isForward( coord ) && near.isForward( coord ) && bottom.isForward( coord )
&& top.isForward( coord ) && right.isForward( coord ) && left.isForward( coord );
}
//! Tests that a line intersects the frustum
bool lineIntersects( const Line< CoordinateSpace::World > line ) const;
bool operator==( const Frustum< CType >& other ) const
{
return near == other.near && far == other.far && top == other.top && bottom == other.bottom

116
tests/src/FrustumTesting.cpp
View File

@@ -120,77 +120,123 @@ TEST_CASE( "Frustum", "[frustum][rotation][translation]" )
const Frustum< fgl::engine::CoordinateSpace::World > frustum { Matrix< MatrixType::ModelToWorld > { 1.0f }
* camera.getBaseFrustum() };
SECTION( "Far up test" )
WHEN( "A point is above the frustum" )
{
//A point extremely far up should be in front of the bottom plane but behind the top plane
const WorldCoordinate far_up { constants::WORLD_UP * 1000.0f };
REQUIRE( frustum.top.distanceFrom( far_up ) < -500.0f );
REQUIRE( frustum.bottom.distanceFrom( far_up ) > 500.0f );
THEN( "The point should be outside the frustum" )
{
REQUIRE_FALSE( frustum.pointInside( far_up ) );
}
REQUIRE_FALSE( frustum.pointInside( far_up ) );
THEN( "The point should be infront of the bottom plane" )
{
REQUIRE( frustum.bottom.distanceFrom( far_up ) > 500.0f );
}
THEN( "The point should be behind the top plane" )
{
REQUIRE( frustum.top.distanceFrom( far_up ) < -500.0f );
}
}
SECTION( "Far down test" )
WHEN( "A point is below the frustum" )
{
//A point extremely far below should be in front of the top plane but behind the bottom plane
const WorldCoordinate far_down { constants::WORLD_DOWN * 1000.0f };
REQUIRE( frustum.top.distanceFrom( far_down ) > 500.0f );
REQUIRE( frustum.bottom.distanceFrom( far_down ) < -500.0f );
THEN( "The point should be outside the frustum" )
{
REQUIRE_FALSE( frustum.pointInside( far_down ) );
}
REQUIRE_FALSE( frustum.pointInside( far_down ) );
THEN( "The point should be infront of the top plane" )
{
REQUIRE( frustum.top.distanceFrom( far_down ) > 500.0f );
}
THEN( "The point should be behind the bottom plane" )
{
REQUIRE( frustum.bottom.distanceFrom( far_down ) < -500.0f );
}
}
//The point FORWARD should be in the frustum
SECTION( "Forward point test" )
WHEN( "A point infront of the frustum" )
{
const WorldCoordinate point { constants::WORLD_FORWARD * 2.0f };
GIVEN( "A distance of 2 units" )
{
const WorldCoordinate point { constants::WORLD_FORWARD * 2.0f };
REQUIRE( frustum.near.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.far.distanceFrom( point ) > 0.0f );
THEN( "The point should be inside the frustum" )
{
REQUIRE( frustum.pointInside( point ) );
}
}
REQUIRE( frustum.top.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.bottom.distanceFrom( point ) > 0.0f );
GIVEN( "A distance of 500 units" )
{
const WorldCoordinate point { constants::WORLD_FORWARD * 500.0f };
REQUIRE( frustum.right.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.left.distanceFrom( point ) > 0.0f );
THEN( "The point should be behind the far plane" )
{
CAPTURE( frustum.far.distanceFrom( point ) );
REQUIRE( frustum.far.distanceFrom( point ) < 0.0f );
REQUIRE_FALSE( frustum.far.isForward( point ) );
}
REQUIRE( frustum.pointInside( point ) );
THEN( "The point should be outside the frustum" )
{
REQUIRE_FALSE( frustum.pointInside( point ) );
}
}
}
//A point FORWARD and 0.2 units to the left should be farther from the right plane
GIVEN( "A point FORWARD and 0.2 units to the left" )
{
const WorldCoordinate point { ( constants::WORLD_FORWARD * 2.0f ) + constants::WORLD_LEFT * 0.2f };
REQUIRE( frustum.near.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.far.distanceFrom( point ) > 0.0f );
THEN( "The point should be farther from the right plane" )
{
REQUIRE( frustum.right.distanceFrom( point ) > frustum.left.distanceFrom( point ) );
}
REQUIRE( frustum.top.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.bottom.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.right.distanceFrom( point ) > 0.0f );
REQUIRE( frustum.left.distanceFrom( point ) > 0.0f );
// right_dist > left_dist
REQUIRE( frustum.right.distanceFrom( point ) > frustum.left.distanceFrom( point ) );
REQUIRE( frustum.pointInside( point ) );
THEN( "The point should be in the frustum" )
{
REQUIRE( frustum.pointInside( point ) );
}
}
//A point FORWARD and 0.2 units to the right should be farther from the left plane
GIVEN( "A point FORWARD and 0.2 units to the right" )
{
const WorldCoordinate point { ( constants::WORLD_FORWARD * 2.0f ) + constants::WORLD_RIGHT * 0.2f };
// left_dist > right_dist
REQUIRE( frustum.left.distanceFrom( point ) > frustum.right.distanceFrom( point ) );
THEN( "The point should be farther from the left plane" )
{
REQUIRE( frustum.left.distanceFrom( point ) > frustum.right.distanceFrom( point ) );
}
THEN( "The point should be in the frustum" )
{
REQUIRE( frustum.pointInside( point ) );
}
}
//A point FORWARD and down 0.2 units should be closer to the bottom plane
GIVEN( "A point FORWARD and down 0.2 units" )
{
const WorldCoordinate point { ( constants::WORLD_FORWARD * 2.0f ) + ( constants::WORLD_DOWN * 0.02f ) };
const WorldCoordinate point { ( constants::WORLD_FORWARD * 2.0f ) + ( constants::WORLD_DOWN * 0.2f ) };
REQUIRE( frustum.top.distanceFrom( point ) > frustum.bottom.distanceFrom( point ) );
THEN( "The point should be closer to the bottom plane" )
{
REQUIRE( frustum.bottom.distanceFrom( point ) < frustum.top.distanceFrom( point ) );
}
THEN( "The point should be in the frustum" )
{
REQUIRE( frustum.pointInside( point ) );
}
}
SECTION( "Rotations" )