Changeset 448 for trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

Timestamp:

12/05/05 04:42:54 (19 years ago)

Author:

mattausch

Message:

fixed bug in VspBspTree?
view cells in VssPreprocessor?
bounding rays for vspkdtree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -9 +9 @@
 #include "VssRay.h"
 #include "RssTree.h"
-
+#include "ViewCellBsp.h"
 
 static bool useViewSpaceBox = true;//true;
@@ -474 +474 @@
   }
   
-  //-- 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);
-  }
-  
   rssTree = new RssTree;
   // viewcells = Construct(mVssRays);
@@ -567 +550 @@
         }
 
-        // cast rays into BSP tree
-        if (ViewCell::sHierarchy == ViewCell::BSP) 
-          {
-                for (int i = 0; i < (int)vssRays.size(); ++ i)
-                  {
-                        CastRay(*mBspTree, *vssRays[i]);
-                  }
-          }
-
         samples+=num;
         float pvs = rssTree->GetAvgPvsSize();
@@ -598 +572 @@
   delete rssTree;
   
-  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;
@@ -646 +605 @@
           BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
           // if ray not in unbounded space
-          if (leaf->GetViewCell() != &mUnbounded)
+/*        if (leaf->GetViewCell() != &mUnbounded)
                 contributingSamples += 
-                  leaf->GetViewCell()->GetPvs().AddSample(obj);
+                  leaf->GetViewCell()->GetPvs().AddSample(obj);*/
         }
  
@@ -657 +616 @@
                 BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
                 
-                if (leaf->GetViewCell() != &mUnbounded)
+        /*      if (leaf->GetViewCell() != &mUnbounded)
                   leaf->GetViewCell()->
-                        AddPassingRay(ray, contributingSamples ? 1 : 0);
+                        AddPassingRay(ray, contributingSamples ? 1 : 0);*/
           }