Skip to content

Commit 025457f

Browse files
authored
Merge pull request #631 from RayTracing/consolidate_readmes
Consolidated source README into a single readme at directory root.
2 parents 6efdedf + b781d6e commit 025457f

File tree

4 files changed

+50
-164
lines changed

4 files changed

+50
-164
lines changed

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

src/InOneWeekend/README.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

src/TheNextWeek/README.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/TheRestOfYourLife/README.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)