intersection methods #4
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aaronkreuz
commented
Mar 23, 2023
| // one point of the segment is inside the cylinder and one is outside -> intersection must exist | ||
| auto param = con_pos0 ? max(insec.value().start, insec.value().end) : min(insec.value().start, insec.value().end); | ||
| return segment<3, ScalarT>{segment_line.pos + segment_line.dir * param, con_pos0 ? s.pos0 : s.pos1}; | ||
| float param = (dot(s.pos1 - s.pos0, segment_line[insec.value().start]) > 0) ? insec.value().start : insec.value().end; |
| [[nodiscard]] constexpr hits<2, pos<3, ScalarT>> intersection_segment_boundary_impl(segment<3, ScalarT> const& s, B const& b) | ||
| { | ||
| // line extension of segment | ||
| auto const line = line3::from_points(s.pos0, s.pos1); |
There was a problem hiding this comment.
line3 -> line<3, ScalarT>
| @@ -2919,7 +3275,7 @@ template <class ScalarT> | |||
| template <class ScalarT> | |||
| [[nodiscard]] constexpr bool intersects(box<2, ScalarT> const& box, sphere<2, ScalarT> const& sphere) | |||
| { | |||
| array<pos<2, ScalarT>, 4> vertices_box = vertices_of(box); | |||
| // array<pos<2, ScalarT>, 4> vertices_box = vertices_of(box); | |||
| template <class ScalarT> | ||
| [[nodiscard]] constexpr optional<segment<3, ScalarT>> intersection(segment<3, ScalarT> const& segment, halfspace<3, ScalarT> const& halfspace) | ||
| { | ||
| bool cont_pos0 = contains(halfspace, segment.pos0); |
There was a problem hiding this comment.
check if order of segment points is consistent with the output segment
There was a problem hiding this comment.
Also check for generic case
| { | ||
| return intersects(c, t); | ||
| auto plane = tg::plane3(disk.normal, disk.center); |
| tg::pos<3, ScalarT> disk_center = project(sphere.center, plane); | ||
|
|
||
| // pythagoras | ||
| auto rad = sqrt(sphere.radius * sphere.radius - distance_sqr(sphere.center, disk_center)); |
There was a problem hiding this comment.
Remove early out and check if sqrt argument is negative.
| // vector orthogonal to cylinder axis and plane normal | ||
| vec<3, ScalarT> orth_vec1 = cross(cylinder.axis.dir, plane.normal); | ||
|
|
||
| if (length(orth_vec1) == 0) |
There was a problem hiding this comment.
check if is_zero_vector(orth_vec1)
| vec<3, ScalarT> orth_vec2 = cross(orth_vec1, plane.normal); | ||
|
|
||
| // second semi-axis | ||
| vec<3, ScalarT> semi_vec2 = cylinder.radius / (tg::sin(tg::angle_between(cylinder.axis.dir, plane.normal))) * normalize(orth_vec2); |
There was a problem hiding this comment.
represent as cross product
| template <class ScalarT> | ||
| [[nodiscard]] constexpr optional<segment<3, ScalarT>> intersection(disk<3, ScalarT> const& disk, plane<3, ScalarT> const& plane) | ||
| { | ||
| if (length(cross(disk.normal, plane.normal)) == 0) |
| { // b) xz-plane and disk with random orientation - intersection through origin | ||
| auto disk = tg::disk3(tg::pos3::zero, 1.f, tg::uniform<tg::dir3>(rng)); | ||
|
|
||
| bool insec_exists = (disk.normal == plane_xz.normal) ? false : true; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added new intersection methods, including test cases for all new methods.