Skip to content

Commit 2f12e6b

Browse files
committed
Merge branch 'master' into dev-patch
2 parents 3174d22 + a411036 commit 2f12e6b

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

CHANGELOG.md

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,46 @@
11
Change Log -- Ray Tracing in One Weekend
22
====================================================================================================
33

4+
# v3.1.1 (in progress)
45

5-
# v3.1.0 (in progress)
6+
### _In One Weekend_
7+
- Change: The C++ `<random>` version of `random_double()` no longer depends on `<functional>` header
8+
9+
10+
----------------------------------------------------------------------------------------------------
11+
# v3.1.0 (2020-05-03)
12+
13+
This minor upgrade adds some fixes and changes that are a bit more than just patches. The text now
14+
has subchapter headings to help readers browse content and get a bit more context. We're introducing
15+
new type aliases `point3` and `color` for `vec3` to better indicate the underlying mathematical
16+
types of parameters and variables. Overall, a bunch of small improvements that we'd recommend
17+
adopting, but may warrant comparison with any current projects.
618

719
### Common
8-
- Fix: Scattered improvements to the text.
20+
- Fix: Include cmath in vec3.h (#501)
21+
- Fix: Scattered improvements to the text
922
- New: Subchapters throughout all three books (#267)
1023
- New: Add explanation for padding `aarect` in the zero dimension (#488)
1124
- Change: Minor change to use new `point3` and `color` type aliases for `vec3` (#422)
1225
- Change: Renamed `constant_texture` to `solid_color`, add RGB constructor (#452)
1326
- Change: Moved `vec3::write_color()` method to utility function in `color.h` header (#502)
14-
- Change: Math notation to bold uppercase points, bold lowercase no-barb vectors (#412)
1527
- Change: Switch from `ffmin`/`ffmax` to standard `fmin`/`fmax` (#444, #491)
28+
- Change: Math notation to bold uppercase points, bold lowercase no-barb vectors (#412)
29+
- Change: Books use Markdeep's image class=pixel for rendered image fidelity (#498)
1630

1731
### _In One Weekend_
32+
- Fix: Improve image size and aspect ratio calculation to make size changes easier
33+
- Fix: Added `t` parameter back into `hit_record` at correct place
34+
- Fix: image basic vectors off by one
1835
- Fix: Update image and size for first PPM image
1936
- Fix: Update image and size for blue-to-white gradient image
2037
- Fix: Update image and size for simple red sphere render
2138
- Fix: Update image and size for sphere with normal-vector coloring
22-
- Fix: Improve image size and aspect ratio calculation to make size changes easier
23-
- Fix: Added `t` parameter back into `hit_record` at correct place
24-
- Fix: image basic vectors off by one
2539
- Fix: Correct typo in "What's next?" list to rejoin split paragraph on "Lights." Adjust numbering
2640
in rest of list.
27-
- Change: First image size changed to 256x256
28-
- Change: Default image sizes changed from 200x100 to 384x216
2941
- Change: Define image aspect ratio up front, then image height from that and the image width
30-
- Change: The C++ `<random>` version of `random_double()` no longer depends on `<functional>` header
42+
- Change: Default image sizes changed from 200x100 to 384x216
43+
- Change: First image size changed to 256x256
3144

3245
### _The Next Week_
3346
- Change: Large rewrite of the `image_texture` class. Now handles image loading too. (#434)

books/RayTracingInOneWeekend.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Peter Shirley
88
edited by Steve Hollasch and Trevor David Black
99
<br>
10-
Version 3.1.0-wip, 2020-XX-XX
10+
Version 3.1.0, 2020-05-03
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

books/RayTracingTheNextWeek.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Peter Shirley
88
edited by Steve Hollasch and Trevor David Black
99
<br>
10-
Version 3.1.0-wip, 2020-XX-XX
10+
Version 3.1.0, 2020-05-03
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

books/RayTracingTheRestOfYourLife.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Peter Shirley
88
edited by Steve Hollasch and Trevor David Black
99
<br>
10-
Version 3.1.0-wip, 2020-XX-XX
10+
Version 3.1.0, 2020-05-03
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

0 commit comments

Comments
 (0)