Changeset 1563 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

10/03/06 22:03:58 (18 years ago)

Author:

mattausch

Message:

fixed bug with view space box

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp (modified) (4 diffs)

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

@@ -283 +283 @@
   exporter->SetWireframe();
 
-  if (1 || mViewSpaceBox) {
+  if (1) {
         exporter->SetForcedMaterial(RgbColor(1,0,1));
         exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
@@ -321 +321 @@
   exporter->SetWireframe();
 
-  if (1 || mViewSpaceBox) {
+  if (1) {
         exporter->SetForcedMaterial(RgbColor(1,0,1));
         exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
@@ -361 +361 @@
   exporter->SetWireframe();
   exporter->ExportKdTree(*mKdTree);
-        
-  if (mViewSpaceBox) {
-        exporter->SetForcedMaterial(RgbColor(1,0,0));
-        exporter->ExportBox(*mViewSpaceBox);
-        exporter->ResetForcedMaterial();
-  }
         
   exporter->SetForcedMaterial(RgbColor(0,0,1));
@@ -510 +504 @@
   int totalSamples = 0;
 
-  mViewSpaceBox = NULL;
-
   // if not already loaded, construct view cells from file
   if (!mLoadViewCells)
   {
-        if (1) 
-          mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
-        else {
-          AxisAlignedBox3 box = mKdTree->GetBox();
-          
-          if (1) {
-                // use a small box outside of the scene
-                box.Scale(Vector3(0.1f,0.5f,0.5f));
-                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5f, 0, 0));
-          } else {
-                float s = box.Size(0);
-                box.Scale(0.1f);
-                box.SetMin(0, box.Min(0) + s);
-                box.SetMax(0, box.Max(0) + s);
-          }
-         
-          mViewCellsManager->SetViewSpaceBox(box);
-        }
-        
-        // construct view cells using it's own set of samples
-        mViewCellsManager->Construct(this);
-        
-        //-- several visualizations and statistics
-        Debug << "view cells construction finished: " << endl;
-        mViewCellsManager->PrintStatistics(Debug);
-  }
-  
+          // construct view cells using it's own set of samples
+          mViewCellsManager->Construct(this);
+
+          //-- several visualizations and statistics
+          Debug << "view cells construction finished: " << endl;
+          mViewCellsManager->PrintStatistics(Debug);
+  }
+
   
   int rssPass = 0;