Changeset 320 for trunk/VUT

Timestamp:

10/12/05 01:42:34 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/SamplingPreprocessor.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -56 +56 @@
 
 Sampling {
-        totalSamples    200000
+        totalSamples    500000
         samplesPerPass  10
 }
@@ -67 +67 @@
         #hierarchyType sceneDependent
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
-#       filename ../data/vienna/viewcells-25-sel.x3d
-        filename ../data/vienna/viewcells-25.x3d
+        filename ../data/vienna/viewcells-25-sel.x3d
+#       filename ../data/vienna/viewcells-25.x3d
 #       filename ../data/vienna/viewcells-large-sel.x3d
 }

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -236 +236 @@
   vector<Ray> vcRays[5];
 
+  vector<Ray> viewCellRays; // used for BSP tree construction
   const int fromRaysBspThresh = 1000;
 
@@ -246 +247 @@
                 // construct Bsp tree if not
                 if ((mViewCellsType == Preprocessor::BSP_VIEW_CELLS) &&
-                        !mBspTree->GetRoot() && (passSamples > fromRaysBspThresh))
+                        !mBspTree->GetRoot() && (totalSamples >= fromRaysBspThresh))
                 {
                         BuildBspTree();
@@ -337 +338 @@
                                         
                                         // construct a ray
-
                                         SetupRay(ray, point, direction);
                                         
@@ -344 +344 @@
                                         if (mViewCellsType == BSP_VIEW_CELLS) 
                                         {
+                                                // save rays for bsp tree construction
+                                                if (!mBspTree->GetRoot() && (totalSamples < fromRaysBspThresh))
+                                                {
+                                                        viewCellRays.push_back(ray);
+                                                }
                                                 // check whether we can add this to the rays
                                                 for (int k = 0; k < ray.viewCells.size(); ++ k)