Skip to content

Commit 7169e24

Browse files
authored
Merge pull request #480 from zgxmy/dev-minor
Add the missing rect to listing 54 and fix some old type pointers
2 parents e9f5d03 + 2738ec4 commit 7169e24

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

books/RayTracingTheNextWeek.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,7 @@
20102010
public:
20112011
xy_rect() {}
20122012

2013-
xy_rect(double _x0, double _x1, double _y0, double _y1, double _k, material *mat)
2013+
xy_rect(double _x0, double _x1, double _y0, double _y1, double _k, shared_ptr<material> mat)
20142014
: x0(_x0), x1(_x1), y0(_y0), y1(_y1), k(_k), mp(mat) {};
20152015

20162016
virtual bool hit(const ray& r, double t0, double t1, hit_record& rec) const;
@@ -2114,7 +2114,7 @@
21142114
public:
21152115
xz_rect() {}
21162116

2117-
xz_rect(double _x0, double _x1, double _z0, double _z1, double _k, material *mat)
2117+
xz_rect(double _x0, double _x1, double _z0, double _z1, double _k, shared_ptr<material> mat)
21182118
: x0(_x0), x1(_x1), z0(_z0), z1(_z1), k(_k), mp(mat) {};
21192119

21202120
virtual bool hit(const ray& r, double t0, double t1, hit_record& rec) const;
@@ -2133,7 +2133,7 @@
21332133
public:
21342134
yz_rect() {}
21352135

2136-
yz_rect(double _y0, double _y1, double _z0, double _z1, double _k, material *mat)
2136+
yz_rect(double _y0, double _y1, double _z0, double _z1, double _k, shared_ptr<material> mat)
21372137
: y0(_y0), y1(_y1), z0(_z0), z1(_z1), k(_k), mp(mat) {};
21382138

21392139
virtual bool hit(const ray& r, double t0, double t1, hit_record& rec) const;
@@ -2214,7 +2214,8 @@
22142214
objects.add(make_shared<yz_rect>(0, 555, 0, 555, 0, red));
22152215
objects.add(make_shared<xz_rect>(213, 343, 227, 332, 554, light));
22162216
objects.add(make_shared<xz_rect>(0, 555, 0, 555, 0, white));
2217-
objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
2217+
objects.add(make_shared<xz_rect>(0, 555, 0, 555, 555, white));
2218+
objects.add(make_shared<xy_rect>(0, 555, 0, 555, 555, white));
22182219

22192220
return objects;
22202221
}
@@ -2533,7 +2534,7 @@
25332534
With constructor:
25342535

25352536
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
2536-
rotate_y::rotate_y(hittable *p, double angle) : ptr(p) {
2537+
rotate_y::rotate_y(shared_ptr<hittable>, double angle) : ptr(p) {
25372538
auto radians = degrees_to_radians(angle);
25382539
sin_theta = sin(radians);
25392540
cos_theta = cos(radians);

0 commit comments

Comments
 (0)