mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add squaredDistanceTo() methods to AABB

metadata
Wenzel Jakob 2011-02-28 14:03:07 +01:00
parent 04816a4c82
commit 9efd7f785f
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/mitsuba/core/aabb.h
View File

@ -170,8 +170,8 @@ template <typename T> struct TAABB {
}
}
/// Calculate the point-AABB distance
inline value_type distanceTo(const point_type &p) const {
/// Calculate the squared point-AABB distance
inline value_type squaredDistanceTo(const point_type &p) const {
value_type result = 0;
for (int i=0; i<point_type::dim; ++i) {
value_type value = 0;
@ -181,11 +181,16 @@ template <typename T> struct TAABB {
value = p[i] - max[i];
result += value*value;
}
return std::sqrt(result);
return result;
}
/// Calculate the minimum AABB-AABB distance
inline value_type distanceTo(const TAABB &aabb) const {
/// Calculate the point-AABB distance
inline value_type distanceTo(const point_type &p) const {
return std::sqrt(squaredDistanceTo(p));
}
/// Calculate the minimum squared AABB-AABB distance
inline value_type squaredDistanceTo(const TAABB &aabb) const {
value_type result = 0;
for (int i=0; i<point_type::dim; ++i) {
@ -196,7 +201,12 @@ template <typename T> struct TAABB {
value = aabb.min[i] - max[i];
result += value*value;
}
return std::sqrt(result);
return result;
}
/// Calculate the minimum AABB-AABB distance
inline value_type distanceTo(const TAABB &aabb) const {
return std::sqrt(squaredDistanceTo(aabb));
}
/// Return whether this bounding box is valid