Changeset 12850

Timestamp:

10/26/11 11:34:50 (19 months ago)

Author:

robert

Message:

Implement a simply attempt at detecting when the pixel format needs to be swapped.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/vnc/ReaderWriterVNC.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/vnc/ReaderWriterVNC.cpp

@@ -90 +90 @@
                         if(i)
                         {
-                            OSG_NOTICE<<"Handling "<<i<<" messages"<<std::endl;
+                            OSG_INFO<<"VNC Handling "<<i<<" messages"<<std::endl;
                         
                             if(!HandleRFBServerMessage(_client))
@@ -261 +261 @@
     osg::Image* image = (osg::Image*)(rfbClientGetClientData(client, 0));
     
-    int width=client->width;
-    int height=client->height;
-    int depth=client->format.bitsPerPixel;
+    int width = client->width;
+    int height = client->height;
+    int depth = client->format.bitsPerPixel;
 
     OSG_NOTICE<<"resize "<<width<<", "<<height<<", "<<depth<<" image = "<<image<<std::endl;
-
-    image->allocateImage(width,height,1,GL_RGBA,GL_UNSIGNED_BYTE);
+    PrintPixelFormat(&(client->format));
+
+    bool swap = client->format.redShift!=0;
+    GLenum gl_pixelFormat = swap ? GL_BGRA : GL_RGBA;
+
+    image->allocateImage(width, height, 1, gl_pixelFormat, GL_UNSIGNED_BYTE);
+    image->setInternalTextureFormat(GL_RGBA);
+
+
     
     client->frameBuffer= (uint8_t*)(image->data());