Changeset 2205 for GTP/trunk/Lib

Timestamp:

03/07/07 18:16:49 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• SamplingStrategy.cpp (modified) (1 diff)
• ViewCell.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (5 diffs)
• ViewCellsManager.h (modified) (1 diff)

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

@@ -633 +633 @@
           } else
                 if (strcmp(curr, "spatial")==0) {
-                        Debug << "here4 spatialbox" << endl;
                   mDistributions.push_back(new SpatialBoxBasedDistribution(mPreprocessor));
                 } else

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

@@ -1957 +1957 @@
 
         ////////////////////////////////////////////////
-        // for interiors, pvs can be stored using different methods
+        //-- for interiors, pvs can be stored using different methods
         //
 

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

@@ -76 +76 @@
 mPreprocessor(NULL),
 mViewCellsTree(viewCellsTree),
-mUsePredefinedViewCells(false)
+mUsePredefinedViewCells(false),
+mMixtureDistribution(NULL)
 {
         mViewSpaceBox.Initialize();
@@ -2414 +2415 @@
   stat.avgRelPvsIncrease = 0.0f;
   stat.devRelPvsIncrease = 0.0f;
-  
+  stat.renderCost = 0.0f;
+
   if (mPerViewCellStat.size() != mViewCells.size()) {
         // reset the pvs size array after the first call to this routine
@@ -2427 +2429 @@
   Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluateFilter", evaluateFilter);
 
+  const float vol = mViewSpaceBox.GetVolume();
+
   for (i=0; it != mViewCells.end(); ++ it, i++) 
         {
@@ -2432 +2436 @@
           if (viewcell->GetValid()) {
                 const float pvsCost = mViewCellsTree->GetPvsCost(viewcell);
+                const float renderCost = pvsCost * viewcell->GetVolume() / vol;
 
                 if (pvsCost < stat.minPvs)
@@ -2439 +2444 @@
                 
                 stat.avgPvs += pvsCost;
+                stat.renderCost += renderCost;
 
                 const float pvsEntries = (float)mViewCellsTree->GetPvsEntries(viewcell);

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

@@ -113 +113 @@
                 float maxPvs;
                 float avgPvs;
+                float renderCost;
                 float avgPvsEntries;