Skip to content

Commit 71fa88e

Browse files
authored
Merge pull request #451 from RayTracing/common-ack
Move acknowledgments to single common document
2 parents 8e4a6ce + 1e691ef commit 71fa88e

File tree

5 files changed

+89
-205
lines changed

5 files changed

+89
-205
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ Change Log -- Ray Tracing in One Weekend
44
----------------------------------------------------------------------------------------------------
55
# v3.0.2 (in progress)
66

7+
### Common
8+
- Change: Every book source now includes from a single common acknowledgments document.
9+
710
### _In One Weekend_
811
- Fix: Correct typo: "consine" to "cosine"
912

1013
### _The Next Week_
1114
- Fix: `shared_ptr` dereference and simplify code in `hittable_list::bounding_box()` (#435)
12-
- Fix: erroneous en-dash in code block (#439)
15+
- Fix: Erroneous en-dash in code block. Replace `–>` with `->` (#439)
1316
- Fix: Add highlight to new `hittable::bounding_box()` method (#442)
1417

1518

books/RayTracingInOneWeekend.html

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
I’ll be maintaining a site related to the book including further reading and links to resources at a
5454
blog https://in1weekend.blogspot.com/ related to this book.
5555

56-
Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
57-
the end of this book.
56+
Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
57+
at the end of this book.
5858

5959
Let’s get on with it!
6060

@@ -2836,73 +2836,8 @@
28362836

28372837

28382838

2839-
Acknowledgments
2840-
====================================================================================================
2841-
2842-
<div class="credit-list"> **Original Manuscript Help**
2843-
2844-
- Dave Hart
2845-
- Jean Buckley
2846-
</div>
2847-
2848-
<div class="credit-list"> **Web Release**
2849-
2850-
- Berna Kabadayı
2851-
- Lorenzo Mancini
2852-
- Lori Whippler Hollasch
2853-
- Ronald Wotzlaw
2854-
</div>
2855-
2856-
<div class="credit-list"> **Corrections and Improvements**
2857-
2858-
- Aaryaman Vasishta
2859-
- Andrew Kensler
2860-
- Apoorva Joshi
2861-
- Aras Pranckevičius
2862-
- Becker
2863-
- Ben Kerl
2864-
- Benjamin Summerton
2865-
- Bennett Hardwick
2866-
- Dan Drummond
2867-
- David Chambers
2868-
- David Hart
2869-
- Eric Haines
2870-
- Fabio Sancinetti
2871-
- Filipe Scur
2872-
- Frank He
2873-
- Gerrit Wessendorf
2874-
- Grue Debry
2875-
- Ingo Wald
2876-
- Jason Stone
2877-
- Jean Buckley
2878-
- Joey Cho
2879-
- Lorenzo Mancini
2880-
- Marcus Ottosson
2881-
- Matthew Heimlich
2882-
- Nakata Daisuke
2883-
- Paul Melis
2884-
- Phil Cristensen
2885-
- Ronald Wotzlaw
2886-
- Shaun P. Lee
2887-
- Tatsuya Ogawa
2888-
- Thiago Ize
2889-
- Vahan Sosoyan
2890-
</div>
2891-
2892-
<div class="credit-list"> **Tools**
2893-
2894-
<div class="indented">
2895-
Thanks to the team at [Limnu][] for help on the figures.
2896-
2897-
Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
2898-
</div>
2899-
</div>
2900-
2901-
2839+
(insert acknowledgments.md.html here)
29022840

2903-
[acknowledgments]: #acknowledgments
2904-
[Limnu]: https://limnu.com/
2905-
[Markdeep]: https://casual-effects/markdeep/
29062841

29072842

29082843
<!-- Markdeep: https://casual-effects.com/markdeep/ -->

books/RayTracingTheNextWeek.html

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
you want a weekend project. Order is not very important for the concepts presented in this book, and
3333
without BVH and Perlin texture you will still get a Cornell Box!
3434

35-
Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
36-
the end of this book.
35+
Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
36+
at the end of this book.
3737

3838

3939

@@ -2768,73 +2768,8 @@
27682768

27692769

27702770

2771-
Acknowledgments
2772-
====================================================================================================
2773-
2774-
<div class="credit-list"> **Original Manuscript Help**
2775-
2776-
- Dave Hart
2777-
- Jean Buckley
2778-
</div>
2779-
2780-
<div class="credit-list"> **Web Release**
2781-
2782-
- Berna Kabadayı
2783-
- Lorenzo Mancini
2784-
- Lori Whippler Hollasch
2785-
- Ronald Wotzlaw
2786-
</div>
2787-
2788-
<div class="credit-list"> **Corrections and Improvements**
2789-
2790-
- Aaryaman Vasishta
2791-
- Andrew Kensler
2792-
- Apoorva Joshi
2793-
- Aras Pranckevičius
2794-
- Becker
2795-
- Ben Kerl
2796-
- Benjamin Summerton
2797-
- Bennett Hardwick
2798-
- Dan Drummond
2799-
- David Chambers
2800-
- David Hart
2801-
- Eric Haines
2802-
- Fabio Sancinetti
2803-
- Filipe Scur
2804-
- Frank He
2805-
- Gerrit Wessendorf
2806-
- Grue Debry
2807-
- Ingo Wald
2808-
- Jason Stone
2809-
- Jean Buckley
2810-
- Joey Cho
2811-
- Lorenzo Mancini
2812-
- Marcus Ottosson
2813-
- Matthew Heimlich
2814-
- Nakata Daisuke
2815-
- Paul Melis
2816-
- Phil Cristensen
2817-
- Ronald Wotzlaw
2818-
- Shaun P. Lee
2819-
- Tatsuya Ogawa
2820-
- Thiago Ize
2821-
- Vahan Sosoyan
2822-
</div>
2823-
2824-
<div class="credit-list"> **Tools**
2825-
2826-
<div class="indented">
2827-
Thanks to the team at [Limnu][] for help on the figures.
2828-
2829-
Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
2830-
</div>
2831-
</div>
2832-
2833-
2771+
(insert acknowledgments.md.html here)
28342772

2835-
[acknowledgments]: #acknowledgments
2836-
[Limnu]: https://limnu.com/
2837-
[Markdeep]: https://casual-effects/markdeep/
28382773

28392774

28402775
<!-- Markdeep: https://casual-effects.com/markdeep/ -->

books/RayTracingTheRestOfYourLife.html

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
As before, https://in1weekend.blogspot.com/ will have further readings and references.
3232

33-
Thanks to everyone who lent a hand on this project. You can find them in the [acknowledgments][] at
34-
the end of this book.
33+
Thanks to everyone who lent a hand on this project. You can find them in the acknowledgments section
34+
at the end of this book.
3535

3636

3737

@@ -2405,73 +2405,8 @@
24052405

24062406

24072407

2408-
Acknowledgments
2409-
====================================================================================================
2410-
2411-
<div class="credit-list"> **Original Manuscript Help**
2412-
2413-
- Dave Hart
2414-
- Jean Buckley
2415-
</div>
2416-
2417-
<div class="credit-list"> **Web Release**
2418-
2419-
- Berna Kabadayı
2420-
- Lorenzo Mancini
2421-
- Lori Whippler Hollasch
2422-
- Ronald Wotzlaw
2423-
</div>
2424-
2425-
<div class="credit-list"> **Corrections and Improvements**
2426-
2427-
- Aaryaman Vasishta
2428-
- Andrew Kensler
2429-
- Apoorva Joshi
2430-
- Aras Pranckevičius
2431-
- Becker
2432-
- Ben Kerl
2433-
- Benjamin Summerton
2434-
- Bennett Hardwick
2435-
- Dan Drummond
2436-
- David Chambers
2437-
- David Hart
2438-
- Eric Haines
2439-
- Fabio Sancinetti
2440-
- Filipe Scur
2441-
- Frank He
2442-
- Gerrit Wessendorf
2443-
- Grue Debry
2444-
- Ingo Wald
2445-
- Jason Stone
2446-
- Jean Buckley
2447-
- Joey Cho
2448-
- Lorenzo Mancini
2449-
- Marcus Ottosson
2450-
- Matthew Heimlich
2451-
- Nakata Daisuke
2452-
- Paul Melis
2453-
- Phil Cristensen
2454-
- Ronald Wotzlaw
2455-
- Shaun P. Lee
2456-
- Tatsuya Ogawa
2457-
- Thiago Ize
2458-
- Vahan Sosoyan
2459-
</div>
2460-
2461-
<div class="credit-list"> **Tools**
2462-
2463-
<div class="indented">
2464-
Thanks to the team at [Limnu][] for help on the figures.
2465-
2466-
Huge shout out to Morgan McGuire for his fantastic [Markdeep][] library.
2467-
</div>
2468-
</div>
2469-
2470-
2408+
(insert acknowledgments.md.html here)
24712409

2472-
[acknowledgments]: #acknowledgments
2473-
[Limnu]: https://limnu.com
2474-
[Markdeep]: https://casual-effects/markdeep/
24752410

24762411

24772412
<!-- Markdeep: https://casual-effects.com/markdeep/ -->

books/acknowledgments.md.html

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<meta charset="utf-8">
2+
<!-- Markdeep: https://casual-effects.com/markdeep/ -->
3+
4+
Acknowledgments
5+
====================================================================================================
6+
7+
<div class="credit-list"> **Original Manuscript Help**
8+
9+
- Dave Hart
10+
- Jean Buckley
11+
</div>
12+
13+
<div class="credit-list"> **Web Release**
14+
15+
- Berna Kabadayı
16+
- Lorenzo Mancini
17+
- Lori Whippler Hollasch
18+
- Ronald Wotzlaw
19+
</div>
20+
21+
<div class="credit-list"> **Corrections and Improvements**
22+
23+
- Aaryaman Vasishta
24+
- Andrew Kensler
25+
- Apoorva Joshi
26+
- Aras Pranckevičius
27+
- Becker
28+
- Ben Kerl
29+
- Benjamin Summerton
30+
- Bennett Hardwick
31+
- Dan Drummond
32+
- David Chambers
33+
- David Hart
34+
- Eric Haines
35+
- Fabio Sancinetti
36+
- Filipe Scur
37+
- Frank He
38+
- Gerrit Wessendorf
39+
- Grue Debry
40+
- Ingo Wald
41+
- Jason Stone
42+
- Jean Buckley
43+
- Joey Cho
44+
- Lorenzo Mancini
45+
- Marcus Ottosson
46+
- Matthew Heimlich
47+
- Nakata Daisuke
48+
- Paul Melis
49+
- Phil Cristensen
50+
- Ronald Wotzlaw
51+
- Shaun P. Lee
52+
- Tatsuya Ogawa
53+
- Thiago Ize
54+
- Vahan Sosoyan
55+
</div>
56+
57+
<div class="credit-list"> **Tools**
58+
59+
<div class="indented">
60+
Thanks to the team at [Limnu](https://limnu.com/) for help on the figures.
61+
62+
These books are entirely written in Morgan McGuire's fantastic and free
63+
[Markdeep](https://casual-effects.com/markdeep/) library. To see what this looks like, view the
64+
page source from your browser.
65+
66+
</div>
67+
</div>
68+
69+
70+
71+
<!-- Markdeep: https://casual-effects.com/markdeep/ -->
72+
<link rel='stylesheet' href='../style/book.css'>
73+
<style class="fallback">body{visibility:hidden;white-space:pre;font-family:monospace}</style>
74+
<script src="markdeep.min.js"></script>
75+
<script src="https://casual-effects.com/markdeep/latest/markdeep.min.js"></script>
76+
<script>window.alreadyProcessedMarkdeep||(document.body.style.visibility="visible")</script>

0 commit comments

Comments
 (0)