Skip to content

Simplify box() face construction #1734

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

Open
xiaodoliu wants to merge 1 commit into
base: dev-patch
Choose a base branch
from
Open

Simplify box() face construction #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Change Log / Ray Tracing in One Weekend

### The Next Week
- Fix -- Remove premature source line for call to `get_sphere_uv` (#1701)
- Change -- Simplify `box()` face construction to use `min` and `max` points directly
without recombining coordinates (#1733)

### The Rest of Your Life

Expand Down
12 changes: 6 additions & 6 deletions books/RayTracingTheNextWeek.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3520,12 +3520,12 @@
auto dy = vec3(0, max.y() - min.y(), 0);
auto dz = vec3(0, 0, max.z() - min.z());

sides->add(make_shared<quad>(point3(min.x(), min.y(), max.z()), dx, dy, mat)); // front
sides->add(make_shared<quad>(point3(max.x(), min.y(), max.z()), -dz, dy, mat)); // right
sides->add(make_shared<quad>(point3(max.x(), min.y(), min.z()), -dx, dy, mat)); // back
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dz, dy, mat)); // left
sides->add(make_shared<quad>(point3(min.x(), max.y(), max.z()), dx, -dz, mat)); // top
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dy, dx, mat)); // back
sides->add(make_shared<quad>(min, dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dz, dy, mat)); // left
sides->add(make_shared<quad>(max, -dx, -dy, mat)); // front
sides->add(make_shared<quad>(max, -dz, -dx, mat)); // top
sides->add(make_shared<quad>(max, -dy, -dz, mat)); // right

return sides;
}
Expand Down
1 change: 1 addition & 0 deletions books/acknowledgments.md.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
- [Thien Tran](https://github.com/gau-nernst)
- Vahan Sosoyan
- [WANG Lei](https://github.com/wlbksy)
- [Xiaodong Liu](https://github.com/xiaodoliu)
- [Yann Herklotz](https://github.com/ymherklotz)
- [ZeHao Chen](https://github.com/oxine)
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/TheNextWeek/quad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ inline shared_ptr<hittable_list> box(const point3& a, const point3& b, shared_pt
auto dy = vec3(0, max.y() - min.y(), 0);
auto dz = vec3(0, 0, max.z() - min.z());

sides->add(make_shared<quad>(point3(min.x(), min.y(), max.z()), dx, dy, mat)); // front
sides->add(make_shared<quad>(point3(max.x(), min.y(), max.z()), -dz, dy, mat)); // right
sides->add(make_shared<quad>(point3(max.x(), min.y(), min.z()), -dx, dy, mat)); // back
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dz, dy, mat)); // left
sides->add(make_shared<quad>(point3(min.x(), max.y(), max.z()), dx, -dz, mat)); // top
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dy, dx, mat)); // back
sides->add(make_shared<quad>(min, dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dz, dy, mat)); // left
sides->add(make_shared<quad>(max, -dx, -dy, mat)); // front
sides->add(make_shared<quad>(max, -dz, -dx, mat)); // top
sides->add(make_shared<quad>(max, -dy, -dz, mat)); // right

return sides;
}
Expand Down
12 changes: 6 additions & 6 deletions src/TheRestOfYourLife/quad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ inline shared_ptr<hittable_list> box(const point3& a, const point3& b, shared_pt
auto dy = vec3(0, max.y() - min.y(), 0);
auto dz = vec3(0, 0, max.z() - min.z());

sides->add(make_shared<quad>(point3(min.x(), min.y(), max.z()), dx, dy, mat)); // front
sides->add(make_shared<quad>(point3(max.x(), min.y(), max.z()), -dz, dy, mat)); // right
sides->add(make_shared<quad>(point3(max.x(), min.y(), min.z()), -dx, dy, mat)); // back
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dz, dy, mat)); // left
sides->add(make_shared<quad>(point3(min.x(), max.y(), max.z()), dx, -dz, mat)); // top
sides->add(make_shared<quad>(point3(min.x(), min.y(), min.z()), dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dy, dx, mat)); // back
sides->add(make_shared<quad>(min, dx, dz, mat)); // bottom
sides->add(make_shared<quad>(min, dz, dy, mat)); // left
sides->add(make_shared<quad>(max, -dx, -dy, mat)); // front
sides->add(make_shared<quad>(max, -dz, -dx, mat)); // top
sides->add(make_shared<quad>(max, -dy, -dz, mat)); // right

return sides;
}
Expand Down