Changeset 1405

Timestamp:

09/18/06 02:33:26 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• BvHierarchy.h (modified) (1 diff)
• Exporter.cpp (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -309 +309 @@
         //-- create front and back leaf
 
-        AxisAlignedBox3 fbox = ComputeBoundingBox(sc.mFrontObjects, &parentBox);
-        AxisAlignedBox3 bbox = ComputeBoundingBox(sc.mBackObjects, &parentBox);
+        AxisAlignedBox3 fbox = EvalBoundingBox(sc.mFrontObjects, &parentBox);
+        AxisAlignedBox3 bbox = EvalBoundingBox(sc.mBackObjects, &parentBox);
 
         BvhLeaf *back = 
@@ -1272 +1272 @@
                 //-- surface area heuristics
 
-                const AxisAlignedBox3 box = ComputeBoundingBox(objects);
+                const AxisAlignedBox3 box = EvalBoundingBox(objects);
                 const float area = box.SurfaceArea();
 
@@ -1290 +1290 @@
 
 
-AxisAlignedBox3 BvHierarchy::ComputeBoundingBox(const ObjectContainer &objects,
-                                                                                                const AxisAlignedBox3 *parentBox) const
-{
+AxisAlignedBox3 BvHierarchy::EvalBoundingBox(const ObjectContainer &objects,
+                                                                                         const AxisAlignedBox3 *parentBox) const
+{
+        // if there are no objects in this box, box size is set to parent box size. 
+        // Question: Invalidate box instead?
         if (parentBox && objects.empty())
                 return *parentBox;
@@ -1304 +1306 @@
         {
                 Intersectable *obj = *oit;
-
                 // grow bounding box to include all objects
                 box.Include(obj->GetBox());
@@ -1607 +1608 @@
 {
         //-- create new root
-        AxisAlignedBox3 box = ComputeBoundingBox(objects);
+        AxisAlignedBox3 box = EvalBoundingBox(objects);
         BvhLeaf *bvhleaf = new BvhLeaf(box, NULL, (int)objects.size());
         bvhleaf->mObjects = objects;

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

@@ -700 +700 @@
         /** Prepares construction for vsp and osp trees.
         */
-        AxisAlignedBox3 ComputeBoundingBox(
+        AxisAlignedBox3 EvalBoundingBox(
                 const ObjectContainer &objects, 
                 const AxisAlignedBox3 *parentBox = NULL) const;

GTP/trunk/Lib/Vis/Preprocessing/src/Exporter.cpp

@@ -123 +123 @@
         {
                 BvhLeaf *leaf = *it;
+                if (leaf->mObjects.empty())
+                        continue;
 
                 SetWireframe();
                 SetForcedMaterial(white);
                 ExportBox(leaf->GetBoundingBox());
-                
                 SetFilled();
 
@@ -238 +239 @@
 
         //-- all objects exported as one mesh
-        //-- hack: currently it works only for triangles
+        //-- hack: currently works only for triangles
         PolygonContainer polys;
 

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -404 +404 @@
         
   if (exporter) {
-    if (scene)
+    if (0 && scene)
       exporter->ExportScene(mSceneGraph->GetRoot());
 
-    if (kdtree) {
+    if (0 && kdtree) {
       exporter->SetWireframe();
       exporter->ExportKdTree(*mKdTree);
     }
 
-        if (bsptree) {
+        if (0 && bsptree) {
                 //exporter->SetWireframe();
                 exporter->ExportBspTree(*mBspTree);