Changeset 439 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

11/29/05 00:01:43 (19 years ago)

Author:

mattausch

Message:

added vview cell manager functionality

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -9 +9 @@
 #include "VssRay.h"
 #include "VssTree.h"
-
+#include "ViewCellsManager.h"
 
 bool useViewSpaceBox = true;//true;
@@ -451 +451 @@
   }
         
-  //-- construct BSP view cells
-  if (ViewCell::sHierarchy == ViewCell::BSP) 
-  {
-          const int bspSamples = min((int)mVssRays.size(), mBspConstructionSamples);
-                
-          Debug << "bpssamples: " << bspSamples << endl;
-          for (int i = 0; i < bspSamples; ++ i)
-                  bspRays.push_back(new Ray(*mVssRays[i]));
-         
-          //-- construct BSP tree using the samples
-          mBspTree = new BspTree(&mUnbounded);  
-
-          ObjectContainer objects;
-          mSceneGraph->CollectObjects(&objects);
-          mBspTree->Construct(objects, bspRays);
-        }
+  ObjectContainer objects;
+  mSceneGraph->CollectObjects(&objects);
+
+  //mViewCellsManager->Construct(mVssRays, objects);
 
   vssTree = new VssTree;
@@ -541 +529 @@
 
         // cast rays into BSP tree
-        if (ViewCell::sHierarchy == ViewCell::BSP) 
+        /*if (ViewCell::sHierarchy == ViewCell::BSP) 
           {
                 for (int i = 0; i < (int)vssRays.size(); ++ i)
@@ -548 +536 @@
                   }
           }
-
+*/
         samples+=num;
         float pvs = vssTree->GetAvgPvsSize();
@@ -562 +550 @@
   delete vssTree;
 
-  if (ViewCell::sHierarchy == ViewCell::BSP) 
-        {
-          Debug << mBspTree->GetStatistics();
-
-          ObjectContainer objects;
-          ExportSplits(objects, bspRays, 10000);
-          ExportBspPvs(objects, bspRays, 10000);
-
-          BspViewCellsStatistics stat;
-          mBspTree->EvaluateViewCellsStats(stat);
-          Debug << "original view cell partition:\n" << stat << endl;
-
-          // clear BSP samples
-          CLEAR_CONTAINER(bspRays);
-        }
-
   return true;
 }
-
-void VssPreprocessor::CastRay(const BspTree &tree, const VssRay & vssRay)
-{
-  //-- cast ray to BSP tree to get intersection with view cells
-  Ray ray(vssRay);
-  mBspTree->CastRay(ray);
-                                
-  //if (0 && ray.sourceObject.mObject)
-  //sampleContributions += 
-  //AddObjectSamples(ray.sourceObject.mObject, ray);
-                        
-  if (!ray.intersections.empty()) // second intersection found
-  {
-          //sampleContributions += 
-          AddObjectSamples(ray.intersections[0].mObject, ray);
-  }
-}
-
-int VssPreprocessor::AddObjectSamples(Intersectable *obj, const Ray &ray)
-{
-  int contributingSamples = 0;
-  int j;
- 
-  // object can be seen from the view cell => add to view cell pvs
-  for (j=0; j < ray.bspIntersections.size(); ++ j)
-        {       
-          BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
-          // if ray not in unbounded space
-          if (leaf->GetViewCell() != &mUnbounded)
-                contributingSamples += 
-                  leaf->GetViewCell()->GetPvs().AddSample(obj);
-        }
- 
-  // rays passing through this viewcell
-  if (mPass > 1)
-        for (j=1; j < ((int)ray.bspIntersections.size() - 1); ++ j) 
-          {
-                BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
-                
-                if (leaf->GetViewCell() != &mUnbounded)
-                  leaf->GetViewCell()->
-                        AddPassingRay(ray, contributingSamples ? 1 : 0);
-          }
-  
-  return contributingSamples;
-}