Skip to content

Commit 17f1af7

Browse files
hollaschhollasch
committed
Merge branch 'dev-patch'
2 parents 38e8551 + dbd8db2 commit 17f1af7

6 files changed

+38
-28
lines changed

‎CHANGELOG.md

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

4+
# v3.2.3 (2020-12-07)
5+
6+
### Common
7+
- Change: Markdeep library URL updated to new location
8+
9+
### The Next Week
10+
- Fix: Correct parameter name typo for `bvh_node` constructor parameter `src_objects`
11+
12+
13+
----------------------------------------------------------------------------------------------------
414
# v3.2.2 (2020-10-31)
515

616
### Common

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ versions, use the print function in your browser.
2121

2222
Project Status
2323
---------------
24-
Hot on the heels of [v3.2.1][], we have a special Halloween release, [v3.2.2][], less than four
25-
weeks later. After this, we're going to hunker down for a while, working on our next major release:
26-
v4.0.0. We'll be tackling some larger refactorings to further simplify the code, tackle some large
27-
outstanding issues, and focus on more development of book 3: _Ray Tracing: The Rest of Your Life_.
24+
We just shipped a tiny release, [v3.2.3][], to get out two quick small fixes. Mostly we're very
25+
heads-down right now working on our major v4 release. Lots of changes. If you'd like to check it
26+
out, we're developing on the `dev-major` branch. We're tackling some larger refactorings to further
27+
simplify the code, address some large outstanding issues, and focus on more development and
28+
expansion of book 3: _Ray Tracing: The Rest of Your Life_.
2829

29-
If you have a change you'd like to contribute, [please see our contribution
30-
guidelines][CONTRIBUTING].
30+
If you have a change you'd like to contribute,
31+
[please see our contribution guidelines][CONTRIBUTING].
3132

3233

3334
Directory Structure
@@ -157,8 +158,7 @@ review the [CONTRIBUTING][] document for the most effective way to proceed.
157158
[GitHub home]: https://github.com/RayTracing/raytracing.github.io/
158159
[ImageMagick]: https://imagemagick.org/
159160
[implementations]: https://github.com/RayTracing/raytracing.github.io/wiki/Implementations
160-
[v3.2.1]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.1
161-
[v3.2.2]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.2
161+
[v3.2.3]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.3
162162
[web1]: https://raytracing.github.io/books/RayTracingInOneWeekend.html
163163
[web2]: https://raytracing.github.io/books/RayTracingTheNextWeek.html
164164
[web3]: https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html

‎books/RayTracingInOneWeekend.html

Lines changed: 6 additions & 6 deletions
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.2.2, 2020-10-31
10+
Version 3.2.3, 2020-12-07
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

@@ -3176,8 +3176,8 @@
31763176
- **Title (book)**: “Ray Tracing in One Weekend”
31773177
- **Author**: Peter Shirley
31783178
- **Editors**: Steve Hollasch, Trevor David Black
3179-
- **Version/Edition**: v3.2.2
3180-
- **Date**: 2020-10-31
3179+
- **Version/Edition**: v3.2.3
3180+
- **Date**: 2020-12-07
31813181
- **URL (series)**: https://raytracing.github.io/
31823182
- **URL (book)**: https://raytracing.github.io/books/RayTracingInOneWeekend.html
31833183

@@ -3204,7 +3204,7 @@
32043204
title = {Ray Tracing in One Weekend},
32053205
author = {Peter Shirley},
32063206
year = {2020},
3207-
month = {October},
3207+
month = {December},
32083208
note = {\small \texttt{https://raytracing.github.io/books/RayTracingInOneWeekend.html}},
32093209
url = {https://raytracing.github.io/books/RayTracingInOneWeekend.html}
32103210
}
@@ -3220,7 +3220,7 @@
32203220
title = {Ray Tracing in One Weekend},
32213221
author = {Peter Shirley},
32223222
year = {2020},
3223-
month = {October}
3223+
month = {December}
32243224
url = {https://raytracing.github.io/books/RayTracingInOneWeekend.html}
32253225
}
32263226
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3249,5 +3249,5 @@
32493249
<link rel='stylesheet' href='../style/book.css'>
32503250
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
32513251
<script src="markdeep.min.js"></script>
3252-
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
3252+
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
32533253
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

‎books/RayTracingTheNextWeek.html

Lines changed: 7 additions & 7 deletions
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.2.2, 2020-10-31
10+
Version 3.2.3, 2020-12-07
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

@@ -973,7 +973,7 @@
973973
...
974974

975975
bvh_node::bvh_node(
976-
std::vector<shared_ptr<hittable>>& objects,
976+
std::vector<shared_ptr<hittable>>& src_objects,
977977
size_t start, size_t end, double time0, double time1
978978
) {
979979
auto objects = src_objects; // Create a modifiable array of the source scene objects
@@ -3405,8 +3405,8 @@
34053405
- **Title (book)**: “Ray Tracing: The Next Week”
34063406
- **Author**: Peter Shirley
34073407
- **Editors**: Steve Hollasch, Trevor David Black
3408-
- **Version/Edition**: v3.2.2
3409-
- **Date**: 2020-10-31
3408+
- **Version/Edition**: v3.2.3
3409+
- **Date**: 2020-12-07
34103410
- **URL (series)**: https://raytracing.github.io/
34113411
- **URL (book)**: https://raytracing.github.io/books/RayTracingTheNextWeek.html
34123412

@@ -3433,7 +3433,7 @@
34333433
title = {Ray Tracing: The Next Week},
34343434
author = {Peter Shirley},
34353435
year = {2020},
3436-
month = {October}
3436+
month = {December}
34373437
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheNextWeek.html}},
34383438
url = {https://raytracing.github.io/books/RayTracingTheNextWeek.html}
34393439
}
@@ -3449,7 +3449,7 @@
34493449
title = {Ray Tracing: The Next Week},
34503450
author = {Peter Shirley},
34513451
year = {2020},
3452-
month = {October}
3452+
month = {December}
34533453
url = {https://raytracing.github.io/books/RayTracingTheNextWeek.html}
34543454
}
34553455
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3479,5 +3479,5 @@
34793479
<link rel='stylesheet' href='../style/book.css'>
34803480
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
34813481
<script src="markdeep.min.js"></script>
3482-
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
3482+
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
34833483
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

‎books/RayTracingTheRestOfYourLife.html

Lines changed: 6 additions & 6 deletions
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.2.2, 2020-10-31
10+
Version 3.2.3, 2020-12-07
1111
<br>
1212
Copyright 2018-2020 Peter Shirley. All rights reserved.
1313

@@ -2561,8 +2561,8 @@
25612561
- **Title (book)**: “Ray Tracing: The Rest of Your Life”
25622562
- **Author**: Peter Shirley
25632563
- **Editors**: Steve Hollasch, Trevor David Black
2564-
- **Version/Edition**: v3.2.2
2565-
- **Date**: 2020-10-31
2564+
- **Version/Edition**: v3.2.3
2565+
- **Date**: 2020-12-07
25662566
- **URL (series)**: https://raytracing.github.io/
25672567
- **URL (book)**: https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html
25682568

@@ -2589,7 +2589,7 @@
25892589
title = {Ray Tracing: The Rest of Your Life},
25902590
author = {Peter Shirley},
25912591
year = {2020},
2592-
month = {October}
2592+
month = {December}
25932593
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}},
25942594
url = {https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}
25952595
}
@@ -2605,7 +2605,7 @@
26052605
title = {Ray Tracing: The Rest of Your Life},
26062606
author = {Peter Shirley},
26072607
year = {2020},
2608-
month = {October}
2608+
month = {December}
26092609
url = {https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}
26102610
}
26112611
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2634,5 +2634,5 @@
26342634
<link rel='stylesheet' href='../style/book.css'>
26352635
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
26362636
<script src="markdeep.min.js"></script>
2637-
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
2637+
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
26382638
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

‎books/acknowledgments.md.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,5 @@
8282
<link rel='stylesheet' href='../style/book.css'>
8383
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
8484
<script src="markdeep.min.js"></script>
85-
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
85+
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
8686
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

0 commit comments

Comments
 (0)