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

[WIP] Add ray and sphere basic

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2024-02-05 23:33:48 +01:00
parent 4251291170
commit 480d8c56da
8 changed files with 353 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
raytracing/CMakeLists.txt
View File

@@ -12,6 +12,8 @@ add_library(raytracing
src/color.cpp src/color.cpp
src/canvas.cpp src/canvas.cpp
src/matrix.cpp src/matrix.cpp
src/ray.cpp
src/sphere.cpp
) )
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}

2
raytracing/include/raytracing.h
View File

@@ -28,4 +28,6 @@
#include "color.h" #include "color.h"
#include "common.h" #include "common.h"
#include "matrix.h" #include "matrix.h"
#include "ray.h"
#include "sphere.h"
#include "tuple.h" #include "tuple.h"

86
raytracing/src/ray.cpp Normal file
View File

@@ -0,0 +1,86 @@
/*!
* ray.cpp
*
* 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: 05/02/2024
*
*/
// This is an independent project of an individual developer. Dear PVS-Studio, please check it.
// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
/* ------------------------------------------------------------------------- */
#include <cmath>
#include "common.h"
#include "ray.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
Ray::Ray(Tuple an_origin, Tuple a_direction) : m_origin(an_origin), m_direction(a_direction)
{
}
/* ------------------------------------------------------------------------- */
const Tuple &Ray::origin(void) const
{
return m_origin;
}
/* ------------------------------------------------------------------------- */
const Tuple &Ray::direction(void) const
{
return m_direction;
}
/* ------------------------------------------------------------------------- */
Tuple Ray::position(double a_distance)
{
return m_origin + m_direction * a_distance;
}
/* ------------------------------------------------------------------------- */
std::vector<double> Ray::intersect(Sphere a_sphere)
{
std::vector<double> the_result;
Tuple the_sphere_to_ray = m_origin - Tuple::Point(0, 0, 0);
double the_a = m_direction.dot(m_direction);
double the_b = 2 * m_direction.dot(the_sphere_to_ray);
double the_c = the_sphere_to_ray.dot(the_sphere_to_ray) - 1;
double discriminant = std::pow(the_b, 2) - 4 * the_a * the_c;
if (discriminant >= 0)
{
the_result.resize(2);
the_result[0] = (-the_b - std::sqrt(discriminant)) / (2 * the_a);
the_result[1] = (-the_b + std::sqrt(discriminant)) / (2 * the_a);
}
return the_result;
}

57
raytracing/src/ray.h Normal file
View File

@@ -0,0 +1,57 @@
/*!
* ray.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: 05/02/2024
*
*/
#ifndef _RAYTRACER_RAY_H
#define _RAYTRACER_RAY_H
/* ------------------------------------------------------------------------- */
#include <vector>
#include "sphere.h"
#include "tuple.h"
/* ------------------------------------------------------------------------- */
namespace Raytracer
{
class Ray
{
public:
Ray(Tuple an_origin, Tuple a_direction);
const Tuple &origin(void) const;
const Tuple &direction(void) const;
Tuple position(double a_distance);
std::vector<double> intersect(Sphere a_sphere);
private:
Tuple m_origin;
Tuple m_direction;
};
}; // namespace Raytracer
#endif // _RAYTRACER_RAY_H

40
raytracing/src/sphere.cpp Normal file
View File

@@ -0,0 +1,40 @@
/*!
* sphere.cpp
*
* 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: 05/02/2024
*
*/
// This is an independent project of an individual developer. Dear PVS-Studio, please check it.
// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
/* ------------------------------------------------------------------------- */
#include "sphere.h"
#include "common.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
Sphere::Sphere(void)
{
}

44
raytracing/src/sphere.h Normal file
View File

@@ -0,0 +1,44 @@
/*!
* 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: 05/02/2024
*
*/
#ifndef _RAYTRACER_SPHERE_H
#define _RAYTRACER_SPHERE_H
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
namespace Raytracer
{
class Sphere
{
public:
Sphere(void);
private:
};
}; // namespace Raytracer
#endif // _RAYTRACER_SPHERE_H

121
tests/05_rays.cpp Normal file
View File

@@ -0,0 +1,121 @@
/*!
* 05_rays.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: 05/02/2024
*
*/
/*---------------------------------------------------------------------------*/
#include <catch.hpp>
#include "raytracing.h"
using namespace Raytracer;
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] Creating and querying a ray", "[Rays]")
{
Tuple origin = Tuple::Point(1, 2, 3);
Tuple direction = Tuple::Vector(4, 5, 6);
Ray r(origin, direction);
REQUIRE(r.origin() == origin);
REQUIRE(r.direction() == direction);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] Computing a point from a distance", "[Rays]")
{
Ray r(Tuple::Point(2, 3, 4), Tuple::Vector(1, 0, 0));
REQUIRE(r.position(0) == Tuple::Point(2, 3, 4));
REQUIRE(r.position(1) == Tuple::Point(3, 3, 4));
REQUIRE(r.position(-1) == Tuple::Point(1, 3, 4));
REQUIRE(r.position(2.5) == Tuple::Point(4.5, 3, 4));
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] a ray intersects a sphere at two points", "[Rays]")
{
Ray r(Tuple::Point(0, 0, -5), Tuple::Vector(0, 0, 1));
Sphere s;
auto xs = r.intersect(s);
REQUIRE(xs.size() == 2);
REQUIRE(xs[0] == 4.0);
REQUIRE(xs[1] == 6.0);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] a ray intersects a sphere at a tangent", "[Rays]")
{
Ray r(Tuple::Point(0, 1, -5), Tuple::Vector(0, 0, 1));
Sphere s;
auto xs = r.intersect(s);
REQUIRE(xs.size() == 2);
REQUIRE(xs[0] == 5.0);
REQUIRE(xs[1] == 5.0);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] a ray misses a sphere", "[Rays]")
{
Ray r(Tuple::Point(0, 2, -5), Tuple::Vector(0, 0, 1));
Sphere s;
auto xs = r.intersect(s);
REQUIRE(xs.size() == 0);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] a originates inside a sphere", "[Rays]")
{
Ray r(Tuple::Point(0, 0, 0), Tuple::Vector(0, 0, 1));
Sphere s;
auto xs = r.intersect(s);
REQUIRE(xs.size() == 2);
REQUIRE(xs[0] == -1.0);
REQUIRE(xs[1] == 1.0);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[05][Rays] a sphere is behind a ray", "[Rays]")
{
Ray r(Tuple::Point(0, 0, 5), Tuple::Vector(0, 0, 1));
Sphere s;
auto xs = r.intersect(s);
REQUIRE(xs.size() == 2);
REQUIRE(xs[0] == -6.0);
REQUIRE(xs[1] == -4.0);
}

1
tests/CMakeLists.txt
View File

@@ -15,6 +15,7 @@ add_executable(main_test
02_2_canvas.cpp 02_2_canvas.cpp
03_matrix.cpp 03_matrix.cpp
04_transformations.cpp 04_transformations.cpp
05_rays.cpp
) )
include_directories("${CMAKE_SOURCE_DIR}/tests") include_directories("${CMAKE_SOURCE_DIR}/tests")