Changeset 333 for trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

Timestamp:

10/17/05 21:51:45 (19 years ago)

Author:

bittner

Message:

code merge

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -163 +163 @@
       bool mOnlyDrivingAxis = false;
       if (mOnlyDrivingAxis) {
-        axis = box.Size().DrivingAxis();
-        costRatio = BestCostRatio(leaf,
-                                  box,
-                                  axis,
-                                  position,
-                                  objectsBack,
-                                  objectsFront);
+                                axis = box.Size().DrivingAxis();
+                                costRatio = BestCostRatio(leaf,
+                                                                                                                                        box,
+                                                                                                                                        axis,
+                                                                                                                                        position,
+                                                                                                                                        objectsBack,
+                                                                                                                                        objectsFront);
       } else {
-        costRatio = MAX_FLOAT;
-        for (int i=0; i < 3; i++) {
-          float p;
-          float r = BestCostRatio(leaf,
-                                  box,
-                                  i,
-                                  p,
-                                  objectsBack,
-                                  objectsFront);
-          if (r < costRatio) {
-            costRatio = r;
-            axis = i;
-            position = p;
-          }
-        }
+                                costRatio = MAX_FLOAT;
+                                for (int i=0; i < 3; i++) {
+                                        float p;
+                                        float r = BestCostRatio(leaf,
+                                                                                                                                        box,
+                                                                                                                                        i,
+                                                                                                                                        p,
+                                                                                                                                        objectsBack,
+                                                                                                                                        objectsFront);
+                                        if (r < costRatio) {
+                                                costRatio = r;
+                                                axis = i;
+                                                position = p;
+                                        }
+                                }
       }
       
       if (costRatio > mMaxCostRatio) {
-        //      cout<<"Too big cost ratio "<<costRatio<<endl;
-        axis = -1;
+                                //      cout<<"Too big cost ratio "<<costRatio<<endl;
+                                axis = -1;
       }
       break;
@@ -415 +415 @@
 float
 KdTree::BestCostRatio(
-                      KdLeaf *node,
-                      const AxisAlignedBox3 &box,
-                      const int axis,
-                      float &position,
-                      int &objectsBack,
-                      int &objectsFront
-                      )
+                                                                                        KdLeaf *node,
+                                                                                        const AxisAlignedBox3 &box,
+                                                                                        const int axis,
+                                                                                        float &position,
+                                                                                        int &objectsBack,
+                                                                                        int &objectsFront
+                                                                                        )
 {
 
@@ -439 +439 @@
       totalIntersections += (*ci).intersectable->IntersectionComplexity();
     }
-
+        
   float intersectionsLeft = 0;
   float intersectionsRight = totalIntersections;
-
+        
   int objectsLeft = 0, objectsRight = node->mObjects.size();