1 files changed, 75 insertions, 20 deletions

diff --git a/BSPTree.h b/BSPTree.h
index dc7e2df..50f18df 100644
--- a/BSPTree.h
+++ b/BSPTree.h
@@ -4,67 +4,122 @@
 #include "Triangle.h"
 #include <list>
 #include <cmath>
+#include <vmmlib/vector.hpp>
 
 class BSPTree {
   private:
     class Plane {
       public:
         Plane() : d(0) {}
-        Plane(const Vector &n, float d0) : normal(n), d(d0) {}
+        Plane(const vmml::vec3f &n, float d0) : normal(n), d(d0) {}
+        Plane(const Triangle &t) : normal(t.getNormal()), d(t.getVertex(0).dot(normal)) {}
 
-        bool contains(Vertex v) {
-          return (fabsf(normal.dot(Vector(v)) - d) < 1E-6);
+        bool contains(const vmml::vec3f &v) const {
+          return (fabsf(normal.dot(v) - d) < 1E-6);
         }
 
-        bool isBehind(Vertex v) {
-          return (normal.dot(Vector(v)) - d) < 0;
+        bool isBehind(const vmml::vec3f &v) const {
+          return (normal.dot(v) - d) < 0;
         }
 
-        const Vector& getNormal() {
+        bool isInFront(const vmml::vec3f &v) const {
+          return (normal.dot(v) - d) > 0;
+        }
+
+
+        bool contains(const Triangle &t) const {
+          for(int i = 0; i < 3; ++i) {
+            if(!contains(t.getVertex(i)))
+              return false;
+          }
+
+          return true;
+        }
+
+        bool isBehind(const Triangle &t) const {
+          for(int i = 0; i < 3; ++i) {
+            if(!isBehind(t.getVertex(i)) && !contains(t.getVertex(i)))
+              return false;
+          }
+
+          return true;
+        }
+
+        bool isInFront(const Triangle &t) const {
+          for(int i = 0; i < 3; ++i) {
+            if(!isInFront(t.getVertex(i)) && !contains(t.getVertex(i)))
+              return false;
+          }
+
+          return true;
+        }
+
+
+        const vmml::vec3f& getNormal() const {
           return normal;
         }
 
+        vmml::vec3f intersection(const vmml::vec3f &p, const vmml::vec3f &dir) const;
+        void partition(const Triangle &t, std::list<Triangle> *front, std::list<Triangle> *back) const;
+
       private:
-        Vector normal;
+        vmml::vec3f normal;
         float d;
     };
 
   public:
     BSPTree(const std::list<Triangle> &triangles);
+    virtual ~BSPTree() {
+      if(frontTree)
+        delete frontTree;
+
+      if(backTree)
+        delete backTree;
+    }
 
     template<typename T>
-    void visit(T& visitor, const Vector &v) {
-      if(plane.getNormal().dot(v) > 0) {
+    void visit(const T& visitor, const vmml::vec3f &p) {
+      doVisit<const T>(visitor, p);
+    }
+
+    template<typename T>
+    void visit(T& visitor, const vmml::vec3f &p) {
+      doVisit(visitor, p);
+    }
+
+  private:
+    Plane plane;
+    std::list<Triangle> triangles;
+    BSPTree *frontTree, *backTree;
+
+    template<typename T>
+    void doVisit(T& visitor, const vmml::vec3f &p) {
+      if(plane.isBehind(p)) {
         if(frontTree)
-          frontTree->visit(visitor, v);
+          frontTree->visit(visitor, p);
 
         for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) {
           visitor(*t);
         }
 
         if(backTree)
-          backTree->visit(visitor, v);
+          backTree->visit(visitor, p);
       }
       else {
         if(backTree)
-          backTree->visit(visitor, v);
+          backTree->visit(visitor, p);
 
         for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) {
           visitor(*t);
         }
 
         if(frontTree)
-          frontTree->visit(visitor, v);
+          frontTree->visit(visitor, p);
       }
     }
 
-  private:
-    Plane plane;
-    std::list<Triangle> triangles;
-    BSPTree *frontTree, *backTree;
-
-    static Vertex findCenter(const std::list<Triangle> &triangles);
-    static const Triangle* findNearestTriangle(const std::list<Triangle> &triangles, const Vertex &v);
+    static vmml::vec3f findCenter(const std::list<Triangle> &triangles);
+    static const Triangle* findNearestTriangle(const std::list<Triangle> &triangles, const vmml::vec3f &v);
 };
 
 #endif /* _BSPTREE_H_ */