Merge branch 'master' of git://git.gamezock.de/c3d

Conflicts:
	Cubehole.cpp
	Cubehole.h
	DisplayClass.cpp
	Trapezocube.cpp

1 files changed, 11 insertions, 27 deletions

diff --git a/BSPTree.h b/BSPTree.h
index 0b13b6b..50f18df 100644
--- a/BSPTree.h
+++ b/BSPTree.h
@@ -79,32 +79,21 @@ class BSPTree {
 
     template<typename T>
     void visit(const T& visitor, const vmml::vec3f &p) {
-      if(plane.isBehind(p)) {
-        if(frontTree)
-          frontTree->visit(visitor, p);
-
-        for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) {
-          visitor(*t);
-        }
-
-        if(backTree)
-          backTree->visit(visitor, p);
-      }
-      else {
-        if(backTree)
-          backTree->visit(visitor, p);
-
-        for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) {
-          visitor(*t);
-        }
-
-        if(frontTree)
-          frontTree->visit(visitor, 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, p);
@@ -129,11 +118,6 @@ class BSPTree {
       }
     }
 
-  private:
-    Plane plane;
-    std::list<Triangle> triangles;
-    BSPTree *frontTree, *backTree;
-
     static vmml::vec3f findCenter(const std::list<Triangle> &triangles);
     static const Triangle* findNearestTriangle(const std::list<Triangle> &triangles, const vmml::vec3f &v);
 };