Changeset 884 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

05/03/06 11:35:39 (18 years ago)

Author:

bittner

Message:

Spatial visibility filter

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (15 diffs)

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

@@ -44 +44 @@
 #endif
 
-bool useFilter = false;
 
 GlRenderer::GlRenderer(SceneGraph *sceneGraph,
@@ -848 +847 @@
   PrVs prvs;
   
-  if (!useFilter) {
-        viewcell = mViewCellsManager->GetViewCell(mViewPoint);
+  if (!mUseFilter) {
+        viewcell = mViewCellsManager->GetViewCell(mViewPoint, true);
   } else {
         //  mViewCellsManager->SetMaxFilterSize(1);
@@ -857 +856 @@
   
   if (viewcell) {
-        ObjectPvs &pvs = viewcell->GetPvs();
-
+        // copy the pvs so that it can be filtered...
+        ObjectPvs pvs = viewcell->GetPvs();
+
+        if (mUseSpatialFilter) {
+          mViewCellsManager->ApplySpatialFilter(mKdTree,
+                                                                                        mSpatialFilterSize*
+                                                                                        Magnitude(mViewCellsManager->GetViewSpaceBox().Size()),
+                                                                                        //                                                                                      mViewCellsManager->GetFilterWidth()/2,
+                                                                                        pvs);
+        }
+        
+        
         // read back the texture
         std::map<Intersectable *,
@@ -881 +890 @@
         }
         
-        if (useFilter)
+        if (mUseFilter)
           mViewCellsManager->DeleteLocalMergeTree(viewcell);
   } else {
@@ -924 +933 @@
   ViewCell *viewcell;
 
-  PrVs prvs;
-  //  mViewCellsManager->SetMaxFilterSize(1);
-
-
-  if (!useFilter)
-        viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-  else {
-        mViewCellsManager->GetPrVS(mViewPoint, prvs);
-        viewcell = prvs.mViewCell;
-  }
-  
   QImage im1, im2;
   QImage diff;
@@ -942 +940 @@
         im1 = grabFrameBuffer(true);
         
-        SetupCamera();
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        
-        std::map<Intersectable *,
-          PvsData<Intersectable *>,
-          LtSample<Intersectable *> >::const_iterator it = viewcell->GetPvs().mEntries.begin();
-
-        mPvsSize = viewcell->GetPvs().mEntries.size();
-
-        for (; it != viewcell->GetPvs().mEntries.end(); ++ it) {
-          Intersectable *object = (*it).first;
-          RenderIntersectable(object);
-        }
+        RenderPvs();
 
         // read back the texture
@@ -978 +964 @@
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   mUseFalseColors = false;
-        
+  
   oi = mObjects.begin();
   for (; oi != mObjects.end(); oi++)
@@ -1033 +1019 @@
 
   glDisable(GL_CLIP_PLANE0);
-
-  if (useFilter && viewcell)
-        mViewCellsManager->DeleteLocalMergeTree(viewcell);
   
   mRenderError = pErrorPixels;
@@ -1317 +1300 @@
 
 
+  label = new QLabel("Spatial Filter size");
+  vbox->layout()->addWidget(label);
+  
+  slider = new QSlider(Qt::Horizontal, vbox);
+  vbox->layout()->addWidget(slider);
+  slider->show();
+  slider->setRange(1, 100);
+  slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  slider->setValue(10);
+  
+  connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetSpatialFilterSize(int)));
+
+
 
   QWidget *hbox = new QWidget(vbox);
@@ -1363 +1359 @@
   connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetRenderErrors(bool)));
 
+  cb = new QCheckBox("Use filter", vbox);
+  vbox->layout()->addWidget(cb);
+  cb->setChecked(true);
+  connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetUseFilter(bool)));
+
+  cb = new QCheckBox("Use spatial filter", vbox);
+  vbox->layout()->addWidget(cb);
+  cb->setChecked(true);
+  connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetUseSpatialFilter(bool)));
+
   cb = new QCheckBox("Render filter", vbox);
   vbox->layout()->addWidget(cb);
   cb->setChecked(true);
   connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetRenderFilter(bool)));
+
 
   cb = new QCheckBox("Cut view cells", vbox);
@@ -1457 +1464 @@
   mRenderErrors = false;
   mRenderFilter = true;
+  mUseFilter = true;
+  mUseSpatialFilter = true;
   mShowRenderCost = false;
   mShowPvsSizes = false;
-
+  mSpatialFilterSize = 0.01;
   mPvsSize = 0;
   mRenderError = 0.0f;
@@ -1469 +1478 @@
 
   connect(mControlWidget, SIGNAL(SetVisibilityFilterSize(int)), this, SLOT(SetVisibilityFilterSize(int)));
+  connect(mControlWidget, SIGNAL(SetSpatialFilterSize(int)), this, SLOT(SetSpatialFilterSize(int)));
 
   connect(mControlWidget, SIGNAL(SetShowViewCells(bool)), this, SLOT(SetShowViewCells(bool)));
@@ -1478 +1488 @@
   connect(mControlWidget, SIGNAL(SetRenderErrors(bool)), this, SLOT(SetRenderErrors(bool)));
   connect(mControlWidget, SIGNAL(SetRenderFilter(bool)), this, SLOT(SetRenderFilter(bool)));
+  connect(mControlWidget, SIGNAL(SetUseFilter(bool)), this, SLOT(SetUseFilter(bool)));
+  connect(mControlWidget, SIGNAL(SetUseSpatialFilter(bool)),
+                  this, SLOT(SetUseSpatialFilter(bool)));
 
   
@@ -1489 +1502 @@
         //      mViewCellsManager->SetMaxFilterSize(number);
     mViewCellsManager->CollectViewCells(number);
+
   updateGL();
 }
@@ -1497 +1511 @@
   if (mViewCellsManager) 
         mViewCellsManager->SetMaxFilterSize(number);
+  updateGL();
+}
+
+void
+GlRendererWidget::SetSpatialFilterSize(int number)
+{
+  mSpatialFilterSize = 1e-3*number;
   updateGL();
 }