Changeset 12181 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

02/23/11 11:37:51 (2 years ago)

Author:

robert

Message:

Added extra check for GL_BGR and GL_BGRA formats and messages describing image format loaded

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -477 +477 @@
             pixelFormat==GL_LUMINANCE_ALPHA ||
             pixelFormat==GL_RGB ||
-            pixelFormat==GL_RGBA)
+            pixelFormat==GL_RGBA ||
+            pixelFormat==GL_BGR ||
+            pixelFormat==GL_BGRA)
         {
             max_s = osg::maximum(image->s(), max_s);
@@ -486 +488 @@
         else
         {
-            osg::notify(osg::NOTICE)<<"Image "<<image->getFileName()<<" has unsuitable pixel format"<< std::hex<< pixelFormat << std::dec << std::endl;
+            osg::notify(osg::NOTICE)<<"Image "<<image->getFileName()<<" has unsuitable pixel format 0x"<< std::hex<< pixelFormat << std::dec << std::endl;
         }
     }
@@ -1243 +1245 @@
                     if(image)
                     {
+                        OSG_NOTICE<<"Read osg::Image FileName::"<<image->getFileName()<<", pixelFormat=0x"<<std::hex<<image->getPixelFormat()<<std::dec<<", s="<<image->s()<<", t="<<image->t()<<", r="<<image->r()<<std::endl;
                         imageList.push_back(image);
                     }
@@ -1254 +1257 @@
                 if(image)
                 {
+                    OSG_NOTICE<<"Read osg::Image FileName::"<<image->getFileName()<<", pixelFormat=0x"<<std::hex<<image->getPixelFormat()<<std::dec<<", s="<<image->s()<<", t="<<image->t()<<", r="<<image->r()<<std::endl;
                     imageList.push_back(image);
                 }
@@ -1264 +1268 @@
         ProcessRow processRow;
         osg::Image* image = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
-        if (image) images.push_back(image);
+        if (image)
+        {
+            images.push_back(image);
+        }
     }