Changeset 612 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

Timestamp:

02/12/06 21:45:02 (18 years ago)

Author:

mattausch

Message:

really last checkin before svn change

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -18 +18 @@
 {
 public:
-        
         //bool operator() (HierarchyNode *v1, HierarchyNode *v2) const
         bool operator() (T v1, T v2) const
@@ -508 +507 @@
                    << "#TotalPvs\n" << totalPvs << endl
                    << "#PvsSizeDecrease\n0" << endl
-                   << "#Volume\n" << endl
-                   << "#Siblings\n" << mergeStats.siblings << endl;
+                   << "#Volume\n0" << endl
+                   //<< "#Siblings\n" << mergeStats.siblings << endl
+                   << endl;
 
         //-- use priority queue to merge leaf pairs
 // HACK
+
         //const float maxAvgCost = 350;
         while (!mMergeQueue.empty())//NumActiveViewCells > mMergeMinViewCells))
@@ -549 +550 @@
                                 ResetMergeQueue();
 
-                        
                         Debug << "Values after reset: "  
                                   << " erc: " << mExpectedCost 
@@ -562 +562 @@
 
 
-        
                 MergeCandidate mc = mMergeQueue.top();
                 mMergeQueue.pop();
@@ -604 +603 @@
                         mergedVc->SetMergeCost(totalRenderCost);
 
-                        if (mViewCellsManager->EqualToSpatialNode(mergedVc))
-                                ++ mergeStats.siblings;
+                        //if (mViewCellsManager->EqualToSpatialNode(mergedVc))
+                        //      ++ mergeStats.siblings;
                         mergedVc->SetCost(realExpectedCost);
 
@@ -616 +615 @@
                                         << "#Pass\n" << pass << endl
                                         << "#Merged\n" << mergeStats.merged << endl 
-                                        << "#Viewcells\n" << realNumActiveViewCells << endl 
+                                        << "#ViewCells\n" << realNumActiveViewCells << endl 
                     << "#RenderCostIncrease\n" << renderCostIncr << endl
                                         << "#TotalRenderCost\n" << totalRenderCost << endl
@@ -625 +624 @@
                                         << "#TotalPvs\n" << totalPvs << endl
                                         << "#PvsSizeDecrease\n" << -pvsDiff << endl
-                                        << "#Volume\n" << mergedVc->GetVolume() << endl;
+                                        << "#Volume\n" << mergedVc->GetVolume() << endl
+                                        << endl;
+                                
                         }
                 }
@@ -638 +639 @@
                         }
                 }
+                
         }
 
@@ -659 +661 @@
                 Debug << "creating root of view cell hierarchy for " 
                           << (int)activeViewCells.size() << " view cells" << endl;
-                /*for (int i = 0;  i < activeViewCells.size(); ++ i){
-                        Debug << "parent " << activeViewCells[i]->GetParent() << endl;
-                        Debug << "viewcell " << activeViewCells[i] << endl;
-                }*/
+                
                 ViewCellInterior *root = mViewCellsManager->MergeViewCells(activeViewCells);
                 root->SetMergeCost(totalRenderCost);
@@ -668 +667 @@
                 root->SetCost(0.0f);
                 
+                mStats 
+                        << "#Pass\n" << pass << endl
+                        << "#Merged\n" << mergeStats.merged << endl 
+                        << "#ViewCells\n" << realNumActiveViewCells << endl 
+            << "#RenderCostIncrease\n" << 0 << endl // TODO
+                        << "#TotalRenderCost\n" << totalRenderCost << endl
+                        << "#CurrentPvs\n" << root->GetPvs().GetSize() << endl
+            << "#ExpectedCost\n" << realExpectedCost << endl
+                        << "#AvgRenderCost\n" << realAvgRenderCost << endl
+                        << "#Deviation\n" << mDeviation << endl
+                        << "#TotalPvs\n" << totalPvs << endl
+                        << "#PvsSizeDecrease\n" << 0 << endl // TODO
+                        << "#Volume\n" << root->GetVolume() << endl
+                        << endl;
+
                 mRoot = root;
         }