Merge pull request #384 from jakobwilm/visualizer-fixes

Changed vtkRenderer::Render() to vtkRenderWindow::Render()

Author: rbrusu

visualization/src/pcl_visualizer.cpp

@@ -912,7 +912,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
     if (viewport == 0)
     {
       renderer->RemoveActor (actor);
-//      renderer->Render ();
     }
     else if (viewport == i)               // add the actor only to the specified viewport
     {
@@ -925,7 +924,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
         if (current_actor != actor_to_remove)
           continue;
         renderer->RemoveActor (actor);
-//        renderer->Render ();
         // Found the correct viewport and removed the actor
         return (true);
       }
@@ -952,7 +950,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
     if (viewport == 0)
     {
       renderer->RemoveActor (actor);
-//      renderer->Render ();
     }
     else if (viewport == i)               // add the actor only to the specified viewport
     {
@@ -965,7 +962,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
         if (current_actor != actor_to_remove)
           continue;
         renderer->RemoveActor (actor);
-//        renderer->Render ();
         // Found the correct viewport and removed the actor
         return (true);
       }
@@ -990,12 +986,10 @@ pcl::visualization::PCLVisualizer::addActorToRenderer (const vtkSmartPointer<vtk
     if (viewport == 0)
     {
       renderer->AddActor (actor);
-//      renderer->Render ();
     }
     else if (viewport == i)               // add the actor only to the specified viewport
     {
       renderer->AddActor (actor);
-//      renderer->Render ();
     }
     ++i;
   }
@@ -1017,7 +1011,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
     if (viewport == 0)
     {
       renderer->RemoveActor (actor);
-//      renderer->Render ();
     }
     else if (viewport == i)               // add the actor only to the specified viewport
     {
@@ -1030,7 +1023,6 @@ pcl::visualization::PCLVisualizer::removeActorFromRenderer (const vtkSmartPointe
         if (current_actor != actor_to_remove)
           continue;
         renderer->RemoveActor (actor);
-//        renderer->Render ();
         // Found the correct viewport and removed the actor
         return (true);
       }
@@ -1256,12 +1248,10 @@ pcl::visualization::PCLVisualizer::setBackgroundColor (
     if (viewport == 0)
     {
       renderer->SetBackground (r, g, b);
-//      renderer->Render ();
     }
     else if (viewport == i)               // add the actor only to the specified viewport
     {
       renderer->SetBackground (r, g, b);
-//      renderer->Render ();
     }
     ++i;
   }
@@ -1636,9 +1626,7 @@ pcl::visualization::PCLVisualizer::updateCamera ()
   PCL_WARN ("[pcl::visualization::PCLVisualizer::updateCamera()] This method was deprecated, just re-rendering all scenes now.");
   rens_->InitTraversal ();
   // Update the camera parameters
-  vtkRenderer* renderer = NULL;
-  while ((renderer = rens_->GetNextItem ()) != NULL)
-    renderer->Render ();
+  win_->Render ();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1792,10 +1780,10 @@ pcl::visualization::PCLVisualizer::setCameraPosition (
       cam->SetPosition (pos_x, pos_y, pos_z);
       cam->SetFocalPoint (view_x, view_y, view_z);
       cam->SetViewUp (up_x, up_y, up_z);
-      renderer->Render ();
     }
     ++i;
   }
+  win_->Render ();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1815,10 +1803,10 @@ pcl::visualization::PCLVisualizer::setCameraPosition (
       vtkSmartPointer<vtkCamera> cam = renderer->GetActiveCamera ();
       cam->SetPosition (pos_x, pos_y, pos_z);
       cam->SetViewUp (up_x, up_y, up_z);
-      renderer->Render ();
     }
     ++i;
   }
+  win_->Render ();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1864,11 +1852,10 @@ pcl::visualization::PCLVisualizer::setCameraParameters (const Eigen::Matrix3f &i
       cam->SetViewAngle (fovy);
       cam->SetClippingRange (0.01, 1000.01);
       win_->SetSize (window_size[0], window_size[1]);
-
-      renderer->Render ();
     }
     ++i;
   }
+  win_->Render ();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1972,8 +1959,8 @@ pcl::visualization::PCLVisualizer::resetCameraViewpoint (const std::string &id)
 
     renderer->SetActiveCamera (cam);
     renderer->ResetCameraClippingRange ();
-    renderer->Render ();
   }
+  win_->Render ();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////