Changeset 389 for trunk/VUT

Timestamp:

11/08/05 08:28:45 (19 years ago)

Author:

mattausch

Message:

changed bsp castray

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/Environment.cpp (modified) (3 diffs)
• src/SamplingPreprocessor.cpp (modified) (6 diffs)
• src/ViewCellBsp.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -129 +129 @@
         
         maxPolyCandidates 50
-        maxRayCandidates 50
+        maxRayCandidates 0
         
         Termination {
@@ -135 +135 @@
                 maxRays 300
                 maxPolygons 0
-                maxDepth 80
+                maxDepth 50
                 
                 # axis aligned splits
@@ -151 +151 @@
         }
         
-                
-        # if split polys are stored for visualization
-        storeSplitPolys false
-        # x3d visualization of the split planes
-        exportSplits true
+        
+        Visualization
+        {
+                # if split polys are stored for visualization
+                storeSplitPolys false
+                # x3d visualization of the split planes
+                exportSplits true
+                # how much samples should be used in visualization
+        
+                samples 2000
+        }
 }

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1203 +1203 @@
           optInt,
           "-bsp_postprocessing_samples=",
-          "206000");
+          "200000");
 
   RegisterOption("BspTree.Construction.sideTolerance",
@@ -1255 +1255 @@
                  "100");
 
-  RegisterOption("BspTree.storeSplitPolys",
-                 optBool,
-                 "-bsp_store_split_polys=",
-                 "false");
-
   RegisterOption("BspTree.splitPlaneStrategy",
                  optString,
@@ -1279 +1274 @@
           "-view_cells_max_viewcells=",
           "0");
-  
-  RegisterOption("BspTree.exportSplits",
+
+  
+  RegisterOption("Bsptree.Visualization.samples",
+          optInt,
+          "-bsp_visualization_samples=",
+          "20000");
+
+  RegisterOption("BspTree.Visualization.exportSplits",
           optBool,
-          "-bsp_exportSplits",
+          "-bsp_visualization.exportSplits",
           "false");
+
+  RegisterOption("BspTree.Visualization.storePolys",
+                 optBool,
+                 "-bsp_visualization_store_polys=",
+                 "false");
 
   RegisterOption("Preprocessor.type",

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -15 +15 @@
   environment->GetIntValue("BspTree.Construction.samples", mBspConstructionSamples);
   environment->GetIntValue("ViewCells.PostProcessing.samples", mPostProcessSamples);
+  environment->GetIntValue("BspTree.visualizationSamples", mVisualizationSamples);
+
   mKdPvsDepth = 100;
   mStats.open("stats.log");
@@ -605 +607 @@
                 //-- visualization of the BSP splits
                 bool exportSplits = false;
-                environment->GetBoolValue("BspTree.exportSplits", exportSplits);
+                environment->GetBoolValue("BspTree.Visualization.exportSplits", exportSplits);
                 
                 cout << "exporting splits ... ";
@@ -726 +728 @@
         }
         // save rays for post processing
-        else if ((int)mSampleRays.size() < mPostProcessSamples)
+        else if ((int)mSampleRays.size() < mPostProcessSamples) ||
+                        (((int)mSampleRays.size() < mVisualizationSamples))
         {
                 mSampleRays.push_back(new Ray(ray));
@@ -740 +743 @@
         vector<Ray::BspIntersection>::const_iterator iit;
 
-        for (rit = rays.begin(); rit != rays.end(); ++ rit)
+        int limit = min((int)mSampleRays.size(), mPostProcessSamples);
+
+        for (int i = 0; i < limit; ++i)
         {  
+                Ray *ray = mSamplesRays[i];
+
                 // traverse leaves stored in the rays and compare and merge consecutive
                 // leaves (i.e., the neighbors in the tree)
-                if ((*rit)->bspIntersections.empty())
+                if (ray->bspIntersections.empty())
                         continue;
 
-                iit = (*rit)->bspIntersections.begin();
+                iit = ray->bspIntersections.begin();
 
                 BspLeaf *previousLeaf = (*iit).mLeaf;
@@ -834 +841 @@
 
         //-- some rays for output
-        const int raysOut = min((int)mSampleRays.size(), 20000);
+        const int raysOut = min((int)mSampleRays.size(), mVisualizationSamples);
         vector<Ray *> vcRays[leafOut];
 
@@ -991 +998 @@
                         Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() << endl;
 
+                        
+                        // export rays piercing this view cell
+                        exporter->ExportRays(vcRays[i], 10000, RgbColor(0, 1, 0));
+
                         m.mDiffuseColor = RgbColor(1, 0, 0);
                         exporter->SetForcedMaterial(m);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -1580 +1580 @@
         environment->GetFloatValue("BspTree.AxisAligned.splitBorder", sSplitBorder);
         
-        environment->GetBoolValue("BspTree.storeSplitPolys", sStoreSplitPolys);
+        environment->GetBoolValue("BspTree.Visualization.storePolys", sStoreSplitPolys);
 
         environment->GetFloatValue("BspTree.Construction.sideTolerance", Vector3::sDistTolerance);
@@ -1735 +1735 @@
                                 farChild = in->GetBack(); // plane splits ray                   
                         }
-                        else // ray and plane are coincident // WHAT TO DO IN THIS CASE ?
+                        else // ray and plane are coincident
+                        // WHAT TO DO IN THIS CASE ?
                         {
-                                node = in->GetFront();
-                                continue;
+                                break;
+                                //node = in->GetFront();
+                                //continue;
                         }