Error in merging, replaced flip_normals with flip_face

Author: trevordblack

books/RayTracingTheNextWeek.html

@@ -1991,16 +1991,16 @@
         material *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+        objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         objects.add(new yz_rect(0, 555, 0, 555, 0, red));
         objects.add(new xz_rect(213, 343, 227, 332, 554, light));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+        objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
         objects.add(new xz_rect(0, 555, 0, 555, 0, white));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
-        objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+        objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
 
         return objects;
@@ -2448,12 +2448,12 @@
         auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
         auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
 
-        objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+        objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
         objects.add(new yz_rect(0, 555, 0, 555, 0, red));
         objects.add(new xz_rect(113, 443, 127, 432, 554, light));
-        objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+        objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
         objects.add(new xz_rect(0, 555, 0, 555, 0, white));
-        objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+        objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
         hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
         box1 = new rotate_y(box1,  15);

books/RayTracingTheRestOfYourLife.html

@@ -736,12 +736,12 @@
         auto *green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
         auto *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
 
-        world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+        world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
         world.add(new yz_rect(0, 555, 0, 555, 0, red));
         world.add(new xz_rect(213, 343, 227, 332, 554, light));
-        world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+        world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
         world.add(new xz_rect(0, 555, 0, 555, 0, white));
-        world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+        world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
         hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
         box1 = new rotate_y(box1, 15);
@@ -1972,12 +1972,12 @@
         auto *green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
         auto *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
 
-        world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+        world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
         world.add(new yz_rect(0, 555, 0, 555, 0, red));
         world.add(new xz_rect(213, 343, 227, 332, 554, light));
-        world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+        world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
         world.add(new xz_rect(0, 555, 0, 555, 0, white));
-        world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+        world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
         material *aluminum = new metal(vec3(0.8, 0.85, 0.88), 0.0);

src/TheNextWeek/box.h

@@ -38,11 +38,11 @@ box::box(const vec3& p0, const vec3& p1, material *ptr) {
     box_max = p1;
 
     sides.add(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p1.z(), ptr));
-    sides.add(new flip_normals(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
+    sides.add(new flip_face(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
     sides.add(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p1.y(), ptr));
-    sides.add(new flip_normals(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
+    sides.add(new flip_face(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
     sides.add(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p1.x(), ptr));
-    sides.add(new flip_normals(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
+    sides.add(new flip_face(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
 }
 
 bool box::hit(const ray& r, double t0, double t1, hit_record& rec) const {

src/TheNextWeek/main.cc

@@ -147,12 +147,12 @@ hittable_list cornell_box() {
     auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
     auto light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
 
-    objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+    objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     objects.add(new yz_rect(0, 555, 0, 555, 0, red));
     objects.add(new xz_rect(213, 343, 227, 332, 554, light));
-    objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     objects.add(new xz_rect(0, 555, 0, 555, 0, white));
-    objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     hittable* box1 = new box(vec3(0, 0, 0), vec3(165, 330, 165), white);
     box1 = new rotate_y(box1,  15);
@@ -176,12 +176,12 @@ hittable_list cornell_balls() {
     auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
     auto light = new diffuse_light(new constant_texture(vec3(5, 5, 5)));
 
-    objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+    objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     objects.add(new yz_rect(0, 555, 0, 555, 0, red));
     objects.add(new xz_rect(113, 443, 127, 432, 554, light));
-    objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     objects.add(new xz_rect(0, 555, 0, 555, 0, white));
-    objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     hittable* boundary = new sphere(vec3(160, 100, 145), 100, new dielectric(1.5));
     objects.add(boundary);
@@ -204,12 +204,12 @@ hittable_list cornell_smoke() {
     auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
     auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
 
-    objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+    objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     objects.add(new yz_rect(0, 555, 0, 555, 0, red));
     objects.add(new xz_rect(113, 443, 127, 432, 554, light));
-    objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     objects.add(new xz_rect(0, 555, 0, 555, 0, white));
-    objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
     box1 = new rotate_y(box1,  15);
@@ -241,12 +241,12 @@ hittable_list cornell_final() {
     auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
     auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
 
-    objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+    objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     objects.add(new yz_rect(0, 555, 0, 555, 0, red));
     objects.add(new xz_rect(123, 423, 147, 412, 554, light));
-    objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     objects.add(new xz_rect(0, 555, 0, 555, 0, white));
-    objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+    objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     hittable* boundary2 = new box(vec3(0,0,0), vec3(165,165,165), new dielectric(1.5));
     boundary2 = new rotate_y(boundary2, -18);

src/TheRestOfYourLife/box.h

@@ -38,11 +38,11 @@ box::box(const vec3& p0, const vec3& p1, material *ptr) {
     box_max = p1;
 
     sides.add(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p1.z(), ptr));
-    sides.add(new flip_normals(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
+    sides.add(new flip_face(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
     sides.add(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p1.y(), ptr));
-    sides.add(new flip_normals(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
+    sides.add(new flip_face(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
     sides.add(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p1.x(), ptr));
-    sides.add(new flip_normals(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
+    sides.add(new flip_face(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
 }
 
 bool box::hit(const ray& r, double t0, double t1, hit_record& rec) const {

src/TheRestOfYourLife/main.cc

@@ -61,12 +61,12 @@ hittable_list cornell_box(camera& cam, double aspect) {
     auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
     auto light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
 
-    world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
+    world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
     world.add(new yz_rect(0, 555, 0, 555, 0, red));
-    world.add(new flip_normals(new xz_rect(213, 343, 227, 332, 554, light)));
-    world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
+    world.add(new flip_face(new xz_rect(213, 343, 227, 332, 554, light)));
+    world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
     world.add(new xz_rect(0, 555, 0, 555, 0, white));
-    world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
+    world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
 
     hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
     box1 = new rotate_y(box1, 15);