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

Timestamp:

11/05/08 16:04:38 (5 years ago)

Author:

robert

Message:

Added --replace-rgb-with-luminance option

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -1571 +1571 @@
     MODULATE_ALPHA_BY_LUMINANCE,
     MODULATE_ALPHA_BY_COLOUR,
-    REPLACE_ALPHA_WITH_LUMINACE
+    REPLACE_ALPHA_WITH_LUMINANACE,
+    REPLACE_RGB_WITH_LUMINANCE
 };
 
@@ -1610 +1611 @@
 };
 
-void doColourSpaceConversion(ColourSpaceOperation op, osg::Image* image, osg::Vec4& colour)
+osg::Image* doColourSpaceConversion(ColourSpaceOperation op, osg::Image* image, osg::Vec4& colour)
 {
     switch(op)
     {
         case (MODULATE_ALPHA_BY_LUMINANCE):
+        {
             std::cout<<"doing conversion MODULATE_ALPHA_BY_LUMINANCE"<<std::endl;
             osgVolume::modifyImage(image,ModulateAlphaByLuminanceOperator()); 
-            break;
+            return image;
+        }
         case (MODULATE_ALPHA_BY_COLOUR):
+        {
             std::cout<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
             osgVolume::modifyImage(image,ModulateAlphaByColourOperator(colour)); 
-            break;
-        case (REPLACE_ALPHA_WITH_LUMINACE):
-            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINACE"<<std::endl;
+            return image;
+        }
+        case (REPLACE_ALPHA_WITH_LUMINANACE):
+        {
+            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
             osgVolume::modifyImage(image,ReplaceAlphaWithLuminanceOperator()); 
-            break;
+            return image;
+        }
+        case (REPLACE_RGB_WITH_LUMINANCE):
+        {
+            std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
+            osg::Image* newImage = new osg::Image;
+            newImage->allocateImage(image->s(), image->t(), image->r(), GL_LUMINANCE, image->getDataType());
+            osgVolume::copyImage(image, 0, 0, 0, image->s(), image->t(), image->r(),
+                                 newImage, 0, 0, 0, false);
+            return newImage;
+        }
         default:
-            break;
+            return image;
     }
 }
@@ -1899 +1915 @@
     while(arguments.read("--modulate-alpha-by-luminance")) { colourSpaceOperation = MODULATE_ALPHA_BY_LUMINANCE; }
     while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = MODULATE_ALPHA_BY_COLOUR; }
-    while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = REPLACE_ALPHA_WITH_LUMINACE; }
+    while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = REPLACE_ALPHA_WITH_LUMINANACE; }
+    while(arguments.read("--replace-rgb-with-luminance")) { colourSpaceOperation = REPLACE_RGB_WITH_LUMINANCE; }
         
     bool resizeToPowerOfTwo = false;
@@ -2161 +2178 @@
             ++itr)
         {        
-            doColourSpaceConversion(colourSpaceOperation, itr->get(), colourModulate);
+            (*itr) = doColourSpaceConversion(colourSpaceOperation, itr->get(), colourModulate);
         }
     }