Skip to content

Commit

Permalink
Merge branch 'dev-patch'
Browse files Browse the repository at this point in the history
  • Loading branch information
hollasch committed Dec 8, 2020
2 parents 38e8551 + dbd8db2 commit 17f1af7
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 28 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Change Log -- Ray Tracing in One Weekend
====================================================================================================

# v3.2.3 (2020-12-07)

### Common
- Change: Markdeep library URL updated to new location

### The Next Week
- Fix: Correct parameter name typo for `bvh_node` constructor parameter `src_objects`


----------------------------------------------------------------------------------------------------
# v3.2.2 (2020-10-31)

### Common
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ versions, use the print function in your browser.

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

If you have a change you'd like to contribute, [please see our contribution
guidelines][CONTRIBUTING].
If you have a change you'd like to contribute,
[please see our contribution guidelines][CONTRIBUTING].


Directory Structure
Expand Down Expand Up @@ -157,8 +158,7 @@ review the [CONTRIBUTING][] document for the most effective way to proceed.
[GitHub home]: https://github.com/RayTracing/raytracing.github.io/
[ImageMagick]: https://imagemagick.org/
[implementations]: https://github.com/RayTracing/raytracing.github.io/wiki/Implementations
[v3.2.1]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.1
[v3.2.2]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.2
[v3.2.3]: https://github.com/RayTracing/raytracing.github.io/releases/tag/v3.2.3
[web1]: https://raytracing.github.io/books/RayTracingInOneWeekend.html
[web2]: https://raytracing.github.io/books/RayTracingTheNextWeek.html
[web3]: https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html
12 changes: 6 additions & 6 deletions books/RayTracingInOneWeekend.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Peter Shirley][]
edited by [Steve Hollasch][] and [Trevor David Black][]
<br>
Version 3.2.2, 2020-10-31
Version 3.2.3, 2020-12-07
<br>
Copyright 2018-2020 Peter Shirley. All rights reserved.

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

Expand All @@ -3204,7 +3204,7 @@
title = {Ray Tracing in One Weekend},
author = {Peter Shirley},
year = {2020},
month = {October},
month = {December},
note = {\small \texttt{https://raytracing.github.io/books/RayTracingInOneWeekend.html}},
url = {https://raytracing.github.io/books/RayTracingInOneWeekend.html}
}
Expand All @@ -3220,7 +3220,7 @@
title = {Ray Tracing in One Weekend},
author = {Peter Shirley},
year = {2020},
month = {October}
month = {December}
url = {https://raytracing.github.io/books/RayTracingInOneWeekend.html}
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -3249,5 +3249,5 @@
<link rel='stylesheet' href='../style/book.css'>
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
<script src="markdeep.min.js"></script>
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>
14 changes: 7 additions & 7 deletions books/RayTracingTheNextWeek.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Peter Shirley][]
edited by [Steve Hollasch][] and [Trevor David Black][]
<br>
Version 3.2.2, 2020-10-31
Version 3.2.3, 2020-12-07
<br>
Copyright 2018-2020 Peter Shirley. All rights reserved.

Expand Down Expand Up @@ -973,7 +973,7 @@
...

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

Expand All @@ -3433,7 +3433,7 @@
title = {Ray Tracing: The Next Week},
author = {Peter Shirley},
year = {2020},
month = {October}
month = {December}
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheNextWeek.html}},
url = {https://raytracing.github.io/books/RayTracingTheNextWeek.html}
}
Expand All @@ -3449,7 +3449,7 @@
title = {Ray Tracing: The Next Week},
author = {Peter Shirley},
year = {2020},
month = {October}
month = {December}
url = {https://raytracing.github.io/books/RayTracingTheNextWeek.html}
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -3479,5 +3479,5 @@
<link rel='stylesheet' href='../style/book.css'>
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
<script src="markdeep.min.js"></script>
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>
12 changes: 6 additions & 6 deletions books/RayTracingTheRestOfYourLife.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Peter Shirley][]
edited by [Steve Hollasch][] and [Trevor David Black][]
<br>
Version 3.2.2, 2020-10-31
Version 3.2.3, 2020-12-07
<br>
Copyright 2018-2020 Peter Shirley. All rights reserved.

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

Expand All @@ -2589,7 +2589,7 @@
title = {Ray Tracing: The Rest of Your Life},
author = {Peter Shirley},
year = {2020},
month = {October}
month = {December}
note = {\small \texttt{https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}},
url = {https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}
}
Expand All @@ -2605,7 +2605,7 @@
title = {Ray Tracing: The Rest of Your Life},
author = {Peter Shirley},
year = {2020},
month = {October}
month = {December}
url = {https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html}
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -2634,5 +2634,5 @@
<link rel='stylesheet' href='../style/book.css'>
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
<script src="markdeep.min.js"></script>
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>
2 changes: 1 addition & 1 deletion books/acknowledgments.md.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@
<link rel='stylesheet' href='../style/book.css'>
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
<script src="markdeep.min.js"></script>
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
<script src="https://morgan3d.github.io/markdeep/latest/markdeep.min.js"></script>
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

0 comments on commit 17f1af7

Please sign in to comment.