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

Timestamp:

02/15/07 13:19:17 (17 years ago)

Author:

mattausch

Message:

implemented bit pvs (warnin: only worjs for preprocessing)

File:

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

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

@@ -681 +681 @@
         if (mUseKdPvs)
         {
-          KdNode *node = GetPreprocessor()->mKdTree->GetPvsNode(isTermination ?
-                                                                                                                        ray.mTermination : ray.mOrigin);
+                KdNode *node = GetPreprocessor()->
+                        mKdTree->GetPvsNode(isTermination ?     ray.mTermination : ray.mOrigin);
           return GetPreprocessor()->mKdTree->GetOrCreateKdIntersectable(node);
         }
@@ -1278 +1278 @@
 
         ViewCellContainer viewCells;
-        
+
+        cout << "objects size: " << ObjectPvsIterator::sObjects.size() << endl;
+        cout << "pvs size: " <<  ObjectPvs::sPvsSize << endl;
+
         // $$ JB hack - the collect best viewcells does not work?
 #if 0
@@ -2612 +2615 @@
 
 
-void
-ViewCellsManager::SortViewCellPvs()
-{
-
-  ViewCellContainer::iterator it, it_end = mViewCells.end();
-  for (it = mViewCells.begin(); it != it_end; ++ it) {
-        ObjectPvs &pvs = (*it)->GetPvs();
-        if (pvs.RequiresResortLog())
-          pvs.SimpleSort();
-  }
-}
+void ViewCellsManager::SortViewCellPvs()
+{
+        ViewCellContainer::iterator it, it_end = mViewCells.end();
+        
+        for (it = mViewCells.begin(); it != it_end; ++ it) 
+        {
+                ObjectPvs &pvs = (*it)->GetPvs();
+                if (pvs.RequiresResortLog())
+                        pvs.SimpleSort();
+        }
+}
+
 
 void ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
@@ -2630 +2634 @@
                                                                                                    const bool addSamplesToPvs)
 {
-  // check if we are outside of view space
-  // $$JB tmp commented to speedup up computations
+        // check if we are outside of view space
+        // $$JB tmp commented to speedup up computations
 #if 0
-  if (!obj || !viewCell->GetValid())
-        return;
+        if (!obj || !viewCell->GetValid())
+                return;
 #endif
-  
-  
-  // if ray not outside of view space
-  float relContribution = 0.0f;
-  float absContribution = 0.0f;
-  bool hasAbsContribution;
-  
-  // todo: maybe not correct for kd node pvs
-  if (addSamplesToPvs) {
-        hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj,
-                                                                                                                                ray.mPdf);
-        //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
-  }
-  else {
-        hasAbsContribution = viewCell->GetPvs().GetSampleContribution(
-                                                                                                                                  obj,
-                                                                                                                                  ray.mPdf,
-                                                                                                                                  relContribution);
-  }
-  
-  // $$ clear the relative contribution as it is currently not correct anyway
-  //  relContribution = 0.0f;
-  
-  if (hasAbsContribution)  {
-        ++ ray.mPvsContribution;
-        absContribution = relContribution = 1.0f;
-        if (viewCell->GetPvs().RequiresResort()) 
-                viewCell->GetPvs().SimpleSort();
+
+        // if ray not outside of view space
+        float relContribution = 0.0f;
+        float absContribution = 0.0f;
+        bool hasAbsContribution;
+
+        // todo: maybe not correct for kd node pvs
+        if (addSamplesToPvs) 
+        {
+                hasAbsContribution = viewCell->GetPvs().
+                        AddSampleDirtyCheck(obj, ray.mPdf);
+                //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
+        }
+        else 
+        {
+                hasAbsContribution = 
+                        viewCell->GetPvs().GetSampleContribution(obj,
+                        ray.mPdf,
+                        relContribution);
+        }
+
+        // $$ clear the relative contribution as it is currently not correct anyway
+        //  relContribution = 0.0f;
+
+        if (hasAbsContribution)  
+        {
+                ++ ray.mPvsContribution;
+                absContribution = relContribution = 1.0f;
+
+                if (viewCell->GetPvs().RequiresResort()) 
+                        viewCell->GetPvs().SimpleSort();
 
 #if CONTRIBUTION_RELATIVE_TO_PVS_SIZE
-        relContribution /= viewcell->GetPvs().GetSize();
+                relContribution /= viewcell->GetPvs().GetSize();
 #endif
-        
+
 #if DIST_WEIGHTED_CONTRIBUTION 
-        // recalculate the contribution - weight the 1.0f contribution by the sqr distance to the
-        // object-> a new contribution in the proximity of the viewcell has a larger weight!
-        relContribution /= SqrDistance(GetViewCellBox(viewcell).Center(),
-                                                                   ray.mTermination);
-        
+                // recalculate the contribution - weight the 1.0f contribution by the sqr distance to the
+                // object-> a new contribution in the proximity of the viewcell has a larger weight!
+                relContribution /= 
+                        SqrDistance(GetViewCellBox(viewcell).Center(), ray.mTermination);
+
 #endif
         }
-  
+
 #if SUM_RAY_CONTRIBUTIONS || AVG_RAY_CONTRIBUTIONS
-  ray.mRelativePvsContribution += relContribution;
+        ray.mRelativePvsContribution += relContribution;
 #else
-  // recalculate relative contribution - use max of Rel Contribution
-  if (ray.mRelativePvsContribution < relContribution)
-        ray.mRelativePvsContribution = relContribution;
+        // recalculate relative contribution - use max of Rel Contribution
+        if (ray.mRelativePvsContribution < relContribution)
+                ray.mRelativePvsContribution = relContribution;
 #endif
 }
@@ -3287 +3294 @@
   while (pit.HasMoreEntries())
   {             
-          ObjectPvsEntry entry = pit.Next();
-  
-          Intersectable *object = entry.mObject;
-      object->Mail();
+      pit.Next()->Mail();
   }
 
@@ -3301 +3305 @@
   {             
           // now go through the pvs again
-          ObjectPvsEntry entry = pit2.Next();
-          Intersectable *object = entry.mObject;
+          Intersectable *object = pit2.Next();
 
           //    Vector3 center = object->GetBox().Center();
@@ -3385 +3388 @@
           while (pit.HasMoreEntries())  
           {
-                  ObjectPvsEntry entry = pit.Next();
-                  Intersectable *object = entry.mObject;
-                  object->Mail();
+                  pit.Next()->Mail();
           }
   }
@@ -3447 +3448 @@
         ObjectContainer objects;
         
+        PvsData pvsData;
+
         while (pit.HasMoreEntries()) {          
-          ObjectPvsEntry entry = pit.Next();
+          Intersectable *object = pit.Next(pvsData);
           
-          Intersectable *object = entry.mObject;
           // compute filter size based on the distance and the numebr of samples
           AxisAlignedBox3 box = object->GetBox();
@@ -3457 +3459 @@
           float globalRadius = distance*globalC;
           
-          int objectSamples = (int)entry.mData.mSumPdf;
+          int objectSamples = (int)pvsData.mSumPdf;
           float localRadius = MAX_FLOAT;
           
@@ -3525 +3527 @@
   if (!mUseKdPvs)
   {
+          PvsData pvsData;
+
           // copy the base pvs to the new pvs
           pit = basePvs.GetIterator();
           while (pit.HasMoreEntries()) 
           {             
-                  ObjectPvsEntry entry = pit.Next();
-                  pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
+                  Intersectable *obj = pit.Next(pvsData);
+                  pvs.AddSampleDirty(obj, pvsData.mSumPdf);
           }
   }