Skip to content

Commit a23eb7b

Browse files
committed
Merge branch 'tweak-cam-init' into 'dev'
2 parents 774b0a7 + d19ab2e commit a23eb7b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

books/RayTracingInOneWeekend.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4126,7 +4126,7 @@
41264126

41274127

41284128
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
4129-
cam.defocus_angle = 10.0;
4129+
cam.defocus_angle = 10;
41304130
cam.focus_dist = 3.4;
41314131
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
41324132

src/TheNextWeek/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void bouncing_spheres() {
8282
cam.vup = vec3(0,1,0);
8383

8484
cam.defocus_angle = 0.02;
85-
cam.focus_dist = 10.0;
85+
cam.focus_dist = 10;
8686

8787
cam.render(world);
8888
}

src/TheRestOfYourLife/main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ int main() {
6262
cam.max_depth = 50;
6363
cam.background = color(0,0,0);
6464

65-
cam.vfov = 40.0;
65+
cam.vfov = 40;
6666
cam.lookfrom = point3(278, 278, -800);
6767
cam.lookat = point3(278, 278, 0);
6868
cam.vup = vec3(0, 1, 0);
6969

70-
cam.defocus_angle = 0.0;
70+
cam.defocus_angle = 0;
7171

7272
cam.render(world, lights);
7373
}

0 commit comments

Comments
 (0)