raytracing/raytracer_challenge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ADD] add a skeleton of the group and refactor some test datas.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2024-03-22 11:59:00 +01:00
parent b3490b146e
commit f05603cb29
15 changed files with 403 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/00_common_data.cpp Normal file
View File

@@ -0,0 +1,54 @@
/*!
* 00_common_data.cpp
*
* Copyright (c) 2015-2024, NADAL Jean-Baptiste. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA
*
* @Author: NADAL Jean-Baptiste
* @Date: 22/03/2024
*
*/
/*---------------------------------------------------------------------------*/
#include <core/intersections.h>
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
Intersections TestShape::local_intersect(const Ray &a_ray)
{
saved_ray = a_ray;
return Intersections();
}
/* ------------------------------------------------------------------------- */
Tuple TestShape::local_normal_at(const Tuple &a_local_point) const
{
return Tuple::Vector(a_local_point.x(), a_local_point.y(), a_local_point.z());
}
/* ------------------------------------------------------------------------- */
const Color TestPattern::pattern_at(const Tuple &a_point) const
{
return Color(a_point.x(), a_point.y(), a_point.z());
}

30
tests/09_planes.cpp
View File

@@ -31,38 +31,12 @@
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
class TestShape : public Shape
{
public:
TestShape(void) = default;
Intersections local_intersect(const Ray &a_ray) override
{
saved_ray = a_ray;
return Intersections();
}
Tuple local_normal_at(const Tuple &a_local_point) const override
{
return Tuple::Vector(a_local_point.x(), a_local_point.y(), a_local_point.z());
}
Ray saved_ray;
};
/* ------------------------------------------------------------------------- */
TestShape test_shape(void)
{
return TestShape();
}
/* ------------------------------------------------------------------------- */
SCENARIO("The default transformation", "[features/shapes.feature]")
{
GIVEN("s <- test_shape()")

15
tests/10_patterns.cpp
View File

@@ -29,23 +29,12 @@
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
class TestPattern : public Pattern
{
public:
TestPattern(void) = default;
const Color pattern_at(const Tuple &a_point) const override
{
return Color(a_point.x(), a_point.y(), a_point.z());
}
};
/* ------------------------------------------------------------------------- */
SCENARIO("Creating a stripe pattern", "[features/patterns.feature]")
{
GIVEN("pattern <- stripe_pattern(white, black)")

15
tests/11_reflection_refraction.cpp
View File

@@ -31,23 +31,12 @@
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
class TestPattern : public Pattern
{
public:
TestPattern(void) = default;
const Color pattern_at(const Tuple &a_point) const override
{
return Color(a_point.x(), a_point.y(), a_point.z());
}
};
/* ------------------------------------------------------------------------- */
SCENARIO("Reflectivity for the default material", "[features/materials.feature]")
{
GIVEN("m <- material()")

28
tests/12_cubes.cpp
View File

@@ -29,30 +29,12 @@
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
class CubeTestIntersect
{
public:
Tuple origin;
Tuple direction;
double t1;
double t2;
};
/* ------------------------------------------------------------------------- */
class CubeTestNormal
{
public:
Tuple point;
Tuple normal;
};
/* ------------------------------------------------------------------------- */
SCENARIO("A Ray intersects a cube", "[features/cubes.feature]")
{
// | | origin | direction | t1 | t2 |
@@ -63,7 +45,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 |
CubeTestIntersect the_test[] = {
DataOrigDirT1T2 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},
@@ -113,7 +95,7 @@ SCENARIO("A Ray misses a cube", "[features/cubes.feature]")
// | 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[] = {
DataOrigDirT1T2 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},
@@ -155,7 +137,7 @@ SCENARIO("The normal on the surface of a cube", "[features/cubes.feature]")
// | 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[] = {
DataPointNormal 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)},

60
tests/13_cylinders.cpp
View File

@@ -29,57 +29,19 @@
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
class CylinderTestIntersect
{
public:
Tuple origin;
Tuple direction;
double t0 = -1;
double t1 = -1;
};
/* ------------------------------------------------------------------------- */
class CylinderTestNormal
{
public:
Tuple point;
Tuple normal;
};
/* ------------------------------------------------------------------------- */
class CylinderTestConstrained
{
public:
Tuple point;
Tuple direction;
uint16_t count;
};
/* ------------------------------------------------------------------------- */
class ConeTestConstrained
{
public:
Tuple origin;
Tuple direction;
uint16_t count;
};
/* ------------------------------------------------------------------------- */
SCENARIO("A Ray misses a cylinder", "[features/cylinders.feature]")
{
// | origin | direction |
// | point(1, 0, 0) | vector(0, 1, 0) |
// | point(0, 0, 0) | vector(0, 1, 0) |
// | point(0, 0, -5) | vector(1, 1, 1) |
CylinderTestIntersect the_test[] = {
DataOrigDirT0T1 the_test[] = {
{Tuple::Point(1, 0, 0), Tuple::Vector(0, 1, 0)},
{Tuple::Point(0, 0, 0), Tuple::Vector(0, 1, 0)},
{Tuple::Point(0, 0, -5), Tuple::Vector(1, 1, 1)}
@@ -114,7 +76,7 @@ SCENARIO("A Ray strikes a cylinder", "[features/cylinders.feature]")
// | point(1, 0, -5) | vector(0, 0, 1) | 5 | 5 |
// | point(0, 0, -5) | vector(0, 0, 1) | 4 | 6 |
// | point(0.5, 0, -5) | vector(0.1, 1, 1) | 6.80798 | 7.08872 |
CylinderTestIntersect the_test[] = {
DataOrigDirT0T1 the_test[] = {
{ Tuple::Point(1, 0, -5), Tuple::Vector(0, 0, 1), 5, 5},
{ Tuple::Point(0, 0, -5), Tuple::Vector(0, 0, 1), 4, 6},
{Tuple::Point(0.5, 0, -5), Tuple::Vector(0.1, 1, 1), 6.80798, 7.08872}
@@ -161,7 +123,7 @@ SCENARIO("Normal vector on a cylinder", "[features/cylinders.feature]")
// | point(0, 5, -1) | vector(0, 0, -1) |
// | point(0, -2, 1) | vector(0, 0, 1) |
// | point(-1, 1, 0) | vector(-1, 0, 0) |
CylinderTestNormal the_test[] = {
DataPointNormal the_test[] = {
{ Tuple::Point(1, 0, 0), Tuple::Vector(1, 0, 0)},
{ Tuple::Point(0, 5, -1), Tuple::Vector(0, 0, -1)},
{ Tuple::Point(0, -2, 1), Tuple::Vector(0, 0, 1)},
@@ -215,7 +177,7 @@ SCENARIO("Intersecting a constrained cylinder", "[features/cylinders.feature]")
// | 4 | point(0, 2, -5) | vector(0, 0, 1) | 0 |
// | 5 | point(0, 1, -5) | vector(0, 0, 1) | 0 |
// | 6 | point(0, 1.5, -2) | vector(0, 0, 1) | 2 |
CylinderTestConstrained the_test[] = {
DataPointDirCount the_test[] = {
{Tuple::Point(0, 1.5, 0), Tuple::Vector(0.1, 1, 0), 0},
{Tuple::Point(0, 3, -5), Tuple::Vector(0, 0, 1), 0},
{Tuple::Point(0, 0, -5), Tuple::Vector(0, 0, 1), 0},
@@ -280,7 +242,7 @@ SCENARIO("Intersecting the caps of a closed cylinder", "[features/cylinders.feat
// | 3 | point(0, 4, -2) | vector(0, -1, 1) | 2 | # corner case
// | 4 | point(0, 0, -2) | vector(0, 1, 2) | 2 |
// | 5 | point(0, -1, -2) | vector(0, 1, 1) | 2 | # corner case
CylinderTestConstrained the_test[] = {
DataPointDirCount the_test[] = {
{Tuple::Point(0, 3, 0), Tuple::Vector(0, -1, 0), 2},
{Tuple::Point(0, 3, -2), Tuple::Vector(0, -1, 2), 2},
{Tuple::Point(0, 4, -2), Tuple::Vector(0, -1, 1), 2},
@@ -335,7 +297,7 @@ SCENARIO("The normal vector on the cylinder's end caps", "[features/cylinders.fe
// | point(0, 2, 0) | vector(0, 1, 0) |
// | point(0.5, 2, 0) | vector(0, 1, 0) |
// | point(0, 2, 0.5) | vector(0, 1, 0) |
CylinderTestNormal the_test[] = {
DataPointNormal the_test[] = {
{ Tuple::Point(0, 1, 0), Tuple::Vector(0, -1, 0)},
{Tuple::Point(0.5, 1, 0), Tuple::Vector(0, -1, 0)},
{ Tuple::Point(0, 1, 0.5), Tuple::Vector(0, -1, 0)},
@@ -381,7 +343,7 @@ SCENARIO("Intersecting a cone with a ray", "[features/cones.feature]")
// | point(0, 0, -5) | vector(0, 0, 1) | 5 | 5 |
// | point(0, 0, -5) | vector(1, 1, 1) | 8.66025 | 8.66025 |
// | point(1, 1, -5) | vector(-0.5, -1, 1) | 4.55006 | 49.44994 |
CylinderTestIntersect the_test[] = {
DataOrigDirT0T1 the_test[] = {
{Tuple::Point(0, 0, -5), Tuple::Vector(0, 0, 1), 5, 5},
{Tuple::Point(0, 0, -5), Tuple::Vector(1, 1, 1), 8.66025, 8.66025},
{Tuple::Point(1, 1, -5), Tuple::Vector(-0.5, -1, 1), 4.55006, 49.44994}
@@ -458,7 +420,7 @@ SCENARIO("Intersecting a cone's end caps", "[features/cones.feature]")
// | point(0, 0, -0.25) | vector(0, 1, 1) | 2 |
// | point(0, 0, -0.25) | vector(0, 1, 0) | 4 |
ConeTestConstrained the_test[] = {
DataOrigDirCount the_test[] = {
{Tuple::Point(0, 0, -5), Tuple::Vector(0, 1, 0), 0},
{Tuple::Point(0, 0, -0.25), Tuple::Vector(0, 1, 1), 2},
{Tuple::Point(0, 0, -0.25), Tuple::Vector(0, 1, 0), 4}
@@ -508,7 +470,7 @@ SCENARIO("Computing the normal vector on a cone", "[features/cones.feature]")
// | point(0, 0, 0) | vector(0, 0, 0) |
// | point(1, 1, 1) | vector(1, -sqrt(2), 1) |
// | point(-1, -1, 0) | vector(-1, 1, 0) |
CylinderTestNormal the_test[] = {
DataPointNormal the_test[] = {
{ Tuple::Point(0, 0, 0), Tuple::Vector(0, 0, 0)},
{ Tuple::Point(1, 1, 1), Tuple::Vector(1, -sqrt(2), 1)},
{Tuple::Point(-1, -1, 0), Tuple::Vector(-1, 1, 0)}

66
tests/14_groups.cpp Normal file
View File

@@ -0,0 +1,66 @@
/*!
* 14_groups.cpp
*
* Copyright (c) 2015-2024, NADAL Jean-Baptiste. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA
*
* @Author: NADAL Jean-Baptiste
* @Date: 21/03/2024
*
*/
/*---------------------------------------------------------------------------*/
#include <catch2/catch_test_macros.hpp>
#include "raytracing.h"
#include "common_data.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
SCENARIO("Creating a new group", "[features/groups.feature]")
{
GIVEN("g <- group()")
{
Group g;
THEN("g.transform = identity_matrix")
{
REQUIRE(g.transform() == Matrix::identity());
}
AND_THEN("g is empty")
{
REQUIRE(g.is_empty() == true);
}
}
}
/* ------------------------------------------------------------------------- */
SCENARIO("A shape has a parent attribute", "[features/shapes.feature]")
{
GIVEN("s <- test_shape()")
{
TestShape s;
THEN("s.parent is nothing")
{
REQUIRE(s.parent() == nullptr);
}
}
}

2
tests/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(raytracing_test
main_test.cpp
00_common_data.cpp
01_tuples.cpp
02_1_colors.cpp
02_2_canvas.cpp
@@ -26,6 +27,7 @@ add_executable(raytracing_test
11_reflection_refraction.cpp
12_cubes.cpp
13_cylinders.cpp
14_groups.cpp
)
include_directories("${CMAKE_SOURCE_DIR}/tests")

114
tests/common_data.h Normal file
View File

@@ -0,0 +1,114 @@
/*!
* sphere.h
*
* Copyright (c) 2024, NADAL Jean-Baptiste. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA
*
* @Author: NADAL Jean-Baptiste
* @Date: 22/03/2024
*
*/
#ifndef _RAYTRACER_COMMON_DATA_H
#define _RAYTRACER_COMMON_DATA_H
/* ------------------------------------------------------------------------- */
#include <core/tuple.h>
#include <patterns/pattern.h>
#include <shapes/shape.h>
/* ------------------------------------------------------------------------- */
namespace Raytracer
{
class TestShape : public Shape
{
public:
TestShape(void) = default;
Intersections local_intersect(const Ray &a_ray) override;
Tuple local_normal_at(const Tuple &a_local_point) const override;
Ray saved_ray;
};
/* ------------------------------------------------------------------------- */
class TestPattern : public Pattern
{
public:
TestPattern(void) = default;
const Color pattern_at(const Tuple &a_point) const override;
};
/* ------------------------------------------------------------------------- */
class DataOrigDirT1T2
{
public:
Tuple origin;
Tuple direction;
double t1;
double t2;
};
/* ------------------------------------------------------------------------- */
class DataOrigDirT0T1
{
public:
Tuple origin;
Tuple direction;
double t0 = -1;
double t1 = -1;
};
/* ------------------------------------------------------------------------- */
class DataPointNormal
{
public:
Tuple point;
Tuple normal;
};
/* ------------------------------------------------------------------------- */
class DataPointDirCount
{
public:
Tuple point;
Tuple direction;
uint16_t count;
};
/* ------------------------------------------------------------------------- */
class DataOrigDirCount
{
public:
Tuple origin;
Tuple direction;
uint16_t count;
};
} // namespace Raytracer
#endif // _RAYTRACER_COMMON_DATA_H