Mercurial > ldforge2 / file diff

--- a/src/types/boundingbox.cpp	Sat Dec 14 22:36:06 2019 +0200
+++ b/src/types/boundingbox.cpp	Sat Dec 14 23:00:01 2019 +0200
@@ -26,12 +26,12 @@
 
 void BoundingBox::consider(const Point3D& vertex)
 {
-	this->minimum.x = std::min(vertex.x, this->minimum.x);
-	this->minimum.y = std::min(vertex.y, this->minimum.y);
-	this->minimum.z = std::min(vertex.z, this->minimum.z);
-	this->maximum.x = std::max(vertex.x, this->maximum.x);
-	this->maximum.y = std::max(vertex.y, this->maximum.y);
-	this->maximum.z = std::max(vertex.z, this->maximum.z);
+	this->minimum.x = math::min(vertex.x, this->minimum.x);
+	this->minimum.y = math::min(vertex.y, this->minimum.y);
+	this->minimum.z = math::min(vertex.z, this->minimum.z);
+	this->maximum.x = math::max(vertex.x, this->maximum.x);
+	this->maximum.y = math::max(vertex.y, this->maximum.y);
+	this->maximum.z = math::max(vertex.z, this->maximum.z);
 }
 
 /*
@@ -64,5 +64,5 @@
  */
 double spaceDiagonal(const BoundingBox& box)
 {
-	return distance(box.minimum, box.maximum);
+	return math::distance(box.minimum, box.maximum);
 }