Skip to content

Commit f4b0c98

Browse files
trevordblacktrevordblack
committed
Error in merging, replaced flip_normals with flip_face
1 parent dffe4d2 commit f4b0c98

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎books/RayTracingTheNextWeek.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,16 +1991,16 @@
19911991
material *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
19921992

19931993
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
1994-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
1994+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
19951995
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
19961996
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
19971997
objects.add(new xz_rect(213, 343, 227, 332, 554, light));
19981998
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
1999-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
1999+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
20002000
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
20012001
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
20022002
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2003-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
2003+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
20042004
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
20052005

20062006
return objects;
@@ -2448,12 +2448,12 @@
24482448
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
24492449
auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
24502450

2451-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
2451+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
24522452
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
24532453
objects.add(new xz_rect(113, 443, 127, 432, 554, light));
2454-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
2454+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
24552455
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
2456-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
2456+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
24572457

24582458
hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
24592459
box1 = new rotate_y(box1, 15);

‎books/RayTracingTheRestOfYourLife.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -736,12 +736,12 @@
736736
auto *green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
737737
auto *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
738738

739-
world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
739+
world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
740740
world.add(new yz_rect(0, 555, 0, 555, 0, red));
741741
world.add(new xz_rect(213, 343, 227, 332, 554, light));
742-
world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
742+
world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
743743
world.add(new xz_rect(0, 555, 0, 555, 0, white));
744-
world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
744+
world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
745745

746746
hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
747747
box1 = new rotate_y(box1, 15);
@@ -1972,12 +1972,12 @@
19721972
auto *green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
19731973
auto *light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
19741974

1975-
world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
1975+
world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
19761976
world.add(new yz_rect(0, 555, 0, 555, 0, red));
19771977
world.add(new xz_rect(213, 343, 227, 332, 554, light));
1978-
world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
1978+
world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
19791979
world.add(new xz_rect(0, 555, 0, 555, 0, white));
1980-
world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
1980+
world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
19811981

19821982
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
19831983
material *aluminum = new metal(vec3(0.8, 0.85, 0.88), 0.0);

‎src/TheNextWeek/box.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ box::box(const vec3& p0, const vec3& p1, material *ptr) {
3838
box_max = p1;
3939

4040
sides.add(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p1.z(), ptr));
41-
sides.add(new flip_normals(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
41+
sides.add(new flip_face(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
4242
sides.add(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p1.y(), ptr));
43-
sides.add(new flip_normals(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
43+
sides.add(new flip_face(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
4444
sides.add(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p1.x(), ptr));
45-
sides.add(new flip_normals(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
45+
sides.add(new flip_face(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
4646
}
4747

4848
bool box::hit(const ray& r, double t0, double t1, hit_record& rec) const {

‎src/TheNextWeek/main.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ hittable_list cornell_box() {
147147
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
148148
auto light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
149149

150-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
150+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
151151
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
152152
objects.add(new xz_rect(213, 343, 227, 332, 554, light));
153-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
153+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
154154
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
155-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
155+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
156156

157157
hittable* box1 = new box(vec3(0, 0, 0), vec3(165, 330, 165), white);
158158
box1 = new rotate_y(box1, 15);
@@ -176,12 +176,12 @@ hittable_list cornell_balls() {
176176
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
177177
auto light = new diffuse_light(new constant_texture(vec3(5, 5, 5)));
178178

179-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
179+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
180180
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
181181
objects.add(new xz_rect(113, 443, 127, 432, 554, light));
182-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
182+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
183183
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
184-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
184+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
185185

186186
hittable* boundary = new sphere(vec3(160, 100, 145), 100, new dielectric(1.5));
187187
objects.add(boundary);
@@ -204,12 +204,12 @@ hittable_list cornell_smoke() {
204204
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
205205
auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
206206

207-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
207+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
208208
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
209209
objects.add(new xz_rect(113, 443, 127, 432, 554, light));
210-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
210+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
211211
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
212-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
212+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
213213

214214
hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
215215
box1 = new rotate_y(box1, 15);
@@ -241,12 +241,12 @@ hittable_list cornell_final() {
241241
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
242242
auto light = new diffuse_light(new constant_texture(vec3(7, 7, 7)));
243243

244-
objects.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
244+
objects.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
245245
objects.add(new yz_rect(0, 555, 0, 555, 0, red));
246246
objects.add(new xz_rect(123, 423, 147, 412, 554, light));
247-
objects.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
247+
objects.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
248248
objects.add(new xz_rect(0, 555, 0, 555, 0, white));
249-
objects.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
249+
objects.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
250250

251251
hittable* boundary2 = new box(vec3(0,0,0), vec3(165,165,165), new dielectric(1.5));
252252
boundary2 = new rotate_y(boundary2, -18);

‎src/TheRestOfYourLife/box.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ box::box(const vec3& p0, const vec3& p1, material *ptr) {
3838
box_max = p1;
3939

4040
sides.add(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p1.z(), ptr));
41-
sides.add(new flip_normals(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
41+
sides.add(new flip_face(new xy_rect(p0.x(), p1.x(), p0.y(), p1.y(), p0.z(), ptr)));
4242
sides.add(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p1.y(), ptr));
43-
sides.add(new flip_normals(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
43+
sides.add(new flip_face(new xz_rect(p0.x(), p1.x(), p0.z(), p1.z(), p0.y(), ptr)));
4444
sides.add(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p1.x(), ptr));
45-
sides.add(new flip_normals(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
45+
sides.add(new flip_face(new yz_rect(p0.y(), p1.y(), p0.z(), p1.z(), p0.x(), ptr)));
4646
}
4747

4848
bool box::hit(const ray& r, double t0, double t1, hit_record& rec) const {

‎src/TheRestOfYourLife/main.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ hittable_list cornell_box(camera& cam, double aspect) {
6161
auto green = new lambertian(new constant_texture(vec3(0.12, 0.45, 0.15)));
6262
auto light = new diffuse_light(new constant_texture(vec3(15, 15, 15)));
6363

64-
world.add(new flip_normals(new yz_rect(0, 555, 0, 555, 555, green)));
64+
world.add(new flip_face(new yz_rect(0, 555, 0, 555, 555, green)));
6565
world.add(new yz_rect(0, 555, 0, 555, 0, red));
66-
world.add(new flip_normals(new xz_rect(213, 343, 227, 332, 554, light)));
67-
world.add(new flip_normals(new xz_rect(0, 555, 0, 555, 555, white)));
66+
world.add(new flip_face(new xz_rect(213, 343, 227, 332, 554, light)));
67+
world.add(new flip_face(new xz_rect(0, 555, 0, 555, 555, white)));
6868
world.add(new xz_rect(0, 555, 0, 555, 0, white));
69-
world.add(new flip_normals(new xy_rect(0, 555, 0, 555, 555, white)));
69+
world.add(new flip_face(new xy_rect(0, 555, 0, 555, 555, white)));
7070

7171
hittable* box1 = new box(vec3(0,0,0), vec3(165,330,165), white);
7272
box1 = new rotate_y(box1, 15);

0 commit comments

Comments
 (0)