Changeset 2254

Timestamp:

May 20, 2011 2:13:58 PM (13 years ago)

Author:

ldelgass

Message:

Revert back to offscreen rendering -- onscreen windows have a problem with
pixel ownership test (occlusion), even with double buffering. Keep the
option to build without offscreen rendering for debugging purposes.

Location:

trunk/packages/vizservers/vtkvis

Files:

• Makefile.in (modified) (1 diff)
• RpVtkRenderer.cpp (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -43 +43 @@
 
 USE_CUSTOM_AXES         = #yes
-USE_OFFSCREEN_RENDERING = #yes
+USE_OFFSCREEN_RENDERING = yes
 DEBUG                   = #yes
 TRACE                   = #yes

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -82 +82 @@
     storeCameraOrientation();
     _renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
+#ifdef USE_OFFSCREEN_RENDERING
     _renderWindow->DoubleBufferOff();
-    _renderWindow->SetSize(_windowWidth, _windowHeight);
-#ifdef USE_OFFSCREEN_RENDERING
     _renderWindow->OffScreenRenderingOn();
 #endif
+    _renderWindow->SetSize(_windowWidth, _windowHeight);
     _renderWindow->AddRenderer(_renderer);
     addColorMap("default", ColorMap::createDefault());
@@ -707 +707 @@
     if (_legendRenderWindow == NULL) {
         _legendRenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
+#ifdef USE_OFFSCREEN_RENDERING
         _legendRenderWindow->DoubleBufferOff();
         _legendRenderWindow->OffScreenRenderingOn();
+#endif
     }
 
@@ -760 +762 @@
     _legendRenderWindow->Render();
 
-    _legendRenderWindow->GetPixelData(0, 0, width-1, height-1, 1, imgData);
+    _legendRenderWindow->GetPixelData(0, 0, width-1, height-1,
+                                      !_legendRenderWindow->GetDoubleBuffer(),
+                                      imgData);
     return true;
 }
@@ -2462 +2466 @@
 void Renderer::getRenderedFrame(vtkUnsignedCharArray *imgData)
 {
-    _renderWindow->GetPixelData(0, 0, _windowWidth-1, _windowHeight-1, 1, imgData);
+    _renderWindow->GetPixelData(0, 0, _windowWidth-1, _windowHeight-1,
+                                !_renderWindow->GetDoubleBuffer(), imgData);
     TRACE("Image data size: %d", imgData->GetSize());
 }