Changeset 556 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

01/19/06 15:30:44 (18 years ago)

Author:

bittner

Message:

debug version looking for glrenderer bug...

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -493 +493 @@
         
                 //-- update pvs
-                int conSamp = 0, sampCon = 0;
-                AddToPvs(leaf, *tData.mRays, conSamp, sampCon);
+                int conSamp = 0;
+                float sampCon = 0.0f;
+                AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
                 mStat.contributingSamples += conSamp;
@@ -660 +661 @@
 void VspBspTree::AddToPvs(BspLeaf *leaf,
                                                   const RayInfoContainer &rays,
-                                                  int &sampleContributions,
+                                                  float &sampleContributions,
                                                   int &contributingSamples)
 {
-        sampleContributions = 0;
-        contributingSamples = 0;
-
-    RayInfoContainer::const_iterator it, it_end = rays.end();
-
-        ViewCell *vc = leaf->GetViewCell();
-
-        // add contributions from samples to the PVS
-        for (it = rays.begin(); it != it_end; ++ it)
-        {
-                int contribution = 0;
-                VssRay *ray = (*it).mRay;
-
-                if (ray->mTerminationObject)
-                        contribution += vc->GetPvs().AddSample(ray->mTerminationObject);
-
-                if (ray->mOriginObject)
-                        contribution += vc->GetPvs().AddSample(ray->mOriginObject);
-
-                if (contribution)
-                {
-                        sampleContributions += contribution;
-                        ++ contributingSamples;
-                }
-                //leaf->mVssRays.push_back(ray);
+  sampleContributions = 0;
+  contributingSamples = 0;
+  
+  RayInfoContainer::const_iterator it, it_end = rays.end();
+  
+  ViewCell *vc = leaf->GetViewCell();
+  
+  // add contributions from samples to the PVS
+  for (it = rays.begin(); it != it_end; ++ it)
+        {
+          float sc = 0.0f;
+          VssRay *ray = (*it).mRay;
+          bool madeContrib = false;
+          float contribution;
+          if (ray->mTerminationObject) {
+                if (vc->GetPvs().AddSample(ray->mTerminationObject, ray->mPdf, contribution))
+                  madeContrib = true;
+                sc += contribution;
+          }
+          
+          if (ray->mOriginObject) {
+                if (vc->GetPvs().AddSample(ray->mOriginObject, ray->mPdf, contribution))
+                  madeContrib = true;
+                sc += contribution;
+          }
+          
+          sampleContributions += sc;
+          if (madeContrib)
+                  ++ contributingSamples;
+                
+          //leaf->mVssRays.push_back(ray);
         }
 }
@@ -1499 +1506 @@
                   << "Depth: " << data.mDepth << " (max: " << mTermMaxDepth << "), "
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
-                  << "Area: " << data.mArea << " (min: " << mTermMinArea << "), "
+          //              << "Area: " << data.mArea << " (min: " << mTermMinArea << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
                   << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "=, "