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

Timestamp:

11/13/06 15:34:15 (18 years ago)

Author:

bittner

Message:

merge with new pvs

File:

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

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

@@ -314 +314 @@
 }
 
+Intersectable *
+ViewCellsManager::GetIntersectable(const VssRay &ray, const bool isTermination) const
+{
+  return isTermination ? ray.mTerminationObject : ray.mOriginObject;
+}
 
 void
@@ -2591 +2596 @@
   // first determine the average size of the filter
 
+  pvs = viewCell->GetPvs();
   Intersectable::NewMail();
-
+  
   ObjectPvsIterator pit = pvs.GetIterator();
 
@@ -2712 +2718 @@
           ObjectContainer::const_iterator noi = objects.begin();
           for (; noi != objects.end(); ++ noi) {
-                  Intersectable *o = *noi;
-                  // $$ JB warning: pdfs are not correct at this point!   
-                  nPvs.AddSample(o, Limits::Small);
-                  nPvsSize ++;
+                Intersectable *o = *noi;
+                // $$ JB warning: pdfs are not correct at this point!     
+                nPvs.AddSample(o, Limits::Small);
+                nPvsSize ++;
           }
   }
@@ -2721 +2727 @@
   
   pvs.MergeInPlace(nPvs);
-
+  
   Intersectable::NewMail();
 }
@@ -5093 +5099 @@
 }
 
+Intersectable *
+VspOspViewCellsManager::GetIntersectable(const VssRay &ray, const bool isTermination) const
+{
+  return mHierarchyManager->GetIntersectable(ray, isTermination);
+}
 
 HierarchyManager *VspOspViewCellsManager::CreateHierarchyManager(const string &hierarchyType)