Skip to content

Added circle-circle closest. #49

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

Added circle-circle closest. #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1395e42
Added circle-circle closest. In the case of overlaps, selects point c…
psdnmstr Feb 5, 2024
be01276
Revert "Added circle-circle closest. In the case of overlaps, selects…
psdnmstr Feb 5, 2024
75c3b8f
Changed some typos with function variables, shouldn't affect any actu…
psdnmstr Feb 5, 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
20 changes: 10 additions & 10 deletions olcUTIL_Geometry2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ namespace olc::utils::geom2d
// closest(ray,p)
// Returns closest point on ray to point
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const ray<T1>& r, const olc::v_2d<T2>& p)
inline olc::v_2d<T1> closest(const ray<T1>& q, const olc::v_2d<T2>& p)
{
// TODO: implement
return p;
Expand Down Expand Up @@ -940,7 +940,7 @@ namespace olc::utils::geom2d
// closest(r,c)
// Returns closest point on rectangle to circle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const rect<T1>& r, const circle<T2>& l)
inline olc::v_2d<T1> closest(const rect<T1>& r, const circle<T2>& c)
{
// TODO:
return {};
Expand All @@ -949,7 +949,7 @@ namespace olc::utils::geom2d
// closest(c,c)
// Returns closest point on circle to circle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const circle<T1>& c, const circle<T2>& l)
inline olc::v_2d<T1> closest(const circle<T1>& c1, const circle<T2>& c2)
{
// TODO:
return {};
Expand All @@ -958,7 +958,7 @@ namespace olc::utils::geom2d
// closest(t,c)
// Returns closest point on triangle to circle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const triangle<T1>& r, const circle<T2>& l)
inline olc::v_2d<T1> closest(const triangle<T1>& t, const circle<T2>& c)
{
// TODO:
return {};
Expand All @@ -970,7 +970,7 @@ namespace olc::utils::geom2d
// closest(l,t)
// Returns closest point on line to triangle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const line<T1>& l, const triangle<T2>& c)
inline olc::v_2d<T1> closest(const line<T1>& l, const triangle<T2>& t)
{
// TODO:
return {};
Expand All @@ -979,7 +979,7 @@ namespace olc::utils::geom2d
// closest(r,t)
// Returns closest point on rectangle to triangle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const rect<T1>& r, const triangle<T2>& l)
inline olc::v_2d<T1> closest(const rect<T1>& r, const triangle<T2>& t)
{
// TODO:
return {};
Expand All @@ -988,7 +988,7 @@ namespace olc::utils::geom2d
// closest(c,t)
// Returns closest point on circle to triangle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const circle<T1>& c, const triangle<T2>& l)
inline olc::v_2d<T1> closest(const circle<T1>& c, const triangle<T2>& t)
{
// TODO:
return {};
Expand All @@ -997,7 +997,7 @@ namespace olc::utils::geom2d
// closest(t,t)
// Returns closest point on triangle to triangle
template<typename T1, typename T2>
inline olc::v_2d<T1> closest(const triangle<T1>& r, const triangle<T2>& l)
inline olc::v_2d<T1> closest(const triangle<T1>& t1, const triangle<T2>& t2)
{
// TODO:
return {};
Expand Down Expand Up @@ -1208,9 +1208,9 @@ namespace olc::utils::geom2d
// contains(c,l)
// Check if circle contains line segment
template<typename T1, typename T2>
inline constexpr bool contains(const circle<T1>& c1, const line<T2>& l)
inline constexpr bool contains(const circle<T1>& c, const line<T2>& l)
{
return contains(c1, l.start) && contains(c1, l.end);
return contains(c, l.start) && contains(c, l.end);
}

// contains(t,l)
Expand Down