Changeset 422 for trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

Timestamp:

11/18/05 16:29:31 (19 years ago)

Author:

mattausch

Message:

worded on vspkdtree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -23 +23 @@
   environment->Parse(argc, argv, USE_EXE_PATH);
   MeshKdTree::ParseEnvironment();
-  BspTree::ParseEnvironment();
- 
+   
   char buff[128];
   
@@ -58 +57 @@
   p->ParseViewCellsOptions();
 
-  // construct tree immediately for "from view cells" or "from scene geometry"
-  // construction method. For "from rays" construction, wait until there is
-  // a certain number of rays collected
-  if (ViewCell::sHierarchy == ViewCell::BSP &&
-          !(BspTree::sConstructionMethod == BspTree::FROM_RAYS)) 
+  if (ViewCell::sHierarchy == ViewCell::BSP)
   {
-          if (BspTree::sConstructionMethod == BspTree::FROM_INPUT_VIEW_CELLS)
-          {
-                  // view cells input file name
-                  environment->GetStringValue("ViewCells.filename", buff);
-                  string vcFilename(buff);
-                  p->LoadViewCells(vcFilename);
-                  Debug << (int)p->mViewCells.size() << " view cells loaded" << endl;
+          BspTree::ParseEnvironment();
+
+          // We construct BSP tree immediately for "from view cells" or "from scene geometry"
+          // construction method. 
+          // For the "from samples" option, construction is delayed until enough samples were collected
+          if (BspTree::sConstructionMethod != BspTree::FROM_SAMPLES)
+          {             
+                  if (BspTree::sConstructionMethod == BspTree::FROM_INPUT_VIEW_CELLS)
+                  {
+                          //-- load view cells from file
+                          environment->GetStringValue("ViewCells.filename", buff);
+                          string vcFilename(buff);
+                          p->LoadViewCells(vcFilename);
+                          Debug << (int)p->mViewCells.size() << " view cells loaded" << endl;
+                  }
+                  
+                  p->BuildBspTree();
+        
+                  p->Export("vc_bsptree.x3d", false, false, true);
+                  p->BspTreeStatistics(Debug);
           }
-        
-          p->BuildBspTree();
-        
-          p->Export("vc_bsptree.x3d", false, false, true);
-          p->BspTreeStatistics(Debug);
   }