summaryrefslogtreecommitdiffstats
path: root/BSPTree.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'BSPTree.cpp')
-rw-r--r--BSPTree.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/BSPTree.cpp b/BSPTree.cpp
index cb182a9..1dbb6a9 100644
--- a/BSPTree.cpp
+++ b/BSPTree.cpp
@@ -5,13 +5,13 @@ BSPTree::BSPTree(const std::list<Triangle> &triangles) : frontTree(0), backTree(
if(triangles.empty())
return;
- Vertex center = findCenter(triangles);
- std::cout << "Center at (" << center.getX() << ", " << center.getY() << ", " << center.getZ() << ")" << std::endl;
+ vmml::vec3f center = findCenter(triangles);
+ std::cout << "Center at " << center << std::endl;
const Triangle *planeT = findNearestTriangle(triangles, center);
plane = Plane(*planeT);
- std::cout << "The plane normal is (" << plane.getNormal().getX() << ", " << plane.getNormal().getY() << ", " << plane.getNormal().getZ() << ")" << std::endl;
+ std::cout << "The plane normal is " << plane.getNormal() << std::endl;
std::list<Triangle> front, back;
@@ -43,8 +43,8 @@ BSPTree::BSPTree(const std::list<Triangle> &triangles) : frontTree(0), backTree(
}
-Vertex BSPTree::findCenter(const std::list<Triangle> &triangles) {
- Vertex v;
+vmml::vec3f BSPTree::findCenter(const std::list<Triangle> &triangles) {
+ vmml::vec3f v;
for(std::list<Triangle>::const_iterator t = triangles.begin(); t != triangles.end(); ++t) {
v += t->getCenter();
@@ -53,17 +53,17 @@ Vertex BSPTree::findCenter(const std::list<Triangle> &triangles) {
return v/triangles.size();
}
-const Triangle* BSPTree::findNearestTriangle(const std::list<Triangle> &triangles, const Vertex &v) {
+const Triangle* BSPTree::findNearestTriangle(const std::list<Triangle> &triangles, const vmml::vec3f &v) {
if(triangles.empty())
return 0;
std::list<Triangle>::const_iterator t = triangles.begin();
const Triangle *current = &*t;
- float distanceSq = current->getCenter().distanceSq(v);
+ float distanceSq = current->getCenter().squared_distance(v);
for(++t; t != triangles.end(); ++t) {
- float d = t->getCenter().distanceSq(v);
+ float d = t->getCenter().squared_distance(v);
if(d < distanceSq) {
current = &*t;
@@ -71,8 +71,8 @@ const Triangle* BSPTree::findNearestTriangle(const std::list<Triangle> &triangle
}
}
- Vertex tCenter = current->getCenter();
- std::cout << "Nearest triangle center at (" << tCenter.getX() << ", " << tCenter.getY() << ", " << tCenter.getZ() << ")" << std::endl;
+ vmml::vec3f tCenter = current->getCenter();
+ std::cout << "Nearest triangle center at " << tCenter << std::endl;
std::cout << "DistanceSq is " << distanceSq << std::endl;
return current;