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

[FIX] Fix a warning in the hit test

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2024-02-14 11:28:15 +01:00
parent 3e5a92ac91
commit a9520b89f1
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
raytracing/src/intersection.cpp
View File

@@ -36,13 +36,14 @@ using namespace Raytracer;
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
Intersection::Intersection(void) : m_distance_t(0.0), m_object() Intersection::Intersection(void) : m_is_nothing(true), m_distance_t(0.0), m_object()
{ {
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
Intersection::Intersection(double a_distance_t, const Object &an_object) : Intersection::Intersection(double a_distance_t, const Object &an_object) :
m_is_nothing(true),
m_distance_t(a_distance_t), m_distance_t(a_distance_t),
m_object(an_object) m_object(an_object)
{ {
@@ -51,6 +52,7 @@ Intersection::Intersection(double a_distance_t, const Object &an_object) :
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
Intersection::Intersection(Intersection &an_intersection) : Intersection::Intersection(Intersection &an_intersection) :
m_is_nothing(an_intersection.m_is_nothing),
m_distance_t(an_intersection.m_distance_t), m_distance_t(an_intersection.m_distance_t),
m_object(an_intersection.m_object) m_object(an_intersection.m_object)
{ {
@@ -59,6 +61,7 @@ Intersection::Intersection(Intersection &an_intersection) :
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
Intersection::Intersection(const Intersection &an_intersection) : Intersection::Intersection(const Intersection &an_intersection) :
m_is_nothing(an_intersection.m_is_nothing),
m_distance_t(an_intersection.m_distance_t), m_distance_t(an_intersection.m_distance_t),
m_object(an_intersection.m_object) m_object(an_intersection.m_object)
{ {
@@ -73,6 +76,7 @@ const Intersection &Intersection::operator=(const Intersection &an_intersection)
return *this; return *this;
} }
m_is_nothing = an_intersection.m_is_nothing;
m_distance_t = an_intersection.m_distance_t; m_distance_t = an_intersection.m_distance_t;
m_object = an_intersection.m_object; m_object = an_intersection.m_object;
@@ -141,3 +145,10 @@ const Object &Intersection::object(void) const
{ {
return m_object; return m_object;
} }
/* ------------------------------------------------------------------------- */
bool Intersection::is_nothing(void)
{
return m_is_nothing;
}

2
raytracing/src/intersection.h
View File

@@ -56,8 +56,10 @@ namespace Raytracer
double distance_t(void) const; double distance_t(void) const;
const Object &object(void) const; const Object &object(void) const;
bool is_nothing(void);
private: private:
bool m_is_nothing;
double m_distance_t; double m_distance_t;
Object m_object; Object m_object;
}; };

3
tests/05_rays.cpp
View File

@@ -421,8 +421,7 @@ SCENARIO("The hit, when all intersections have negative t", "[features/intersect
auto i = xs.hit(); auto i = xs.hit();
THEN("i is nothing") THEN("i is nothing")
{ {
#warning TODO REQUIRE(i.is_nothing());
// REQUIRE(i.has_value());
} }
} }
} }

7
tests/CMakeLists.txt
View File

@@ -1,13 +1,13 @@
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
project(main_test) project(raytracing_test)
enable_testing() enable_testing()
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(main_test add_executable(raytracing_test
main_test.cpp main_test.cpp
01_tuples.cpp 01_tuples.cpp
@@ -20,5 +20,4 @@ add_executable(main_test
include_directories("${CMAKE_SOURCE_DIR}/tests") include_directories("${CMAKE_SOURCE_DIR}/tests")
target_link_libraries(main_test target_link_libraries(raytracing_test PRIVATE raytracing)
PRIVATE raytracing)