Skip to content

Include hittable.h from material.h #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Include hittable.h from material.h #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b67ec03
Include hittable.h from material.h
hollasch Aug 19, 2024
701a0e5
Update changelog for material.h include hittable.h
hollasch Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Change Log / Ray Tracing in One Weekend
### Common
- Fix -- Big improvement to print version listing font size (#1595) and more compact line
height for code listings in both print and browser.
- Change -- Include hittable.h from material.h; drop `hit_record` forward declaration (#1609)

### In One Weekend
- Fix -- Fixed usage of the term "unit cube" for a cube of diameter two (#1555, #1603)
Expand Down
2 changes: 1 addition & 1 deletion books/RayTracingInOneWeekend.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,7 +2791,7 @@

#include "rtweekend.h"

class hit_record;
#include "hittable.h"

class material {
public:
Expand Down
4 changes: 1 addition & 3 deletions books/RayTracingTheNextWeek.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,13 +1346,11 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
#include "rtweekend.h"


#include "hittable.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
#include "texture.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++

class hit_record;

...

class lambertian : public material {
Expand Down
10 changes: 3 additions & 7 deletions books/RayTracingTheRestOfYourLife.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,14 +2286,12 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
#include "rtweekend.h"


#include "hittable.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
#include "onb.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
#include "texture.h"

class hit_record;

class material {
public:
...
Expand Down Expand Up @@ -3329,11 +3327,10 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
#include "rtweekend.h"

#include "hittable.h"
#include "onb.h"
#include "texture.h"

class hit_record;


~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
class scatter_record {
Expand Down Expand Up @@ -3370,15 +3367,14 @@
#include "rtweekend.h"


#include "hittable.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ delete
#include "onb.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
#include "pdf.h"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
#include "texture.h"

class hit_record;

...

class lambertian : public material {
Expand Down
2 changes: 1 addition & 1 deletion src/InOneWeekend/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "rtweekend.h"

class hit_record;
#include "hittable.h"


class material {
Expand Down
3 changes: 1 addition & 2 deletions src/TheNextWeek/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@

#include "rtweekend.h"

#include "hittable.h"
#include "texture.h"

class hit_record;


class material {
public:
Expand Down
3 changes: 1 addition & 2 deletions src/TheRestOfYourLife/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@

#include "rtweekend.h"

#include "hittable.h"
#include "pdf.h"
#include "texture.h"

class hit_record;


class scatter_record {
public:
Expand Down