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

Timestamp:

09/28/06 18:51:43 (18 years ago)

Author:

mattausch

Message:

worked on gvs

File:

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

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

@@ -1318 +1318 @@
         
         float sum = 0.0f;
-
         VssRayContainer::const_iterator it, it_end = rays.end();
         
@@ -1831 +1830 @@
                 ViewCell *viewcell = *it;
                 
-                if (viewcell->GetValid()) // tests if view cellis in valid view space
+                if (viewcell->GetValid()) // tests if view cell is in valid view space
                 {
                         float contribution;
@@ -1838 +1837 @@
                         {
                                 if (viewcell->GetPvs().GetSampleContribution(
-                                                ray.mTerminationObject,
-                                                ray.mPdf,
-                                                contribution))
+                                                        ray.mTerminationObject,
+                                                        ray.mPdf,
+                                                        contribution))
                                 {
                                         ++ ray.mPvsContribution;
@@ -1865 +1864 @@
         }
 
-        // if addrays is true, sampled entities are stored in the pvs
+        // if true, the sampled entities are stored in the pvs
         if (addRays)
         {
@@ -1876 +1875 @@
                                 // if view point is valid, add new object to the pvs
                                 if (ray.mTerminationObject)
-                                {
+                                {cout <<"here22" << endl;
                                         viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
                                 }                               
@@ -5483 +5482 @@
                         {
                                 // todo: maybe not correct for kd node pvs
-                                if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                                         ray.mPdf, contribution))
+                                Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
+                                if (viewcell->GetPvs().GetSampleContribution(obj,
+                                                                                                                         ray.mPdf, 
+                                                                                                                         contribution))
                                 {
                                         ++ ray.mPvsContribution;