Changeset 420 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

11/17/05 18:47:53 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -61 +61 @@
         ObjectContainer objects;
         
-        switch (BspTree::sConstructionMethod)
+        switch (mBspTree->mConstructionMethod)
         {
         case BspTree::FROM_INPUT_VIEW_CELLS:
@@ -181 +181 @@
         }
 
-        if (ViewCell::sHierarchy == ViewCell::BSP)
+        switch(ViewCell::sHierarchy)
         {
-                // cast ray to BSP tree to get intersection with view cells
-                if (mBspTree)
-                {
-                        mBspTree->CastRay(ray);
-                        
-                        if (object)
-                                sampleContributions += AddObjectSamples(object, ray);
-                        
-                        if (!ray.intersections.empty()) // second intersection found
-                        {
-                                sampleContributions += 
-                                        AddObjectSamples(ray.intersections[0].mObject, ray);
-                        }
-                }
-        }
-        else {
-                if (ray.kdLeaves.size()) {
+        case ViewCell::BSP:
+                
+                //-- cast ray to BSP tree to get intersection with view cells
+                if (!mBspTree)
+                        break;
+                
+                mBspTree->CastRay(ray);
+                        
+                if (object)
+                        sampleContributions += AddObjectSamples(object, ray);
+                        
+                if (!ray.intersections.empty()) // second intersection found
+                {
+                        sampleContributions += 
+                                AddObjectSamples(ray.intersections[0].mObject, ray);
+                }
+                break;
+        case ViewCell::KD:
+                if (ray.kdLeaves.size()) 
+                {
                         Intersectable *terminator =
                                 ray.intersections.size() ? ray.intersections[0].mObject: NULL;
 
                         sampleContributions += AddNodeSamples(ray,
-                                                                                                                                                                                object,
-                                                                                                                                                                                terminator);
-                }
-        }
-        
+                                                                                                                                                                        object,
+                                                                                                                                                                        terminator);
+                }
+                break;
+        case ViewCell::VSP:
+                // TODO:
+                break;
+        default:
+                Debug << "Should never come here" << endl;
+                break;
+        }
+
         return sampleContributions;
 }
@@ -573 +583 @@
                         if (exporter)
                         {
+                                exporter->SetWireframe();
                                 exporter->ExportBspLeaves(*mBspTree, stat.maxPvs);
                                 //exporter->ExportBspViewCellPartition(*mBspTree, 0);
+                                
+                                if (1) // export scene geometry
+                                {
+                                        Material m;//= RandomMaterial();
+                                        m.mDiffuseColor = RgbColor(0, 1, 0);
+                                        exporter->SetForcedMaterial(m);
+                                        exporter->SetWireframe();
+        
+                                        for (int j = 0; j < objects.size(); ++ j)
+                                                exporter->ExportIntersectable(objects[j]);
+                                }
+                                        
                                 delete exporter;
                         }
@@ -756 +779 @@
         if (!mBspTree)
         {
-                if ((BspTree::sConstructionMethod == BspTree::FROM_RAYS) &&
+                if ((BspTree::mConstructionMethod == BspTree::FROM_RAYS) &&
                         ((int)mSampleRays.size() < mBspConstructionSamples))
                 {
@@ -866 +889 @@
                                         outRays.push_back(mSampleRays[i]);
                         }
-                        if (BspTree::sConstructionMethod == BspTree::FROM_RAYS)
+                        if (BspTree::mConstructionMethod == BspTree::FROM_RAYS)
                         {
                                 // export rays