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

Timestamp:

11/24/05 18:38:19 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -423 +423 @@
         }
 
-
+        //-- construct BSP view cells
+        if (ViewCell::sHierarchy == ViewCell::BSP) 
+        {
+                const int bspSamples = min((int)mVssRays.size(), mBspConstructionSamples);
+        
+                for (int i = 0; i < bspSamples; ++ i)
+                        bspRays.push_back(new Ray(*mVssRays[i]));
+
+                //-- construct BSP tree using the samples
+                mBspTree = new BspTree(&mUnbounded);    
+
+                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]);
+        }
 
         vssTree = new VssTree;
-        
-        const int bspSamples = min((int)mVssRays.size(), mBspConstructionSamples);
-        
-        for (int i = 0; i < bspSamples; ++ i)
-                bspRays.push_back(new Ray(*mVssRays[i]));
-
-        mBspTree = new BspTree(&mUnbounded);    
-
-        mBspTree->SetGenerateViewCells(true);
-        mBspTree->Construct(bspRays);
-
-        for (int i = bspSamples; i < (int)mVssRays.size(); ++ i)
-        {
-                CastRay(*mBspTree, *mVssRays[i]);
-        }
 
         vssTree->Construct(mVssRays, mViewSpaceBox);
@@ -486 +493 @@
                 }
 
-                
-                for (int i = 0; i < (int)vssRays.size(); ++ i)
+                // cast rays into BSP tree
+                if (ViewCell::sHierarchy == ViewCell::BSP) 
                 {
-                        CastRay(*mBspTree, *mVssRays[i]);
-                }
-                
+                        for (int i = 0; i < (int)vssRays.size(); ++ i)
+                        {
+                                CastRay(*mBspTree, *mVssRays[i]);
+                        }
+                }
+
                 samples+=num;
                 float pvs = vssTree->GetAvgPvsSize();
@@ -505 +515 @@
         delete vssTree;
 
-        ObjectContainer objects;
-        ExportSplits(objects, bspRays, 10000);
-        ExportBspPvs(objects, bspRays, 10000);
-
-        CLEAR_CONTAINER(bspRays);
+        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;
@@ -519 +539 @@
         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);