Skip to content

Commit 122980e

Browse files
committed
Merge branch 'dev-minor' into dev-major
2 parents a19ea22 + 1ad5668 commit 122980e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+683
-609
lines changed

CHANGELOG.md

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,65 @@ Change Log -- Ray Tracing in One Weekend
88
# v3.2.0 (in progress)
99

1010
### Common
11+
- Removed: now that the code handles ray-surface intersection from either side, we no longer need
12+
the `flip_face` class, so we've deleted it from the text and from the code (#482, #270)
13+
14+
### _The Next Week_
15+
- Removed: Deleted the section covering the old `flip_face` class, renumbered images as this
16+
eliminated the rendering with missing Cornell box faces (#482)
1117
- Change: Renamed and explicitly numbered book images and figures (#495)
18+
- Fix: Reduced code duplication in dielectric::scatter() function
1219
- New: Added alternative constructors that take color arguments in addition to the constructors
1320
that take `shared_ptr<texture>` arguments, simplifying calling code. This applies to the
1421
following classes: `checker_texture`, `constant_medium`, `diffuse_light`, and `lambertian`.
1522
(#516)
23+
- Fix: "Intance" typo in Chapter 8.1 to "Instance" (#629)
24+
25+
### _In One Weekend_
26+
- Change: Updated all rendered images except for 1.13, 1.14 (#179, #547, #548, #549, #550, #551,
27+
#552, #553, #554, #555, #556, #557, #560, #561, #562, #563, #564, #565, #566)
28+
- Change: Standard render width changed to 400
29+
- Change: Image 6 is now a before-and-after pair to illustrate antialiasing
30+
- Change: Listing 48: Refactored material and geometry declarations
31+
- Change: Listing 52: Refactored assignment of `etai_over_etat`
32+
- Change: Listing 56: Refactored material declarations
33+
- Change: Listing 61: Refactored material and geometry declarations
34+
- Fix: Corrected various missed change highlights in code listings
35+
- Fix: Listing 7: Added missing `color.h`, `vec3.h` includes
36+
- Fix: Listing 18: Add missing `double t` member of struct `hit_record` (#428)
37+
- Fix: Listing 24: Add missing `color.h` include
38+
- Fix: Listing 30: Add missing `camera.h` include
39+
- Fix: Listing 42: Don't need to include `ray.h` when using `rtweekend.h`
40+
- Fix: Listing 48: Add missing `material.h` include
41+
- Fix: Listing 51: `refract()` function was missing `fabs()` on `sqrt()` argument (#559
42+
- Fix: Listing 61: Include updated `cam` declaration, show context w/highlighting
43+
- Fix: Listing 62: Highlight rename of `camera::get_ray()` parameters to s, t (#616)
44+
- Fix: Listing 63: Show reverted scene declarations
45+
- Fix: Listing 68: Show final scene render parameters with highlighting
46+
- New: Listing 50: Show the updated material definitions
47+
48+
### _The Next Week_
49+
- Fix: Listing 7: Show reverted viewing parameters from book 1 final scene
1650

1751

1852
----------------------------------------------------------------------------------------------------
19-
# v3.1.2 (in progress)
53+
# v3.1.3 (in progress)
54+
55+
56+
----------------------------------------------------------------------------------------------------
57+
# v3.1.2 (2020-06-03)
58+
59+
### _In One Weekend_
60+
- Fix: Correct typo: "Intance Translation" -> "Instance Translation"
61+
- Fix: Corrected geometry type when computing distance between two points, final scene (#609)
2062

2163
### _The Rest of Your Life_
2264
- Fix: Missing closing parenthesis in listing 10 (#603)
2365
- Fix: Tiny improvements to the lambertian::scatter() development (#604)
2466
- Fix: Correct geometry type and unit vector method in `ray_color()`, listing 20 (#606)
67+
- Fix: Listing 26: alternate `random_double()` switched `distribution`, `generator` (#621)
68+
- Fix: Listing 28, 30: `light_shape` should have default material, not `0` (#607)
69+
- Fix: Listing 30: `mixture_pdf` needs `shared_ptr` arguments (#608)
2570

2671

2772
----------------------------------------------------------------------------------------------------

README.md

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

2222
News
2323
-----
24-
2020-March-23 — v3.0.0 is out! Following the major v2.0.0 release, we finally had the chance to dig
25-
into some of the larger changes we'd been wanting to make for a long time. This is a large change
26-
across the books and entire source code. The new source code now builds using CMake, for most
27-
platforms and build systems. We've refactored a good deal of the project source, cleaning things up,
28-
refactoring, adding new functionality where it made sense, and generally trying to simplify the code
29-
with the goal of making it easier to understand and modify. Finally, this release includes a number
30-
of changes to areas of the book that have given readers difficulties. Enjoy!
24+
2020-May-5 — v3.1.0 is out! A smaller minor level patch to iron out a few of the larger things we
25+
wanted to change after a year of organization. The biggest change in the text is the separation of
26+
chapters into subchapters. There is no one biggest change in the source, but there are a large
27+
number of small and significant changes.
3128

3229

33-
Branches
34-
---------
35-
The `master` branch contains the code at latest release. All ongoing development, with all of the
36-
latest changes, can be found in the `dev-patch`, `dev-minor`, and `dev-major` branches.
30+
Directory Structure
31+
-------------------
32+
The organization of this repository is meant to be simple and self-evident at a glance:
3733

34+
### books/
35+
This folder contains the three raytracing books (in HTML), and some supporting material.
3836

39-
Downloading The Source Code
40-
----------------------------
37+
### images/
38+
Contains all of the images and figures of the books. Can also be used to compare your results.
39+
40+
### style/
41+
Contains the css for the books and the site.
42+
43+
### src/
44+
Contains the source.
45+
46+
### src/common/
47+
Contains any headers that are common to two or more books. This is also where external headers
48+
are stored.
49+
50+
### src/<book>/
51+
Contains the source specific to any one book. Their is no sharing of source outside of the common
52+
directory.
53+
54+
55+
Source Code
56+
-----------
57+
### Intent
58+
This repository is not meant to act as its own tutorial. The source presented here is provided so
59+
you can compare your work when progressing through the book. We strongly recommend reading and
60+
following along with the book to understand the source.
61+
62+
### Downloading The Source Code
4163
The [GitHub home][] for this project contains all source and documentation associated with the _Ray
4264
Tracing in One Weekend_ series of books. To clone or download the source code, see the green "Clone
4365
or download" button in the upper right of the project home page.
4466

67+
### Programming Language
68+
This book is written in C++, and uses some modern features of C++11. The language and features were
69+
chosen to be broadly understood by the largest collection of programmers. It is not meant to
70+
represent ideal C++ code.
71+
72+
### Implementations in Other Languages
73+
The _Ray Tracing in One Weekend_ series has a long history of implementations in other programming
74+
languages (see [_Implementations in Other Languages_][implementations]), and across all three
75+
primary operating systems. Feel free to add your own implementation to the list!
76+
77+
### Branches
78+
The `master` branch contains the code at latest release. All ongoing development, with all of the
79+
latest changes, can be found in the `dev-patch`, `dev-minor`, and `dev-major` branches.
80+
4581

4682
Building and Running
4783
---------------------
@@ -117,3 +153,4 @@ review the [CONTRIBUTING][] document for the most effective way to proceed.
117153
[web1]: https://raytracing.github.io/books/RayTracingInOneWeekend.html
118154
[web2]: https://raytracing.github.io/books/RayTracingTheNextWeek.html
119155
[web3]: https://raytracing.github.io/books/RayTracingTheRestOfYourLife.html
156+
[implementations]: https://github.com/RayTracing/raytracing.github.io/wiki/Implementations-in-Other-Languages

0 commit comments

Comments
 (0)