[FEAT] Add Cube support - still issue on the shadow with the glass cube.
This commit is contained in:
@@ -33,7 +33,7 @@ using namespace Raytracer;
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
class CubeTest
|
||||
class CubeTestIntersect
|
||||
{
|
||||
public:
|
||||
Tuple origin;
|
||||
@@ -44,6 +44,15 @@ public:
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
class CubeTestNormal
|
||||
{
|
||||
public:
|
||||
Tuple point;
|
||||
Tuple normal;
|
||||
};
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
SCENARIO("A Ray intersects a cube", "[features/cubes.feature]")
|
||||
{
|
||||
// | | origin | direction | t1 | t2 |
|
||||
@@ -54,7 +63,7 @@ SCENARIO("A Ray intersects a cube", "[features/cubes.feature]")
|
||||
// | +z | point(0.5, 0, 5) | vector( 0, 0,-1) | 4 | 6 |
|
||||
// | -z | point(0.5, 0, -5) | vector( 0, 0, 1) | 4 | 6 |
|
||||
// | inside | point(0, 0.5, 0) | vector( 0, 0, 1) | -1 | -1 |
|
||||
CubeTest the_test[7] = {
|
||||
CubeTestIntersect the_test[] = {
|
||||
{ Tuple::Point(5.0, 0.5, 0.0), Tuple::Vector(-1, 0, 0), 4, 6},
|
||||
{Tuple::Point(-5.0, 0.5, 0.0), Tuple::Vector(1, 0, 0), 4, 6},
|
||||
{ Tuple::Point(0.5, 5.0, 0.0), Tuple::Vector(0, -1, 0), 4, 6},
|
||||
@@ -92,3 +101,87 @@ SCENARIO("A Ray intersects a cube", "[features/cubes.feature]")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
SCENARIO("A Ray misses a cube", "[features/cubes.feature]")
|
||||
{
|
||||
// | point | direction |
|
||||
// | point(-2, 0, 0) | vector(0.2673, 0.5345, 0.8018) |
|
||||
// | point(0, -2, 0) | vector(0.8018, 0.2673, 0.5345) |
|
||||
// | point(0, 0, -2) | vector(0.5345, 0.8018, 0.2673) |
|
||||
// | point(2, 0, 2) | vector(0, 0, -1) |
|
||||
// | point(0, 2, 2) | vector(0, -1, 0) |
|
||||
// | point(2, 2, 0) | vector(-1, 0, 0) |
|
||||
CubeTestIntersect the_test[] = {
|
||||
{Tuple::Point(-2, 0, 0), Tuple::Vector(0.2673, 0.5345, 0.8018), -1, -1},
|
||||
{ Tuple::Point(0, -2, 0), Tuple::Vector(0.8018, 0.2673, 0.5345), -1, -1},
|
||||
{ Tuple::Point(0, 0, -2), Tuple::Vector(0.5345, 0.8018, 0.2673), -1, -1},
|
||||
{ Tuple::Point(2, 0, 2), Tuple::Vector(0, 0, -1), -1, -1},
|
||||
{ Tuple::Point(0, 2, 2), Tuple::Vector(0, -1, 0), -1, -1},
|
||||
{ Tuple::Point(2, 2, 0), Tuple::Vector(-1, 0, 0), -1, -1}
|
||||
};
|
||||
GIVEN("c <- cube()")
|
||||
{
|
||||
Cube c;
|
||||
AND_GIVEN("r <- ray(<origin>, <direction>)")
|
||||
{
|
||||
WHEN("xs <- local_intersect(c,r)")
|
||||
{
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
Ray r(the_test[i].origin, the_test[i].direction);
|
||||
Intersections xs = c.local_intersect(r);
|
||||
THEN("xs.count = 0")
|
||||
{
|
||||
REQUIRE(xs.count() == 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
SCENARIO("The normal on the surface of a cube", "[features/cubes.feature]")
|
||||
{
|
||||
// | origin | normal |
|
||||
// | point(1, 0.5, -0.8) | vector(1, 0, 0) |
|
||||
// | point(-1, -0.2, 0.9) | vector(-1, 0, 0) |
|
||||
// | point(-0.4, 1, -0.1) | vector(0, 1, 0) |
|
||||
// | point(0.3, -1, -0.7) | vector(0, -1, 0) |
|
||||
// | point(-0.6, 0.3, 1) | vector(0, 0, 1) |
|
||||
// | point(0.4, 0.4, -1) | vector(0, 0, -1) |
|
||||
// | point(1, 1, -1) | vector(1, 0, 0) |
|
||||
// | point(-1,-1, -1) | vector(-1, 0, 0) |
|
||||
CubeTestNormal the_test[] = {
|
||||
{ Tuple::Point(1, 0.5, -0.8), Tuple::Vector(1, 0, 0)},
|
||||
{ Tuple::Point(-1, -0.2, 0.9), Tuple::Vector(-1, 0, 0)},
|
||||
{Tuple::Point(-0.4, 1, -0.1), Tuple::Vector(0, 1, 0)},
|
||||
{ Tuple::Point(0.3, -1, -0.7), Tuple::Vector(0, -1, 0)},
|
||||
{Tuple::Point(-0.6, 0.3, 1), Tuple::Vector(0, 0, 1)},
|
||||
{ Tuple::Point(0.4, 0.4, -1), Tuple::Vector(0, 0, -1)},
|
||||
{ Tuple::Point(1, 1, -1), Tuple::Vector(1, 0, 0)},
|
||||
{ Tuple::Point(-1, -1, -1), Tuple::Vector(-1, 0, 0)}
|
||||
};
|
||||
GIVEN("c <- cube()")
|
||||
{
|
||||
Cube c;
|
||||
AND_GIVEN("p <- <point>)")
|
||||
{
|
||||
WHEN("normal <- local_normal_at(p)")
|
||||
{
|
||||
for (int i = 0; i < 8; i++)
|
||||
{
|
||||
Tuple p = the_test[i].point;
|
||||
Tuple normal = c.local_normal_at(p);
|
||||
THEN("normal = <normal>")
|
||||
{
|
||||
REQUIRE(normal == the_test[i].normal);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user