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

Timestamp:

10/05/05 14:14:35 (19 years ago)

Author:

mattausch

Message:

removed bug when encountering bsp leaf
added flag for view cell type

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -34 +34 @@
   p->KdTreeStatistics(cout);
 
-#ifdef TEST_BSP_VIEWCELLS
-  environment->GetStringValue("Scene.viewcells", buff);
 
-  string vcFilename(buff);
+  if (p->mViewCellsType == Preprocessor::BSP_VIEW_CELLS)
+  {
+           // if BSP tree construction method needs predefined view cells
+          if (BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
+          {
+                  environment->GetStringValue("Scene.viewcells", buff);
+                  
+                  string vcFilename(buff);
+                 
+                  if (vcFilename != "")
+                  p->LoadViewCells(vcFilename);
+                  else
+                          p->GenerateViewCells();
 
-  // if BSP tree construction method needs predefined view cells
-  if (BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
-  {
-          if (vcFilename != "")
-          p->LoadViewCells(vcFilename);
-          else
-                  p->GenerateViewCells();
+                   Debug << "Viewcells loaded / generated. Number of view cells: " << (int)p->mViewCells.size() << endl;
+          }
+          
+          p->BuildBspTree();
+          p->BspTreeStatistics(Debug);
+          p->Export("vc_bsptree2.x3d", false, false, true);
+ 
+#if 0
+          //-- export the complementary view cells
+          // i.e., the view cells not associated with leafs in the tree.
+          Exporter *exporter = Exporter::GetExporter("viewcells_compl.x3d");
 
-         Debug << "Viewcells loaded / generated. Number of view cells: " << (int)p->mViewCells.size() << endl;
-  }
+          ViewCellContainer::iterator vc_compl_it;
+          ViewCellContainer vc_compl(p->mViewCells.size() + X3dExporter::foundViewCells.size());
+  
+          sort(p->mViewCells.begin(), p->mViewCells.end());
 
-  p->BuildBspTree();
-  p->BspTreeStatistics(Debug);
-  p->Export("vc_bsptree2.x3d", false, false, true);
+          vc_compl_it = set_difference(p->mViewCells.begin(), p->mViewCells.end(), 
+                  X3dExporter::foundViewCells.begin(), X3dExporter::foundViewCells.end(), vc_compl.begin());
 
-#if 0
-  //-- export the complementary view cells
-  // i.e., the view cells not associated with leafs in the tree.
-  Exporter *exporter = Exporter::GetExporter("viewcells_compl.x3d");
-
-  ViewCellContainer::iterator vc_compl_it;
-  ViewCellContainer vc_compl(p->mViewCells.size() + X3dExporter::foundViewCells.size());
-  
-  sort(p->mViewCells.begin(), p->mViewCells.end());
-  vc_compl_it = set_difference(p->mViewCells.begin(), p->mViewCells.end(), 
-                                 X3dExporter::foundViewCells.begin(), X3dExporter::foundViewCells.end(),
-                                 vc_compl.begin());
-  vc_compl.erase(vc_compl_it, vc_compl.end());
+          vc_compl.erase(vc_compl_it, vc_compl.end());
   
 
-  if (exporter) 
-  {     
-          Debug << "Exporting complementary view cells" << endl;
-          exporter->ExportViewCells(&vc_compl); // export view cells
-          delete exporter;
+          if (exporter) 
+          {     
+                  Debug << "Exporting complementary view cells" << endl;
+                  exporter->ExportViewCells(&vc_compl); // export view cells
+                  delete exporter;
+          }
+#endif
   }
-#endif
-
-#endif
 
   //  p->mSceneGraph->Export("soda.x3d");