Skip to content

Added closest(line, line) and test #65

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
Daniel2000815 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added closest(line, line) and test #65

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
858b705
Added closest(line, line) and test
Daniel2000815 Feb 8, 2024
67c0ace
Remove iostream include
Daniel2000815 Feb 8, 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
33 changes: 33 additions & 0 deletions TEST_Geometry2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,26 @@ class Test_Geometry2D : public olc::PixelGameEngine
return std::visit(dispatch, s1, s2);
}

olc::vf2d CheckClosest(const ShapeWrap& s1, const ShapeWrap& s2)
{
const auto dispatch = overloads{
[](const auto& lhs, const auto& rhs)
{
return closest(make_internal(lhs), make_internal(rhs));
},
// Discard not implemented
[](const Ray&, const auto&) { return olc::vf2d{}; },
[](const auto&, const Ray&) {return olc::vf2d{}; },
[](const Ray&, const Ray&) {return olc::vf2d{}; },
[](const Line&, const Rect&) {return olc::vf2d{}; },
[](const Rect&, const Rect&) {return olc::vf2d{}; },
[](const Circle&, const Rect&) {return olc::vf2d{}; },
[](const Triangle&, const Rect&) {return olc::vf2d{}; }
};

return std::visit(dispatch, s1, s2);
}

std::vector<olc::vf2d> CheckIntersects(const ShapeWrap& s1, const ShapeWrap& s2)
{
const auto dispatch = overloads{
Expand Down Expand Up @@ -294,6 +314,7 @@ class Test_Geometry2D : public olc::PixelGameEngine
std::vector<size_t> vContains;
std::vector<size_t> vOverlaps;
std::vector<olc::vf2d> vIntersections;
std::vector<olc::vf2d> vClosestsPoints;
if (nSelectedShapeIndex < vecShapes.size())
{
for (size_t i = 0; i < vecShapes.size(); i++)
Expand All @@ -310,6 +331,13 @@ class Test_Geometry2D : public olc::PixelGameEngine

if (CheckOverlaps(vecShapes[nSelectedShapeIndex], vTargetShape))
vOverlaps.push_back(i);

olc::v_2d<float> c = CheckClosest(vecShapes[nSelectedShapeIndex], vTargetShape);
if (c.mag() > 0.f) {
vClosestsPoints.push_back(c);
vClosestsPoints.push_back(CheckClosest(vTargetShape, vecShapes[nSelectedShapeIndex]));
}

}
}

Expand Down Expand Up @@ -369,6 +397,11 @@ class Test_Geometry2D : public olc::PixelGameEngine
for (const auto& intersection : vIntersections)
FillCircle(intersection, 3, olc::RED);

// Draw Closests
for (auto i = 0; i < vClosestsPoints.size()/2; i++)
DrawLine(vClosestsPoints[2 * i], vClosestsPoints[2 * i + 1], olc::DARK_GREY);


if (bRayMode)
{
DrawShape(ray1, olc::CYAN);
Expand Down
27 changes: 25 additions & 2 deletions olcUTIL_Geometry2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,31 @@ namespace olc::utils::geom2d
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const line<T1>& l1, const line<T2>& l2)
{
// TODO:
return {};
auto V1 = l1.end - l1.start;
auto V2 = l2.end - l2.start;
auto V21 = l2.start - l1.start;

auto v22 = V2.dot(V2);
auto v11 = V1.dot(V1);
auto v21 = V2.dot(V1);
auto v21_1 = V21.dot(V1);
auto v21_2 = V21.dot(V2);
auto denom = v21 * v21 - v22 * v11;

float s, t;
if (denom == 0.f) {
s = 0.f;
t = (v11 * s - v21_1) / v21;
}
else {
s = (v21_2 * v21 - v22 * v21_1) / denom;
t = (-v21_1 * v21 + v11 * v21_2) / denom;
}

s = std::max(std::min(s, 1.f), 0.f);
t = std::max(std::min(t, 1.f), 0.f);

return l1.start + s * V1;
}

// closest(r,l)
Expand Down