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

Timestamp:

05/29/06 18:54:02 (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

@@ -566 +566 @@
         maxRenderCost = viewCells.back()->GetRenderCost();
 
-        Debug << "histogram minrc: " << minRenderCost << " maxrc: " << maxRenderCost << endl;
-
-        const int intervals = min(50, (int)viewCells.size());
+        Debug << "histogram min rc: " << minRenderCost << " max rc: " << maxRenderCost << endl;
+
+
+        const int intervals = min(20, (int)viewCells.size());
 
         const float range = maxRenderCost - minRenderCost;
@@ -614 +615 @@
                 const float volRatioDif = volDif / totalVol;
 
-                outstream << "#Pass\n" << j << endl;
+                outstream << "#Pass\n" << j ++ << endl;
                 outstream << "#RenderCostRatio\n" << rcRatio << endl;
                 outstream << "#WeightedCost\n" << currentRenderCost / totalVol << endl;
@@ -624 +625 @@
                 // increase current render cost
                 currentRenderCost += stepSize;
-                ++ j;
         }
 
@@ -763 +763 @@
         maxPvsSize = viewCells.back()->GetPvs().GetSize();
         minPvsSize = 0;
+        // hack: normalize pvs size
         maxPvsSize = 1200;
         minPvsSize = 0;
@@ -768 +769 @@
 
         Debug << "histogram minpvssize: " << minPvsSize << " maxpvssize: " << maxPvsSize << endl;
+
 
         const int intervals = min(20, (int)viewCells.size());
@@ -826 +828 @@
                 currentPvsSize += stepSize;
         }
+
         outstream.close();
 }
@@ -902 +905 @@
                 cout << "compute new statistics ... ";
 
-/*Debug << "*******+" << endl;
-float overall = 0;
-stable_sort(leaves.begin(), leaves.end(), ViewCell::SmallerPvs);
-        for (int i = 0; i < leaves.size(); ++ i)
-        {
-                overall += leaves[i]->GetPvs().GetSize();
-                Debug << "i " << i << " !size: " << leaves[i]->GetPvs().GetSize() << " vol: " << leaves[i]->GetVolume() << " overall " << overall << endl;
-                
-        }
-*/
 
                 //-- propagate pvs or pvs size information
@@ -1242 +1235 @@
                                                           int maxPvsSize) const
 {
-  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-
-  for (it = mViewCells.begin(); it != it_end; ++ it) {
-        SetValidity(*it, minPvsSize, maxPvsSize);
-  }
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+
+
+        for (it = mViewCells.begin(); it != it_end; ++ it) 
+        {
+                SetValidity(*it, minPvsSize, maxPvsSize);
+        }
 }
 
@@ -1261 +1256 @@
 
   for (int i=0; i < mViewCells.size(); i++)
-        mViewCells[i]->SetValid(i >= start && i <= end);
-}
-
-int
-ViewCellsManager::CountValidViewcells() const
-{
-  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-  int valid = 0;
-  for (it = mViewCells.begin(); it != it_end; ++ it) {
-        if ((*it)->GetValid())
-          valid ++;
+  {
+          mViewCells[i]->SetValid(i >= start && i <= end);
+  
   }
-  return valid;
+}
+
+int ViewCellsManager::CountValidViewcells() const
+{
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        int valid = 0;
+
+        for (it = mViewCells.begin(); it != it_end; ++ it) 
+        {       
+                if ((*it)->GetValid())
+                        ++ valid;
+        }
+
+        return valid;
 }
 
@@ -4708 +4708 @@
 {
         int numSamples;
+
         environment->GetIntValue("RenderSampler.samples", numSamples);
         cout << "samples" << numSamples << endl;
@@ -4716 +4717 @@
                 return;
 
-        // doing the query
+        //start the from point queries
         long startTime = GetTime();
         cout << "starting sampling of render cost ... ";
@@ -4728 +4729 @@
         vector<RenderCostSample>::const_iterator rit, rit_end = samples.end();
 
+        //std::map<ViewCell *, ObjectPvs> sampleMap;
+
         for (rit = samples.begin(); rit != rit_end; ++ rit)
         {
                 RenderCostSample sample = *rit;
-                //ViewCell *vc = GetViewCell(sample.)pos;
+                
+                ViewCell *vc = GetViewCell(sample.mPosition);
+                
+                AxisAlignedBox3 box(sample.mPosition - Vector3(1, 1, 1), sample.mPosition + Vector3(1, 1, 1));
+        
+                Mesh *hMesh = CreateMeshFromBox(box);
+                
+                DEL_PTR(hMesh);
+#if 0
+                if (!sampleMap.find(vc))
+                        sampleMap.insert(vc, sample.mVisibleObjects);
+                else
+                        sampleMap[vc].Merge(Merge(sample.mVisibleObjects);
+#endif
         }
 }