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

Timestamp:

11/05/08 16:59:48 (5 years ago)

Author:

robert

Message:

Added --no-rescale, --rescale (default) and --shift-min-to-zero command line options for controlling how the pixel data is managed.

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -1797 +1797 @@
     arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt3","Enable the usage of S3TC DXT3 compressed textures.");
     arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt5","Enable the usage of S3TC DXT5 compressed textures.");
-    arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-luminance","For each pixel multiple the alpha value by the luminance.");
-    arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance","For each pixel mSet the alpha value to the luminance.");
+    arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-luminance","For each pixel multiply the alpha value by the luminance.");
+    arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance","For each pixel set the alpha value to the luminance.");
+    arguments.getApplicationUsage()->addCommandLineOption("--replace-rgb-with-luminance","For each rgb pixel convert to the luminance.");
     arguments.getApplicationUsage()->addCommandLineOption("--num-components <num>","Set the number of components to in he target image.");
+    arguments.getApplicationUsage()->addCommandLineOption("--no-rescale","Disable the rescaling of the pixel data to 0.0 to 1.0 range");
+    arguments.getApplicationUsage()->addCommandLineOption("--rescale","Enable the rescale of the pixel data to 0.0 to 1.0 range (default).");
+    arguments.getApplicationUsage()->addCommandLineOption("--shift-min-to-zero","Shift the pixel data so min value is 0.0.");
 //    arguments.getApplicationUsage()->addCommandLineOption("--raw <sizeX> <sizeY> <sizeZ> <numberBytesPerComponent> <numberOfComponents> <endian> <filename>","read a raw image data");
 
@@ -1917 +1921 @@
     while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = REPLACE_ALPHA_WITH_LUMINANACE; }
     while(arguments.read("--replace-rgb-with-luminance")) { colourSpaceOperation = REPLACE_RGB_WITH_LUMINANCE; }
+
+
+    enum RescaleOperation
+    {
+        NO_RESCALE,
+        RESCALE_TO_ZERO_TO_ONE_RANGE,
+        SHIFT_MIN_TO_ZERO
+    };
+    
+    RescaleOperation rescaleOperation = RESCALE_TO_ZERO_TO_ONE_RANGE;
+    while(arguments.read("--no-rescale")) rescaleOperation = NO_RESCALE;
+    while(arguments.read("--rescale")) rescaleOperation = RESCALE_TO_ZERO_TO_ONE_RANGE;
+    while(arguments.read("--shift-min-to-zero")) rescaleOperation = SHIFT_MIN_TO_ZERO;
+
         
     bool resizeToPowerOfTwo = false;
@@ -2157 +2175 @@
         maxComponent = osg::maximum(maxComponent,maxValue[3]);
 
-        float scale = 0.99f/(maxComponent-minComponent);
-        float offset = -minComponent * scale;
-
-
-        for(Images::iterator itr = images.begin();
-            itr != images.end();
-            ++itr)
-        {        
-            osgVolume::offsetAndScaleImage(itr->get(), 
-                osg::Vec4(offset, offset, offset, offset),
-                osg::Vec4(scale, scale, scale, scale));
-        }
+
+        switch(rescaleOperation)
+        {
+            case(NO_RESCALE):
+                break;
+
+            case(RESCALE_TO_ZERO_TO_ONE_RANGE):
+            {
+                float scale = 0.99f/(maxComponent-minComponent);
+                float offset = -minComponent * scale;
+
+                for(Images::iterator itr = images.begin();
+                    itr != images.end();
+                    ++itr)
+                {        
+                    osgVolume::offsetAndScaleImage(itr->get(), 
+                        osg::Vec4(offset, offset, offset, offset),
+                        osg::Vec4(scale, scale, scale, scale));
+                }
+                break;
+            }
+            case(SHIFT_MIN_TO_ZERO):
+            {
+                float offset = -minComponent;
+
+                for(Images::iterator itr = images.begin();
+                    itr != images.end();
+                    ++itr)
+                {        
+                    osgVolume::offsetAndScaleImage(itr->get(), 
+                        osg::Vec4(offset, offset, offset, offset),
+                        osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
+                }
+                break;
+            }
+                break;
+        };
+
     }