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

Timestamp:

11/25/05 17:16:26 (19 years ago)

Author:

mattausch

Message:

bsptree view cells working in VssPreprocessor?

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -440 +440 @@
   cout << "#totalRayStackSize=" << mVssRays.size() << endl <<flush;
         
-  int numExportRays = 10000;
-  //int numExportRays = 0;
+  //int numExportRays = 10000;
+  int numExportRays = 0;
 
   if (numExportRays) {
@@ -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]));
-
+                  bspRays.push_back(new Ray(*mVssRays[i]));
+         
           //-- construct BSP tree using the samples
           mBspTree = new BspTree(&mUnbounded);  
 
+          ObjectContainer objects;
+          mSceneGraph->CollectObjects(&objects);
+          
           mBspTree->SetGenerateViewCells(true);
-          mBspTree->Construct(bspRays);
-
-          Exporter *exporter = Exporter::GetExporter("vccbsprays.x3d");
-                        
-          // export rays piercing this view cell
-          exporter->ExportRays(bspRays, 1000, RgbColor(0, 1, 0));
-
-          // cast remaining initial rays into BSP tree
-          for (int i = bspSamples; i < (int)mVssRays.size(); ++ i)
-                CastRay(*mBspTree, *mVssRays[i]);
+          mBspTree->Construct(objects, bspRays);
         }
 
@@ -587 +582 @@
   //-- cast ray to BSP tree to get intersection with view cells
   Ray ray(vssRay);
-
-  Debug << ray << endl;
-  if (ray.intersections.empty())
-        Debug << "empty ray" << endl;
-  else 
-        Debug << "intersection: " << ray.intersections[0].mT << " " << ray.intersections[0].mObject << endl;
-
   mBspTree->CastRay(ray);
                                 
@@ -601 +589 @@
                         
   if (!ray.intersections.empty()) // second intersection found
-        {
+  {
           //sampleContributions += 
           AddObjectSamples(ray.intersections[0].mObject, ray);
-        }
+  }
 }