diff --git a/raytracing/CMakeLists.txt b/raytracing/CMakeLists.txt index 641936f..08a1c17 100644 --- a/raytracing/CMakeLists.txt +++ b/raytracing/CMakeLists.txt @@ -34,6 +34,7 @@ add_library(raytracing src/renderer/ray.cpp src/renderer/world.cpp + src/shapes/cube.cpp src/shapes/plane.cpp src/shapes/shape.cpp src/shapes/sphere.cpp diff --git a/raytracing/include/raytracing.h b/raytracing/include/raytracing.h index 92cece7..232ba82 100644 --- a/raytracing/include/raytracing.h +++ b/raytracing/include/raytracing.h @@ -46,5 +46,6 @@ #include "renderer/ray.h" #include "renderer/world.h" +#include "shapes/cube.h" #include "shapes/plane.h" -#include "shapes/sphere.h" +#include "shapes/sphere.h" \ No newline at end of file diff --git a/raytracing/src/shapes/cube.cpp b/raytracing/src/shapes/cube.cpp new file mode 100644 index 0000000..02ff638 --- /dev/null +++ b/raytracing/src/shapes/cube.cpp @@ -0,0 +1,54 @@ +/*! + * 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: 13/03/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 + +#include "core/common.h" +#include "core/intersections.h" + +#include "cube.h" + +using namespace Raytracer; + +/* ------------------------------------------------------------------------- */ + +Intersections Cube::local_intersect(const Ray &a_ray) +{ + Intersections the_intersections; + + return the_intersections; +} + +/* ------------------------------------------------------------------------- */ + +Tuple Cube::local_normal_at(const Tuple &a_local_point) const +{ + return Tuple::Vector(0, 1, 0); +} diff --git a/raytracing/src/shapes/cube.h b/raytracing/src/shapes/cube.h new file mode 100644 index 0000000..74d7d84 --- /dev/null +++ b/raytracing/src/shapes/cube.h @@ -0,0 +1,46 @@ +/*! + * cube.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: 13/03/2024 + * + */ + +#ifndef _RAYTRACER_CUBE_H +#define _RAYTRACER_CUBE_H + +/* ------------------------------------------------------------------------- */ + +#include "shapes/shape.h" + +/* ------------------------------------------------------------------------- */ + +namespace Raytracer +{ + class Cube : public Shape + { + public: + Cube(void) = default; + Intersections local_intersect(const Ray &a_ray) override; + Tuple local_normal_at(const Tuple &a_local_point) const override; + }; +}; // namespace Raytracer + +#endif // _RAYTRACER_CUBE_H diff --git a/tests/12_cubes.cpp b/tests/12_cubes.cpp new file mode 100644 index 0000000..ddbd9f0 --- /dev/null +++ b/tests/12_cubes.cpp @@ -0,0 +1,68 @@ +/*! + * 12_cubes.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: 13/03/2024 + * + */ + +/*---------------------------------------------------------------------------*/ + +#include + +#include "raytracing.h" + +using namespace Raytracer; + +/* ------------------------------------------------------------------------- */ + +SCENARIO("Reflectivity for the default material", "[features/cubes.feature]") +{ + // | | origin | direction | t1 | t2 | + // | +x | point(5, 0.5, 0) | vector(-1, 0, 0) | 4 | 6 | + // | -x | point(-5, 0.5, 0) | vector( 1, 0, 0) | 4 | 6 | + // | +y | point(0.5, 5, 0) | vector( 0,-1, 0) | 4 | 6 | + // | -y | point(0.5, -5, 0) | vector( 0, 1, 0) | 4 | 6 | + // | +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 | + GIVEN("c <- cube()") + { + Cube c; + AND_GIVEN("r <- ray(, )") + { + WHEN("xs <- local_intersect(c,r)") + { + THEN("xs.count = 2") + { + // REQUIRE(); + } + AND_THEN("xs[0].t = ") + { + // REQUIRE(); + } + AND_THEN("xs[1].t = ") + { + // REQUIRE(); + } + } + } + } +} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 797808f..3fe1ef4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -22,6 +22,7 @@ add_executable(raytracing_test 09_planes.cpp 10_patterns.cpp 11_reflection_refraction.cpp + 12_cubes.cpp ) include_directories("${CMAKE_SOURCE_DIR}/tests")