nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

g/cylinder: use (barely) saner member names

Browse Source
This commit is contained in:
Danny Robson 2015-10-15 00:38:54 +11:00
parent ac06282f03
commit b47cb6c560
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
geom/cylinder.cpp
View File

@ -22,16 +22,16 @@ using util::geom::cylinder;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
template <size_t S, typename T> template <size_t S, typename T>
bool bool
cylinder<S,T>::includes (util::point<S,T> p) const cylinder<S,T>::includes (util::point<S,T> p_) const
{ {
auto ab = b - a; auto p10 = p1 - p0;
auto pa = p - a; auto p_0 = p_ - p0;
auto l = dot (ab, pa); auto l = dot (p10, p_0);
if (l < 0 || l > ab.magnitude2 ()) if (l < 0 || l > p10.magnitude2 ())
return false; return false;
auto d = dot (pa, pa) - l * l * ab.magnitude2 (); auto d = dot (p10, p10) - l * l * p10.magnitude2 ();
if (d > radius * radius) if (d > radius * radius)
return false; return false;

2
geom/cylinder.hpp
View File

@ -23,7 +23,7 @@ namespace util { namespace geom {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
template <size_t S, typename T> template <size_t S, typename T>
struct cylinder { struct cylinder {
util::point<S,T> a, b; util::point<S,T> p0, p1;
T radius; T radius;
float distance (util::point<S,T>) const; float distance (util::point<S,T>) const;