Skip to content

Commit e3a0166

Browse files
committed
Merge branch 'dev' into 'dev.v4'
2 parents b079bff + b3fc9b5 commit e3a0166

23 files changed

+315
-169
lines changed

books/RayTracingInOneWeekend.html

Lines changed: 147 additions & 48 deletions
Large diffs are not rendered by default.

books/RayTracingTheNextWeek.html

Lines changed: 146 additions & 80 deletions
Large diffs are not rendered by default.

books/RayTracingTheRestOfYourLife.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939

4040
I hope that you find the math as fascinating as I do.
4141

42+
See the [project README][readme] file for information about this project, the repository on GitHub,
43+
directory structure, building & running, and how to make or reference corrections and contributions.
44+
4245
As before, see [our Further Reading wiki page][wiki-further] for additional project related
4346
resources.
4447

@@ -260,7 +263,6 @@
260263
#include "rtweekend.h"
261264

262265
#include "camera.h"
263-
#include "color.h"
264266
#include "hittable_list.h"
265267
#include "material.h"
266268
#include "quad.h"
@@ -3923,6 +3925,7 @@
39233925
[Steve Hollasch]: https://github.com/hollasch
39243926
[Trevor David Black]: https://github.com/trevordblack
39253927

3928+
[readme]: ../README.md
39263929
[releases]: https://github.com/RayTracing/raytracing.github.io/releases/
39273930
[wiki-further]: https://github.com/RayTracing/raytracing.github.io/wiki/Further-Readings
39283931

images/img-2.05-earth-sphere.png

-19.7 KB
Loading

images/img-2.10-perlin-trilerp.png

-17.7 KB
Loading
-19.4 KB
Loading

images/img-2.12-perlin-hifreq.png

-25 KB
Loading

images/img-2.13-perlin-shift.png

-10.4 KB
Loading

images/img-2.14-perlin-turb.png

-21.5 KB
Loading

src/InOneWeekend/color.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
// along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
1212
//==============================================================================================
1313

14-
#include "vec3.h"
15-
16-
#include <iostream>
17-
1814
using color = vec3;
1915

2016
inline double linear_to_gamma(double linear_component)

0 commit comments

Comments
 (0)