Changeset 1142 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

07/19/06 00:26:49 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (12 diffs)

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

@@ -100 +100 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportBboxesForPvs", mExportBboxesForPvs);
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportPvs", mExportPvs);
-        Environment::GetSingleton()->GetBoolValue("ViewCells.Evaluation.countKdPvs", mCountKdPvs);
+        
 
         char buf[100];
@@ -214 +214 @@
         Debug << "export bounding boxes: " << mExportBboxesForPvs << endl;
         Debug << "export pvs for view cells: " << mExportPvs << endl;
-        Debug << "count kd pvs: " << mCountKdPvs << endl;
+        
         
         Debug << endl;
@@ -788 +788 @@
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        maxPvs = mViewCellsTree->GetPvsSize(viewCells.back(), mCountKdPvs);
+        maxPvs = mViewCellsTree->GetPvsSize(viewCells.back());
         minVal = 0;
 
@@ -832 +832 @@
 
                 while ((i < (int)viewCells.size()) && 
-                           (mViewCellsTree->GetPvsSize(viewCells[i], mCountKdPvs) < currentPvs))
+                           (mViewCellsTree->GetPvsSize(viewCells[i]) < currentPvs))
                 {
                         volDif += viewCells[i]->GetVolume();
@@ -843 +843 @@
                 
                 if (0 && (i < (int)viewCells.size()))
-                        Debug << "new pvs size increase: " << mViewCellsTree->GetPvsSize(viewCells[i], mCountKdPvs) 
+                        Debug << "new pvs size increase: " << mViewCellsTree->GetPvsSize(viewCells[i]) 
                         << " " << currentPvs << endl;
         
@@ -1706 +1706 @@
                 ViewCell *viewcell = *it;
 
-                const int pvsSize = mViewCellsTree->GetPvsSize(viewcell, mCountKdPvs);
+                const int pvsSize = mViewCellsTree->GetPvsSize(viewcell);
 
                 if (pvsSize < stat.minPvs)
@@ -1957 +1957 @@
 float ViewCellsManager::GetRendercost(ViewCell *viewCell) const
 {
-        return mViewCellsTree->GetPvsSize(viewCell, mCountKdPvs);
+        return mViewCellsTree->GetPvsSize(viewCell);
 }
 
@@ -2409 +2409 @@
                         {
                                 importance = 
-                                        (float)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) / 
+                                        (float)mViewCellsTree->GetPvsSize(vc) / 
                                         (float)mCurrentViewCellsStats.maxPvs;
                         }
@@ -4390 +4390 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) << endl;
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
                 //-- export the sample rays
@@ -4904 +4904 @@
         long startTime;
 
-        mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
         //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
-        
+        //mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
+        mHierarchyManager->Construct3(constructionRays, objects, &mViewSpaceBox);
+
         //-- stats
         Debug << mVspTree->GetStatistics() << endl;
@@ -5301 +5302 @@
         }
 
-        if (1) 
+        if (1 && mOspTree->GetRoot()) 
         {       
                 //-- export final object partition
@@ -5383 +5384 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc, mCountKdPvs) << endl;
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
                 //-- export the sample rays