Changeset 1763 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

11/16/06 19:41:44 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (13 diffs)

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

@@ -1579 +1579 @@
                 mViewCellsTree->UpdateViewCellsStats(*it, mCurrentViewCellsStats);
         }
-        cout << "here44 " << mCurrentViewCellsStats.maxPvs << endl;
 }
 
@@ -2214 +2213 @@
 {
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-cout << "here2" << endl;
+
         for (it = mViewCells.begin(); it != it_end; ++ it)
-        {cout << "here4 " << mOnlyValidViewCells << " " << (*it)->GetValid() <<  endl;
+        {
                 if (!mOnlyValidViewCells || (*it)->GetValid())
-                {cout << "here5 " << mColorCode << endl;
+                {
                         ExportColor(exporter, *it, colorCode);  
                         ExportViewCellGeometry(exporter, *it, sceneBox, clipPlane);
@@ -2789 +2788 @@
                 
         case 1: // pvs
-                { //cout << "here22 " << mCurrentViewCellsStats.maxPvs << endl;
+                {
                         if (mCurrentViewCellsStats.maxPvs)
                         {
-                                //cout << "pvscost : " << (float)mViewCellsTree->GetPvsCost(vc) << endl;
-                                //cout << "maxPvs : " << (float)mCurrentViewCellsStats.maxPvs << endl;
-
-                                importance = 
-                                        (float)mViewCellsTree->GetPvsCost(vc) / 
-                                        (float)mCurrentViewCellsStats.maxPvs;
+                                importance = (float)mViewCellsTree->GetPvsCost(vc) / 
+                                                         (float)mCurrentViewCellsStats.maxPvs;
                         }
                 }
@@ -2817 +2812 @@
 #endif
         default:
-                cout << "here10" << endl;
                 break;
         }
@@ -3057 +3051 @@
         const int savedColorCode = mColorCode;
 
+        Exporter *exporter;
+
+#if 0
         // export merged view cells
         mColorCode = 0; // use random colors
 
-        Exporter *exporter = Exporter::GetExporter("merged_view_cells.wrl");
+        exporter = Exporter::GetExporter("merged_view_cells.wrl");
 
         cout << "exporting view cells after merge ... ";
@@ -3077 +3074 @@
         }
         cout << "finished" << endl;
+#endif
 
         // export merged view cells using pvs color coding
-        
         exporter = Exporter::GetExporter("merged_view_cells_pvs.wrl");
         cout << "exporting view cells after merge (pvs size) ... ";     
@@ -3092 +3089 @@
                 exporter->SetFilled();
                 mColorCode = 1;
-cout << "here49 " << mColorCode << endl;
+
                 ExportViewCellsForViz(exporter, NULL,  mColorCode, GetClipPlane());
 
@@ -3183 +3180 @@
 
         //  visualization of the view cells
-        if (0) ExportMergedViewCells(objects);
+        if (1) ExportMergedViewCells(objects);
 
         // compute final meshes and volume / area
@@ -5504 +5501 @@
         Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
 
+        Vector3 scale(1.0f, 0.9f, 1.0f);
         if (exporter)
         {
+                EvaluateViewCellsStats();
+
                 // hack color code (show pvs size)
                 const int savedColorCode = mColorCode;
-                mColorCode = 0;
+                mColorCode = 1; // export pvs
 
                 const long starttime = GetTime();
@@ -5515 +5515 @@
                 // matt: hack for clamping scene
                 AxisAlignedBox3 bbox = mViewSpaceBox;
-                bbox.Scale(Vector3(0.5, 1, 0.5));
+                bbox.Scale(scale);
 
                 if (CLAMP_TO_BOX)
@@ -5536 +5536 @@
                 mHierarchyManager->ExportObjectSpaceHierarchy(exporter, objects, 
                                                                                                           CLAMP_TO_BOX ? &bbox : NULL, false);
-                ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
+                
+                //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
+                ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
 
                 delete exporter;
@@ -5553 +5555 @@
                 // matt: hack for making visualization smaller in size
                 AxisAlignedBox3 bbox = mHierarchyManager->GetObjectSpaceBox();
-                bbox.Scale(Vector3(0.5, 1, 0.5));
+                bbox.Scale(scale);
 
                 cout << "exporting object space hierarchy ... ";
@@ -5562 +5564 @@
         }
         
-        cout << "here92 " << mHierarchyManager->GetVspTree()->GetStatistics().maxPvs << endl;
-
         // visualization of the view cells
-    if (1) 
+    if (0) 
         {       
-                EvaluateViewCellsStats();
                 ExportMergedViewCells(objects);
         }