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

region: correct the 'closest' query calculation

Browse Source
This commit is contained in:
Danny Robson 2019-09-26 08:08:06 +10:00
parent 1a52f0dd58
commit 578a99a6ba
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
region.cpp
View File

@ -113,14 +113,7 @@ template <size_t S, typename T>
typename cruft::region<S,T>::point_t typename cruft::region<S,T>::point_t
cruft::region<S,T>::closest (point_t q) const cruft::region<S,T>::closest (point_t q) const
{ {
point_t out; return clamp (q, p, p + e);
for (size_t i = 0; i < S; ++i)
out[i] = q[i] < p[i] ? p[i] :
q[i] > p[i] ? p[i] + e[i] :
q[i];
return out;
} }
@ -145,9 +138,7 @@ template <size_t S, typename T>
typename region<S,T>::point_t typename region<S,T>::point_t
region<S,T>::constrain (point_t q) const noexcept region<S,T>::constrain (point_t q) const noexcept
{ {
for (size_t i = 0; i < S; ++i) return closest (q);
q[i] = clamp (q[i], p[i], p[i] + e[i]);
return q;
} }