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

Timestamp:

09/29/08 12:56:42 (5 years ago)

Author:

robert

Message:

Added support for using ImageSequence? to animate volumes

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -22 +22 @@
 #include <osg/Texture3D>
 #include <osg/Texture1D>
+#include <osg/ImageSequence>
 #include <osg/TexGen>
 #include <osg/Geode>
@@ -45 +46 @@
 
 #include <osgGA/EventVisitor>
+#include <osgGA/TrackballManipulator>
+#include <osgGA/FlightManipulator>
+#include <osgGA/KeySwitchMatrixManipulator>
 
 #include <osgUtil/CullVisitor>
@@ -1787 +1791 @@
     viewer.addEventHandler(new osgViewer::WindowSizeHandler);
         
+    {
+        osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
+
+        keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
+        keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
+
+        viewer.setCameraManipulator( keyswitchManipulator.get() );
+    }
+
     // add the stats handler
     viewer.addEventHandler(new osgViewer::StatsHandler);
@@ -1897 +1910 @@
     while(arguments.read("--cpu-tf")) { gpuTransferFunction = false; }
 
-    osg::ref_ptr<osg::Image> image_3d;
-    
+    typedef std::list< osg::ref_ptr<osg::Image> > Images;
+    Images images;
+
+
     std::string vh_filename;
     while (arguments.read("--vh", vh_filename)) 
@@ -1919 +1934 @@
         if (!raw_filename.empty())
         {
-            image_3d = readRaw(xdim, ydim, zdim, 1, 1, "little", raw_filename);
+            images.push_back(readRaw(xdim, ydim, zdim, 1, 1, "little", raw_filename));
         }
         
@@ -1960 +1975 @@
     while (arguments.read("--raw", sizeX, sizeY, sizeZ, numberBytesPerComponent, numberOfComponents, endian, raw_filename)) 
     {
-        image_3d = readRaw(sizeX, sizeY, sizeZ, numberBytesPerComponent, numberOfComponents, endian, raw_filename);
+        images.push_back(readRaw(sizeX, sizeY, sizeZ, numberBytesPerComponent, numberOfComponents, endian, raw_filename));
     }
 
@@ -1979 +1994 @@
         // pack the textures into a single texture.
         ProcessRow processRow;
-        image_3d = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
+        images.push_back(createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo));
     }
 
@@ -1992 +2007 @@
         return 1;
     }
+    
 
     // assume remaining arguments are file names of textures.
-    for(int pos=1;pos<arguments.argc() && !image_3d;++pos)
+    for(int pos=1;pos<arguments.argc();++pos)
     {
         if (!arguments.isOption(pos))
@@ -2001 +2017 @@
             if (osgDB::getLowerCaseFileExtension(filename)=="dicom")
             {
-                image_3d = osgDB::readImageFile( filename );
+                images.push_back(osgDB::readImageFile( filename ));
             }
             else
@@ -2038 +2054 @@
                     // pack the textures into a single texture.
                     ProcessRow processRow;
-                    image_3d = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
+                    images.push_back(createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo));
 
                 }
@@ -2044 +2060 @@
                 {
                     // not an option so assume string is a filename.
-                    image_3d = osgDB::readImageFile( filename );
+                    images.push_back(osgDB::readImageFile( filename ));
                 }
                 else
@@ -2055 +2071 @@
     }
     
-    if (!image_3d) 
+    if (images.empty()) 
     {
         std::cout<<"No model loaded, please specify and volumetric image file on the command line."<<std::endl;
         return 1;
     }
+
+
+    Images::iterator sizeItr = images.begin();
+    xSize = (*sizeItr)->s();
+    ySize = (*sizeItr)->t();
+    zSize = (*sizeItr)->r();
+    ++sizeItr;
+    for(;sizeItr != images.end(); ++sizeItr)
+    {
+        if ((*sizeItr)->s() != xSize || 
+            (*sizeItr)->t() != ySize ||
+            (*sizeItr)->r() != zSize)
+        {
+            std::cout<<"Images in sequence are not of the same dimensions."<<std::endl;
+            return 1;
+        }
+    }
+
 
 #if 0
@@ -2071 +2105 @@
     }
 #else
-        xSize = image_3d->s();
-        ySize = image_3d->t();
-        zSize = image_3d->r();
 #endif
 
 
     osg::Vec4 minValue, maxValue;
-    if (osgVolume::computeMinMax(image_3d.get(), minValue, maxValue));
+    bool computeMinMax = false;
+    for(Images::iterator itr = images.begin();
+        itr != images.end();
+        ++itr)
+    {
+        if (osgVolume::computeMinMax(itr->get(), minValue, maxValue)) computeMinMax = true;
+    }
+    
+    
+    if (computeMinMax)
     {
         osg::notify(osg::NOTICE)<<"Min value "<<minValue<<std::endl;
@@ -2096 +2136 @@
         float offset = -minComponent * scale;
 
-        osgVolume::offsetAndScaleImage(image_3d.get(), 
-            osg::Vec4(offset, offset, offset, offset),
-            osg::Vec4(scale, scale, scale, scale));
-
-    }
-
-#if 0
-    osg::Vec4 newMinValue, newMaxValue;
-    if (osgVolume::computeMinMax(image_3d.get(), newMinValue, newMaxValue));
-    {
-        osg::notify(osg::NOTICE)<<"After min value "<<newMinValue<<std::endl;
-        osg::notify(osg::NOTICE)<<"After max value "<<newMaxValue<<std::endl;
-
-    }
-#endif
+
+        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));
+        }
+    }
+
     
     if (colourSpaceOperation!=NO_COLOUR_SPACE_OPERATION)
     {
-        doColourSpaceConversion(colourSpaceOperation, image_3d.get(), colourModulate);
+        for(Images::iterator itr = images.begin();
+            itr != images.end();
+            ++itr)
+        {        
+            doColourSpaceConversion(colourSpaceOperation, itr->get(), colourModulate);
+        }
     }
     
     if (!gpuTransferFunction && transferFunction.valid())
     {
-        image_3d = applyTransferFunction(image_3d.get(), transferFunction.get());
-    }
-    
-    osg::ref_ptr<osg::Image> normalmap_3d = createNormalMap ? createNormalMapTexture(image_3d.get()) : 0;
-
-
-    
+        for(Images::iterator itr = images.begin();
+            itr != images.end();
+            ++itr)
+        {        
+            *itr = applyTransferFunction(itr->get(), transferFunction.get());
+        }
+    }
+    
+    osg::ref_ptr<osg::Image> image_3d = 0;
+
+    if (images.size()==1)
+    {
+        osg::notify(osg::NOTICE)<<"Single image "<<images.size()<<" volumes."<<std::endl;
+        image_3d = images.front();
+    }
+    else
+    {
+        osg::notify(osg::NOTICE)<<"Creating sequence of "<<images.size()<<" volumes."<<std::endl;
+    
+        osg::ref_ptr<osg::ImageSequence> imageSequence = new osg::ImageSequence;
+        image_3d = imageSequence.get();
+        for(Images::iterator itr = images.begin();
+            itr != images.end();
+            ++itr)
+        {        
+            imageSequence->addImage(itr->get());
+        }
+        imageSequence->play();
+    }
+    
+    osg::ref_ptr<osg::Image> normalmap_3d = 0;
+    if (createNormalMap)
+    {
+        if (images.size()==1)
+        {
+            normalmap_3d = createNormalMapTexture(images.front().get());
+        }
+        else
+        {
+            osg::ref_ptr<osg::ImageSequence> normalmapSequence = new osg::ImageSequence;
+            normalmap_3d = normalmapSequence.get();
+            for(Images::iterator itr = images.begin();
+                itr != images.end();
+                ++itr)
+            {        
+                normalmapSequence->addImage(createNormalMapTexture(itr->get()));
+            }
+            normalmapSequence->play();
+        }
+    }
+
     // create a model from the images.
     osg::Node* rootNode = 0;