godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the Intersection to a class, and stop using memory allocation for it (and pointer)

Browse Source 
A bit more clean (on the code side)
This commit is contained in:
Godzil
2020-02-17 11:48:29 +00:00
parent 513cd9d7eb
commit 1900d1f45d
6 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/intersect_test.cpp
View File

@@ -17,35 +17,46 @@ TEST(IntersectTest, Creating_an_intersect_and_do_some_check)
ASSERT_EQ(i.count(), 0);
i.add(newIntersection(1.0, nullptr));
i.add(newIntersection(4.2, nullptr));
i.add(Intersection(1.0, nullptr));
i.add(Intersection(4.2, nullptr));
ASSERT_EQ(i.count(), 2);
ASSERT_EQ(i[0]->t, 1.0);
ASSERT_EQ(i[1]->t, 4.2);
ASSERT_EQ(i[0].t, 1.0);
ASSERT_EQ(i[1].t, 4.2);
}
TEST(IntersectTest, An_intersection_encapsulate_t_and_object)
{
Sphere s = Sphere();
Intersection *i = newIntersection(3.5, &s);
Intersection i = Intersection(3.5, &s);
ASSERT_EQ(i->t, 3.5);
ASSERT_EQ(i->object, (Object *)&s);
ASSERT_EQ(i.t, 3.5);
ASSERT_EQ(i.object, (Object *)&s);
}
TEST(IntersectTest, Aggregating_intersections)
{
Sphere s = Sphere();
Intersection *i1 = newIntersection(1, &s);
Intersection *i2 = newIntersection(2, &s);
Intersection i1 = Intersection(1, &s);
Intersection i2 = Intersection(2, &s);
Intersect xs = Intersect();
xs.add(i1);
xs.add(i2);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0]->t, 1);
ASSERT_EQ(xs[1]->t, 2);
ASSERT_EQ(xs[0].t, 1);
ASSERT_EQ(xs[1].t, 2);
}
TEST(IntersectTest, Intersect_sets_the_object_on_the_intersection)
{
Ray r = Ray(Point(0, 0, -5), Vector(0, 0, 1));
Sphere s = Sphere();
Intersect xs = s.intersect(r);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0].object, (Object *)&s);
ASSERT_EQ(xs[1].object, (Object *)&s);
}

16
tests/sphere_test.cpp
View File

@@ -18,8 +18,8 @@ TEST(SphereTest, A_ray_intersect_a_sphere_at_two_points)
Intersect xs = s.intersect(r);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0]->t, 4.0);
ASSERT_EQ(xs[1]->t, 6.0);
ASSERT_EQ(xs[0].t, 4.0);
ASSERT_EQ(xs[1].t, 6.0);
}
TEST(SphereTest, A_ray_intersect_a_sphere_at_a_tangent)
@@ -29,8 +29,8 @@ TEST(SphereTest, A_ray_intersect_a_sphere_at_a_tangent)
Intersect xs = s.intersect(r);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0]->t, 5.0);
ASSERT_EQ(xs[1]->t, 5.0);
ASSERT_EQ(xs[0].t, 5.0);
ASSERT_EQ(xs[1].t, 5.0);
}
TEST(SphereTest, A_ray_miss_a_sphere)
@@ -49,8 +49,8 @@ TEST(SphereTest, A_ray_originate_inside_a_sphere)
Intersect xs = s.intersect(r);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0]->t, -1.0);
ASSERT_EQ(xs[1]->t, 1.0);
ASSERT_EQ(xs[0].t, -1.0);
ASSERT_EQ(xs[1].t, 1.0);
}
TEST(SphereTest, A_sphere_is_behind_a_ray)
@@ -60,6 +60,6 @@ TEST(SphereTest, A_sphere_is_behind_a_ray)
Intersect xs = s.intersect(r);
ASSERT_EQ(xs.count(), 2);
ASSERT_EQ(xs[0]->t, -6.0);
ASSERT_EQ(xs[1]->t, -4.0);
ASSERT_EQ(xs[0].t, -6.0);
ASSERT_EQ(xs[1].t, -4.0);
}