Changeset 545 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

01/17/06 00:28:06 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -605 +605 @@
                                                                                    mEpsilon);
                 
-                        frontData.mArea = frontData.mGeometry->GetArea();
-                        backData.mArea = backData.mGeometry->GetArea();
+                        //frontData.mArea = frontData.mGeometry->GetArea();
+                        //backData.mArea = backData.mGeometry->GetArea();
+                        frontData.mArea = frontData.mGeometry->GetVolume();
+                        backData.mArea = backData.mGeometry->GetVolume();
                 }
         }
@@ -851 +853 @@
         int bestAxis = -1;
 
-        // create bounding box of node extent
+        // create bounding box of node geometry
         AxisAlignedBox3 box;
         box.Initialize();
@@ -877 +879 @@
                 nBackGeom[axis] = new BspNodeGeometry();
 
-                if (!mOnlyDrivingAxis || axis == sAxis)
+                if (!mOnlyDrivingAxis || (axis == sAxis))
                 {
                         if (!useCostHeuristics)
@@ -894 +896 @@
                                         
                                         pos = box.Max(); pos[axis] = nPosition[axis];
-                                        AxisAlignedBox3 backBox(box.Min(), pos);
+                                        const AxisAlignedBox3 backBox(box.Min(), pos);
                                         backBox.ExtractPolys(nBackGeom[axis]->mPolys);
                                         
                                         pos = box.Min(); pos[axis] = nPosition[axis];
-                                        AxisAlignedBox3 frontBox(pos, box.Max());
+                                        const AxisAlignedBox3 frontBox(pos, box.Max());
                                         frontBox.ExtractPolys(nFrontGeom[axis]->mPolys);
 
@@ -1107 +1109 @@
                 // we can do this because we always save the
                 // computed values from the axis aligned splits
-                /*frontData.mGeometry = fGeom;
+                frontData.mGeometry = fGeom;
                 backData.mGeometry = bGeom;
                 frontData.mArea = fArea;
                 backData.mArea = bArea;
-*/
+
                 //! error also computed if cost ratio is missed
                 ++ mStat.splits[axis];
@@ -1301 +1303 @@
                                                                                   mBox,
                                                                                   mEpsilon);
-#if 0
-                        AxisAlignedBox3 fbox;
-                        AxisAlignedBox3 bbox;
-                        AxisAlignedBox3 box;
-                        fbox.Initialize();
-                        bbox.Initialize();
-                        box.Initialize();
-
-                        geomFront.IncludeInBox(fbox);
-                        geomBack.IncludeInBox(bbox);
-                        data.mGeometry->IncludeInBox(box);
-
-                        areaFront = fbox.GetVolume();
-                        areaBack = bbox.GetVolume();
-
-                        pOverall = box.GetVolume();
-#else
-                        areaFront = geomFront.GetArea();
-                        areaBack = geomBack.GetArea();
+
+                        
+                        pFront = geomFront.GetVolume();
+                        pBack = geomBack.GetVolume();
+                        //areaFront = geomFront.GetArea();
+                        //areaBack = geomBack.GetArea();
 
                         pOverall = data.mArea;
-#endif
-                        pBack = areaBack;
-                        pFront = areaFront;
+
                 }
                 else // use number of rays to approximate volume