Changeset 706

Timestamp:

03/16/06 18:42:06 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (10 diffs)
• ViewCellsManager.h (modified) (1 diff)
• X3dExporter.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -181 +181 @@
         return mValid;
 }
-
-
-/*bool ViewCell::IsLeaf() const
-{
-        return true;
-}*/
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -31 +31 @@
 };
 
-typedef priority_queue<ViewCell *, vector<ViewCell *>, myless<vector<ViewCell *>::value_type> > FilterQueue;
+//typedef priority_queue<ViewCell *, vector<ViewCell *>, myless<vector<ViewCell *>::value_type> > FilterQueue;
 
 
@@ -85 +85 @@
         environment->GetIntValue("ViewCells.Filter.maxSize", mMaxFilterSize);
         environment->GetFloatValue("ViewCells.Filter.width", mFilterWidth);
-
+//mSampleEmptyViewCells = true;
         char buf[100];
         environment->GetStringValue("ViewCells.samplingType", buf);
@@ -593 +593 @@
                 
                 ViewCell *bestViewCell = neighborhood[bestViewCellIdx];
-                cout << "here2" << endl;
+        
                 // remove from vector
                 swap(neighborhood[bestViewCellIdx], neighborhood.back());
@@ -602 +602 @@
                         cout << "warning!!" << endl;
                 
-                cout << "here4" << endl;
-
                 // create new root of the hierarchy
                 root = MergeViewCells(root, bestViewCell);
-                cout << "here5" << endl;
         }
 
@@ -702 +699 @@
   for (it = mViewCells.begin(); it != it_end; ++ it) {
         if ((*it)->GetValid())
-          valid++;
+          valid ++;
   }
   return valid;
@@ -944 +941 @@
         // generate parent view cell
         ViewCellInterior *vc = new ViewCellInterior();//GenerateViewCell();
-                cout << "here66" << endl;
+        
         vc->GetPvs() = left->GetPvs();
-                cout << "here44" << endl;
+
         // merge pvs
         vc->GetPvs().Merge(right->GetPvs());
@@ -961 +958 @@
         }
 
-        cout << "here77" << endl;
         vc->SetupChildLink(left);
-        cout << "here88" << endl;
         vc->SetupChildLink(right);
-        cout << "here99" << endl;
-
+        
         return vc;
 }
@@ -1226 +1220 @@
                 ViewCell *viewcell = *it;
 
-                if (viewcell->GetValid()) 
+                if (viewcell->GetValid())// && mSampleEmptyViewCells) // HACK
                 {
                         // HACK
-                        if (TEST_EMPTY_VIEW_CELLS)
+#if TEST_EMPTY_VIEW_CELLS
                                 for (int i = 0; i < mEmptyViewCells.size(); ++i)
                                 {
@@ -1238 +1232 @@
                                         }
                                 }
-
+#endif
                         // if ray not outside of view space
                         float contribution;
@@ -1267 +1261 @@
                         ViewCell *viewcell = *it;
             
-                        if (viewcell->GetValid()) 
+                        if (viewcell->GetValid())
                         {
                                 // if ray not outside of view space

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -511 +511 @@
         ViewCellsTree *mViewCellsTree;
 
+        //bool mSampleEmptyViewCells;
+
         /// maximum number of samples taken for construction of the view cells
         int mConstructionSamples;

GTP/trunk/Lib/Vis/Preprocessing/src/X3dExporter.cpp

@@ -1138 +1138 @@
 void X3dExporter::ExportGeometry(const ObjectContainer &objects)
 {
-#if 0
+#if 1
         for (int j = 0; j < objects.size(); ++ j)
                 ExportIntersectable(objects[j]);