Changeset 602

Timestamp:

02/07/06 11:12:50 (18 years ago)

Author:

mattausch

Message:

found bug in Merge

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• ViewCell.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -887 +887 @@
                 vc->SetArea(l->GetArea() + l->GetArea());
         else
-                vc->SetVolume(r->GetVolume() + r->GetVolume());
-        
+        {
+                vc->SetVolume(r->GetVolume() + l->GetVolume());
+        }
         // important so other merge candidates sharing this view cell
         // are notified that the merge cost must be updated!!

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -413 +413 @@
         const float prop = mUseAreaForPvs ? geom->GetArea() : geom->GetVolume();
 
-        Debug << "herevol: " << geom->GetVolume() << endl;
-        Debug << "herevol:: " << mBox.GetVolume() << endl;
-
         VspBspTraversalData tData(mRoot,
                                                           new PolygonContainer(polys),
@@ -433 +430 @@
 
         mTotalCost = tData.GetCost() / mBox.GetVolume();
-
-        Debug << "**volume** " << mBox.GetVolume() << endl;
 
         mSplits = 0;
@@ -675 +670 @@
         
         // if geometry was not already computed
-        if (1)//!frontData.mGeometry && !backData.mGeometry)
+        if (!frontData.mGeometry && !backData.mGeometry)
         {
                 frontData.mGeometry = new BspNodeGeometry();
@@ -693 +688 @@
                 else
                 {
-                        //Debug << "here2" << endl;
                         frontData.mProbability = frontData.mGeometry->GetVolume();
-                        backData.mProbability = tData.mProbability - frontData.mProbability;
-                        //backData.mProbability = backData.mGeometry->GetVolume();
+                        backData.mProbability =  tData.mProbability - frontData.mProbability;
                 }
         }
@@ -1341 +1334 @@
                 {
                         pFront = geomFront.GetVolume();
-                        //pBack = pOverall - geomFront.GetVolume();
-                        pBack = geomBack.GetVolume();
-
-                        /*Debug << "volume: " << data.mGeometry->GetVolume() << endl;
-                        Debug << "volum1: " << geomFront.GetVolume() << endl;
-                        Debug << "volum2: " << geomBack.GetVolume() << endl;
-                        Debug << "sum_: " << geomFront.GetVolume() + geomBack.GetVolume() << endl;*/
+                        pBack = pOverall - geomFront.GetVolume();
                 }
                 else