Skip to content

Commit f571316

Browse files
authored
Merge branch 'dev-patch' into no-modify-objects-list
2 parents b0cd6c1 + 8cce2f6 commit f571316

File tree

5 files changed

+28
-1361
lines changed

5 files changed

+28
-1361
lines changed

CHANGELOG.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,33 @@ Change Log -- Ray Tracing in One Weekend
33

44
# v3.2.1 (in progress)
55

6+
### Common
7+
- Fix: Update local Markdeep library (for offline reading) to v1.11. The prior version had
8+
incorrect content (#712)
9+
610
### _In One Weekend_
7-
- Delete: remove premature `cstdlib` include; not needed until we use `rand()` (#687)
8-
- Fix: replace old anti-alias result image with before-and-after image (#679)
11+
- Delete: Remove premature `cstdlib` include; not needed until we use `rand()` (#687)
12+
- Fix: Replace old anti-alias result image with before-and-after image (#679)
913
- Fix: Listing 29: Added missing `rtweekend.h` include (#691)
10-
- Fix: undefined `vup` variable in camera definition (#686)
14+
- Fix: Undefined `vup` variable in camera definition (#686)
1115
- Fix: Listing 51: Add missing `hittable.h`, `rtweekend.h` includes (#693)
16+
- Fix: Fix error in citation section (#721)
1217
- Fix: Listings 33, 39: Add consistent function signature for `trilinear_interp` (#722)
1318

1419
### _The Next Week_
1520
- Change: `bvh_node` no longer reorders the source vector of scene objects; uses local copy
1621
instead (#701)
17-
- Delete: remove unused u,v,w variables in initial `perlin::noise()` function (#684)
22+
- Delete: Remove unused u,v,w variables in initial `perlin::noise()` function (#684)
1823
- Fix: Listing 15: In `bvh.h`, add missing `hittable_list.h` include (#690)
1924
- Fix: Listing 33, 34, 38: Change implicit casts to explicit ones (#692)
2025
- Fix: Listing 40: Change `perlin.h` in the caption to `texture.h` (#698)
2126
- Fix: Listing 70: Add missing `bvh.h` (#694)
22-
- Fix: Listing 70 and `main.cc`: Change a fuzz value of a metal sphere to 1.0 which is the maximum value (#694)
27+
- Fix: Listing 70 and `main.cc`: Change a fuzz value of a metal sphere to 1.0 which is the maximum
28+
value (#694)
29+
- Fix: Fix error in citation section (#721)
30+
31+
### _The Rest of Your Life_
32+
- Fix: Fix errors in citation section (#721)
2333

2434
### _The Next Week_
2535
- Change: `bvh_node` no longer reorders the source vector of scene objects; uses local copy

books/RayTracingInOneWeekend.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,8 @@
10171017
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
10181018
};
10191019
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1020-
[Listing [hittable-time-side]: <kbd>[hittable.h]</kbd> The hittable class with time and side]
1020+
[Listing [front-face-tracking]: <kbd>[hittable.h]</kbd>
1021+
Adding front-face tracking to hit_record]
10211022

10221023
<div class='together'>
10231024
And then we add the surface side determination to the class:
@@ -3201,7 +3202,7 @@
32013202
author = {Peter Shirley},
32023203
year = {2020},
32033204
month = {July},
3204-
note = {\small \texttt{https://raytracing.github.io/books/RayTracingInOneWeekend.html},
3205+
note = {\small \texttt{https://raytracing.github.io/books/RayTracingInOneWeekend.html}},
32053206
url = {https://raytracing.github.io/books/RayTracingInOneWeekend.html}
32063207
}
32073208
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

books/RayTracingTheNextWeek.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3397,7 +3397,7 @@
33973397
author = {Peter Shirley},
33983398
year = {2020},
33993399
month = {July},
3400-
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheNextWeek.html},
3400+
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheNextWeek.html}},
34013401
url = {https://raytracing.github.io/books/RayTracingTheNextWeek.html}
34023402
}
34033403
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

books/RayTracingTheRestOfYourLife.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,14 +2593,14 @@
25932593

25942594
### LaTeX and BibTex
25952595
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2596-
~\cite{Shirley2020RTW2}
2596+
~\cite{Shirley2020RTW3}
25972597

2598-
@misc{Shirley2020RTW2,
2598+
@misc{Shirley2020RTW3,
25992599
title = {Ray Tracing: The Rest of Your Life},
26002600
author = {Peter Shirley},
26012601
year = {2020},
26022602
month = {July},
2603-
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html},
2603+
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}},
26042604
url = {https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}
26052605
}
26062606
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2609,9 +2609,9 @@
26092609
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26102610
\usepackage{biblatex}
26112611

2612-
~\cite{Shirley2020RTW2}
2612+
~\cite{Shirley2020RTW3}
26132613

2614-
@online{Shirley2020RTW2,
2614+
@online{Shirley2020RTW3,
26152615
title = {Ray Tracing: The Rest of Your Life},
26162616
author = {Peter Shirley},
26172617
year = {2020},

0 commit comments

Comments
 (0)