Add support for point light and materials.

Add material to objects.
This commit is contained in:
Godzil
2020-02-17 19:12:57 +00:00
parent 73d60fb7e4
commit 5ebed12f4f
10 changed files with 274 additions and 1 deletions

View File

@@ -4,7 +4,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(TESTS_SRC tuple_test.cpp colour_test.cpp canvas_test.cpp matrix_test.cpp transformation_test.cpp ray_test.cpp
intersect_test.cpp sphere_test.cpp)
intersect_test.cpp sphere_test.cpp light_test.cpp material_test.cpp)
add_executable(testMyRays)
target_include_directories(testMyRays PUBLIC ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})

24
tests/light_test.cpp Normal file
View File

@@ -0,0 +1,24 @@
/*
* DoRayMe - a quick and dirty Raytracer
* Light unit tests
*
* Created by Manoël Trapier
* Copyright (c) 2020 986-Studio.
*
*/
#include <light.h>
#include <math.h>
#include <colour.h>
#include <tuple.h>
#include <gtest/gtest.h>
TEST(LightTest, A_point_lighthas_a_position_and_intensity)
{
Colour intensity = Colour(1, 1, 1);
Point position = Point(0, 0, 0);
Light light = Light(POINT_LIGHT, position, intensity);
ASSERT_EQ(light.position, position);
ASSERT_EQ(light.intensity, intensity);
}

90
tests/material_test.cpp Normal file
View File

@@ -0,0 +1,90 @@
/*
* DoRayMe - a quick and dirty Raytracer
* Material unit tests
*
* Created by Manoël Trapier
* Copyright (c) 2020 986-Studio.
*
*/
#include <material.h>
#include <math.h>
#include <colour.h>
#include <gtest/gtest.h>
TEST(MaterialTest, The_default_material)
{
Material m = Material();
ASSERT_EQ(m.colour, Colour(1, 1, 1));
ASSERT_EQ(m.ambient, 0.1);
ASSERT_EQ(m.diffuse, 0.9);
ASSERT_EQ(m.specular, 0.9);
ASSERT_EQ(m.shininess, 200.0);
}
// This is used by the next tests
static Material m = Material();
static Point position = Point(0, 0, 0);
TEST(MaterialTest, Lighting_with_the_eye_between_the_light_and_the_surface)
{
Vector eyev = Vector(0, 0, -1);
Vector normalv = Vector(0, 0, -1);
Light light = Light(POINT_LIGHT, Point(0, 0, -10), Colour(1, 1, 1));
Colour result = m.lighting(light, position, eyev, normalv);
ASSERT_EQ(result, Colour(1.9, 1.9, 1.9));
}
TEST(MaterialTest, Lighting_with_the_eye_between_the_light_and_the_surface_eye_offset_by_45)
{
Vector eyev = Vector(0, -sqrt(2)/2, -sqrt(2)/2);
Vector normalv = Vector(0, 0, -1);
Light light = Light(POINT_LIGHT, Point(0, 0, -10), Colour(1, 1, 1));
Colour result = m.lighting(light, position, eyev, normalv);
ASSERT_EQ(result, Colour(1.0, 1.0, 1.0));
}
TEST(MaterialTest, Lighting_with_the_eye_opposite_surface_light_offset_45)
{
Vector eyev = Vector(0, 0, -1);
Vector normalv = Vector(0, 0, -1);
Light light = Light(POINT_LIGHT, Point(0, 10, -10), Colour(1, 1, 1));
Colour result = m.lighting(light, position, eyev, normalv);
set_equal_precision(0.0001);
ASSERT_EQ(result, Colour(0.7364, 0.7364, 0.7364));
set_equal_precision(FLT_EPSILON);
}
TEST(MaterialTest, Lighting_with_the_eye_in_the_path_of_the_reflection_vector)
{
Vector eyev = Vector(0, -sqrt(2)/2, -sqrt(2)/2);
Vector normalv = Vector(0, 0, -1);
Light light = Light(POINT_LIGHT, Point(0, 10, -10), Colour(1, 1, 1));
Colour result = m.lighting(light, position, eyev, normalv);
set_equal_precision(0.0001);
ASSERT_EQ(result, Colour(1.6364, 1.6364, 1.6364));
set_equal_precision(FLT_EPSILON);
}
TEST(MaterialTest, Lighting_with_the_light_behind_the_surface)
{
Vector eyev = Vector(0, 0, -1);
Vector normalv = Vector(0, 0, -1);
Light light = Light(POINT_LIGHT, Point(0, 0, 10), Colour(1, 1, 1));
Colour result = m.lighting(light, position, eyev, normalv);
ASSERT_EQ(result, Colour(0.1, 0.1, 0.1));
}

View File

@@ -8,6 +8,7 @@
*/
#include <ray.h>
#include <sphere.h>
#include <material.h>
#include <transformation.h>
#include <gtest/gtest.h>
@@ -177,4 +178,24 @@ TEST(SphereTest, Computing_the_normal_on_a_tranformed_sphere)
/* Revert to default */
set_equal_precision(FLT_EPSILON);
}
TEST(SphereTest, A_sphere_have_a_default_material)
{
Sphere s = Sphere();
Material m = Material();
ASSERT_EQ(s.material, m);
}
TEST(SphereTest, A_sphere_may_be_assigned_a_material)
{
Sphere s = Sphere();
Material m = Material();
m.ambient = 1;
s.setMaterial(m);
ASSERT_EQ(s.material, m);
}