Changeset 292 for trunk

Timestamp:

09/19/05 19:04:55 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (2 diffs)
• src/X3dExporter.cpp (modified) (4 diffs)
• src/X3dExporter.h (modified) (1 diff)
• src/main.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -66 +66 @@
 BspTree {
 #       splitPlaneStrategy leastSplits
-#       splitPlaneStrategy balancedTree
+        splitPlaneStrategy balancedTree
 #       splitPlaneStrategy nextPolygon
-        splitPlaneStrategy combined
+#       splitPlaneStrategy combined
 #       constructionMethod rays
         constructionMethod viewCells

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -603 +603 @@
 
                         //leaf->mViewCellIdx = counter;
-                        Debug << "insert view cell" << endl;
+                        Debug << "insert view cell " << tData.mViewCell << endl;
 
                         leaf->SetViewCell(dynamic_cast<ViewCell *>(tData.mViewCell));
@@ -629 +629 @@
         if ((backPolys->size() == 0) && (coincident.size() > 1)) 
         {
-                Debug << "WARNING: size " << coincident.size() << " at depth " << tData.mDepth << ", #back polys: " << (int)backPolys->size() << ", #front polys: " << (int)frontPolys->size() << endl;
+                Debug << "WARNING: size " << (int)coincident.size() << " at depth " << tData.mDepth << ", #back polys: " << (int)backPolys->size() << ", #front polys: " << (int)frontPolys->size() << endl;
                 for (int i=0; i<coincident.size(); ++i)
-                        Debug << "coincident " << i << " vc " << *coincident[i]->mParent << endl;
+                        Debug << "coincident poly " << i << ", vc: " << coincident[i]->mParent << "\n" << *coincident[i] << endl;
         }
         //Debug << "coincident size: " << coincident.size() << endl;

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -8 +8 @@
 #include "ViewCell.h"
 #include "Polygon3.h"
-
+ViewCellContainer X3dExporter::foundViewCells; // TODO: delete later
 
 X3dExporter::X3dExporter(const string filename):Exporter(filename)
@@ -395 +395 @@
                 SetFilled();
 
-        ViewCellContainer mFoundViewCells;
+        //ViewCellContainer foundViewCells;
 
         if (tree.StorePolys())
@@ -436 +436 @@
                                 ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
                                 if (viewCell)
-                                        mFoundViewCells.push_back(viewCell);
+                                        foundViewCells.push_back(viewCell);
                         }
                         else
@@ -447 +447 @@
                 }
 
-                Debug << "Number of view cells with dublicates: " << (int)mFoundViewCells.size() << endl;
+                Debug << "Number of view cells with dublicates: " << (int)foundViewCells.size() << endl;
 
         //-- erase dublicates
-                sort(mFoundViewCells.begin(), mFoundViewCells.end());
-                ViewCellContainer::iterator new_end = unique(mFoundViewCells.begin(), mFoundViewCells.end());
-                mFoundViewCells.erase(new_end, mFoundViewCells.end());
-                ExportViewCells(&mFoundViewCells);
-
-                Debug << "Number of view cells after erasing dublicates: " << (int)mFoundViewCells.size() << endl;
+                sort(foundViewCells.begin(), foundViewCells.end());
+                ViewCellContainer::iterator new_end = unique(foundViewCells.begin(), foundViewCells.end());
+                foundViewCells.erase(new_end, foundViewCells.end());
+                ExportViewCells(&foundViewCells);
+
+                Debug << "Number of view cells after erasing dublicates: " << (int)foundViewCells.size() << endl;
         }
 

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.h

@@ -69 +69 @@
   virtual void 
   ExportViewCells(ViewCellContainer *viewCells);
-
+static ViewCellContainer foundViewCells; // todo: delete later
 protected:
   virtual void

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -8 +8 @@
 #include "MeshKdTree.h"
 #include "Exporter.h"
+#include "X3dExporter.h" // delete later
 
 #define USE_EXE_PATH false
@@ -46 +47 @@
                   p->GenerateViewCells();
 
-          Exporter *exporter = Exporter::GetExporter("viewcells.x3d");
-          if (exporter) 
-          {     
-          exporter->ExportViewCells(&p->mViewCells); // export view cells
-                  delete exporter;
-          }
-          Debug << "Viewcells loaded / generated. Number of view cells: " << p->mViewCells.size() << endl;
+         Debug << "Viewcells loaded / generated. Number of view cells: " << p->mViewCells.size() << endl;
   }
 
@@ -58 +53 @@
   p->BspTreeStatistics(Debug);
   p->Export("vc_bsptree.x3d", false, false, true);
+
+
+  // export the complementary view cells, i.e., the view cells not in the tree.
+  Exporter *exporter = Exporter::GetExporter("viewcells_compl.x3d");
+
+  ViewCellContainer::iterator vc_compl_it;
+  ViewCellContainer vc_compl(p->mViewCells.size() + X3dExporter::foundViewCells.size());
+
+  Debug << "here1" << endl;
+  sort(p->mViewCells.begin(), p->mViewCells.end());
+  Debug << "here2.5 " << X3dExporter::foundViewCells.size() << endl;
+  
+  vc_compl_it = set_difference(p->mViewCells.begin(), p->mViewCells.end(), 
+                                 X3dExporter::foundViewCells.begin(), X3dExporter::foundViewCells.end(),
+                                 vc_compl.begin());
+
+  Debug << "here2" << endl;
+ 
+  vc_compl.erase(vc_compl_it, vc_compl.end());
+  
+  Debug << "Complementary view cells: " << vc_compl.size() << endl;
+
+  if (exporter) 
+  {     
+          exporter->ExportViewCells(&vc_compl); // export view cells
+          delete exporter;
+  }Debug << "here4" << endl;
 
 #endif