Skip to content

Commit

Permalink
Update book1 images, plus fixed diffuse
Browse files Browse the repository at this point in the history
This is copied from PR #182, targeting the development branch. Original
commentary:

Ran the PNGs through pngquant+Zopfli to reduce file sizes, but as
expected they are a bit larger. All the images add ~180 kilobytes to
previous book size.

Also the fix for "incorrect" diffuse (#181) is reflected in the
screenshots. Resulting AO effect is slightly less intense than before,
but more correct.

Also in one place fixed source to compile and the color in the source to
match the color of the sphere in the screenshot.

Images in Book 2 and 3 are "not too bad"; they are larger and JPG
artifacts aren't as visible there. Also they are much slower to render,
and I'm lazy... :)
  • Loading branch information
hollasch committed Oct 21, 2019
1 parent 682ecc5 commit 0926a57
Show file tree
Hide file tree
Showing 36 changed files with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions books/RayTracingInOneWeekend.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
Opening the output file (in ToyViewer on my mac, but try it in your favorite viewer and google “ppm
viewer” if your viewer doesn’t support it) shows:

![Image 2-2](../images/img-1-02-2.jpg)
![Image 2-2](../images/img-1-02-2.png)

</div>

Expand Down Expand Up @@ -400,7 +400,7 @@

with $t$ going from zero to one. In our case this produces:

![Image 4-1](../images/img-1-04-1.jpg)
![Image 4-1](../images/img-1-04-1.png)

</div>

Expand Down Expand Up @@ -494,7 +494,7 @@
<div class='together'>
What we get is this:

![Image 5-1](../images/img-1-05-1.jpg)
![Image 5-1](../images/img-1-05-1.png)

</div>

Expand Down Expand Up @@ -565,7 +565,7 @@
<div class='together'>
And that yields this picture:

![Image 6-1](../images/img-1-06-1.jpg)
![Image 6-1](../images/img-1-06-1.png)

</div>

Expand Down Expand Up @@ -787,7 +787,7 @@
This yields a picture that is really just a visualization of where the spheres are along with their
surface normal. This is often a great way to look at your model for flaws and characteristics.

![Image 6-2](../images/img-1-06-2.jpg)
![Image 6-2](../images/img-1-06-2.png)

</div>

Expand Down Expand Up @@ -960,7 +960,7 @@
Zooming into the image that is produced, the big change is in edge pixels that are part background
and part foreground:

![Image 7-1](../images/img-1-07-1.jpg)
![Image 7-1](../images/img-1-07-1.png)

</div>

Expand Down Expand Up @@ -1040,7 +1040,7 @@
<div class='together'>
This gives us:

![Image 8-1](../images/img-1-08-1.jpg)
![Image 8-1](../images/img-1-08-1.png)

</div>

Expand Down Expand Up @@ -1077,7 +1077,7 @@
<div class='together'>
That yields light grey, as we desire:

![Image 8-2](../images/img-1-08-2.jpg)
![Image 8-2](../images/img-1-08-2.png)

</div>

Expand Down Expand Up @@ -1308,7 +1308,7 @@

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
hittable *list[4];
list[0] = new sphere(vec3(0,0,-1), 0.5, new lambertian(vec3(0.8, 0.3, 0.3)));
list[0] = new sphere(vec3(0,0,-1), 0.5, new lambertian(vec3(0.7, 0.3, 0.3)));
list[1] = new sphere(vec3(0,-100.5,-1), 100, new lambertian(vec3(0.8, 0.8, 0.0)));
list[2] = new sphere(vec3(1,0,-1), 0.5, new metal(vec3(0.8, 0.6, 0.2)));
list[3] = new sphere(vec3(-1,0,-1), 0.5, new metal(vec3(0.8, 0.8, 0.8)));
Expand All @@ -1335,7 +1335,7 @@
<div class='together'>
Which gives:

![Image 9-1](../images/img-1-09-1.jpg)
![Image 9-1](../images/img-1-09-1.png)

</div>

Expand Down Expand Up @@ -1396,7 +1396,7 @@
<div class='together'>
We can try that out by adding fuzziness 0.3 and 1.0 to the metals:

![Image 9-2](../images/img-1-09-2.jpg)
![Image 9-2](../images/img-1-09-2.png)

</div>

Expand All @@ -1414,7 +1414,7 @@
there is a refraction ray at all. For this project, I tried to put two glass balls in our scene, and
I got this (I have not told you how to do this right or wrong yet, but soon!):

![Image 10-1](../images/img-1-10-1.jpg)
![Image 10-1](../images/img-1-10-1.png)

</div>

Expand Down Expand Up @@ -1513,7 +1513,7 @@

We get:

![Image 10-2](../images/img-1-10-2.jpg)
![Image 10-2](../images/img-1-10-2.png)

</div>

Expand Down Expand Up @@ -1616,7 +1616,7 @@
<div class='together'>
This gives:

![Image 10-3](../images/img-1-10-3.jpg)
![Image 10-3](../images/img-1-10-3.png)

</div>

Expand Down Expand Up @@ -1687,7 +1687,7 @@

gives:

![Image 11-1](../images/img-1-11-1.jpg)
![Image 11-1](../images/img-1-11-1.png)

</div>

Expand Down Expand Up @@ -1763,11 +1763,11 @@

to get:

![Image 11-2](../images/img-1-11-2.jpg)
![Image 11-2](../images/img-1-11-2.png)

And we can change field of view to get:

![Image 11-3](../images/img-1-11-3.jpg)
![Image 11-3](../images/img-1-11-3.png)

</div>

Expand Down Expand Up @@ -1883,7 +1883,7 @@

We get:

![Image 12-1](../images/img-1-12-1.jpg)
![Image 12-1](../images/img-1-12-1.png)

</div>

Expand Down
Binary file removed images/img-1-02-2.jpg
Binary file not shown.
Binary file added images/img-1-02-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-04-1.jpg
Binary file not shown.
Binary file added images/img-1-04-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-05-1.jpg
Binary file not shown.
Binary file added images/img-1-05-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-06-1.jpg
Binary file not shown.
Binary file added images/img-1-06-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-06-2.jpg
Binary file not shown.
Binary file added images/img-1-06-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-07-1.jpg
Binary file not shown.
Binary file added images/img-1-07-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-08-1.jpg
Binary file not shown.
Binary file added images/img-1-08-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-08-2.jpg
Binary file not shown.
Binary file added images/img-1-08-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-09-1.jpg
Binary file not shown.
Binary file added images/img-1-09-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-09-2.jpg
Binary file not shown.
Binary file added images/img-1-09-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-10-1.jpg
Binary file not shown.
Binary file added images/img-1-10-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-10-2.jpg
Binary file not shown.
Binary file added images/img-1-10-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/img-1-10-3.jpg
Binary file not shown.
Binary file added images/img-1-10-3.png
Binary file removed images/img-1-11-1.jpg
Diff not rendered.
Binary file added images/img-1-11-1.png
Binary file removed images/img-1-11-2.jpg
Diff not rendered.
Binary file added images/img-1-11-2.png
Binary file removed images/img-1-11-3.jpg
Diff not rendered.
Binary file added images/img-1-11-3.png
Binary file removed images/img-1-12-1.jpg
Diff not rendered.
Binary file added images/img-1-12-1.png
Binary file modified images/img-1-13-1.jpg

0 comments on commit 0926a57

Please sign in to comment.