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

Timestamp:

01/09/09 16:19:25 (4 years ago)

Author:

robert

Message:

Moved osgVolume::ImageUtils? to osg::ImageUtils?, updated wrappers, and started moving osgvolume example across to create osgVolume subgraphs

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -61 +61 @@
 #include <iostream>
 
-#include <osgVolume/ImageUtils>
+#include <osg/ImageUtils>
+#include <osgVolume/Volume>
+#include <osgVolume/VolumeTile>
 
 typedef std::vector< osg::ref_ptr<osg::Image> > ImageList;
@@ -1520 +1522 @@
         // compute range of values
         osg::Vec4 minValue, maxValue;
-        osgVolume::computeMinMax(image.get(), minValue, maxValue);
-        osgVolume::modifyImage(image.get(),ScaleOperator(1.0f/maxValue.r())); 
+        osg::computeMinMax(image.get(), minValue, maxValue);
+        osg::modifyImage(image.get(),ScaleOperator(1.0f/maxValue.r())); 
     }
     
@@ -1546 +1548 @@
             
                 // read the pixels into readOp's _colour array
-                osgVolume::readRow(sizeS, pixelFormat, dataType, image->data(0,t,r), readOp);
+                osg::readRow(sizeS, pixelFormat, dataType, image->data(0,t,r), readOp);
                                 
                 // pass readOp's _colour array contents over to writeOp (note this is just a pointer swap).
                 writeOp._colours.swap(readOp._colours);
                 
-                osgVolume::modifyRow(sizeS, pixelFormat, GL_UNSIGNED_BYTE, new_image->data(0,t,r), writeOp);
+                osg::modifyRow(sizeS, pixelFormat, GL_UNSIGNED_BYTE, new_image->data(0,t,r), writeOp);
 
                 // return readOp's _colour array contents back to its rightful owner.
@@ -1618 +1620 @@
         {
             std::cout<<"doing conversion MODULATE_ALPHA_BY_LUMINANCE"<<std::endl;
-            osgVolume::modifyImage(image,ModulateAlphaByLuminanceOperator()); 
+            osg::modifyImage(image,ModulateAlphaByLuminanceOperator()); 
             return image;
         }
@@ -1624 +1626 @@
         {
             std::cout<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
-            osgVolume::modifyImage(image,ModulateAlphaByColourOperator(colour)); 
+            osg::modifyImage(image,ModulateAlphaByColourOperator(colour)); 
             return image;
         }
@@ -1630 +1632 @@
         {
             std::cout<<"doing conversion REPLACE_ALPHA_WITH_LUMINANACE"<<std::endl;
-            osgVolume::modifyImage(image,ReplaceAlphaWithLuminanceOperator()); 
+            osg::modifyImage(image,ReplaceAlphaWithLuminanceOperator()); 
             return image;
         }
@@ -1638 +1640 @@
             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);
+            osg::copyImage(image, 0, 0, 0, image->s(), image->t(), image->r(),
+                           newImage, 0, 0, 0, false);
             return newImage;
         }
@@ -1695 +1697 @@
     
     ApplyTransferFunctionOperator op(transferFunction, output_image->data());
-    osgVolume::readImage(image,op); 
+    osg::readImage(image,op); 
     
     return output_image;
@@ -1939 +1941 @@
     while(arguments.read("--num-components", numComponentsDesired)) {}
 
+    bool useOsgVolume = true; 
+    while(arguments.read("--osgVolume")) { useOsgVolume = true; }
+    while(arguments.read("--no-osgVolume")) { useOsgVolume = false; }
+
     bool useShader = true; 
     while(arguments.read("--shader")) { useShader = true; }
@@ -2140 +2146 @@
     {
         osg::Vec4 localMinValue, localMaxValue;
-        if (osgVolume::computeMinMax(itr->get(), localMinValue, localMaxValue))
+        if (osg::computeMinMax(itr->get(), localMinValue, localMaxValue))
         {
             if (localMinValue.r()<minValue.r()) minValue.r() = localMinValue.r();
@@ -2188 +2194 @@
                     ++itr)
                 {        
-                    osgVolume::offsetAndScaleImage(itr->get(), 
+                    osg::offsetAndScaleImage(itr->get(), 
                         osg::Vec4(offset, offset, offset, offset),
                         osg::Vec4(scale, scale, scale, scale));
@@ -2202 +2208 @@
                     ++itr)
                 {        
-                    osgVolume::offsetAndScaleImage(itr->get(), 
+                    osg::offsetAndScaleImage(itr->get(), 
                         osg::Vec4(offset, offset, offset, offset),
                         osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -2281 +2287 @@
     osg::Node* rootNode = 0;
     
-    if (useShader)
-    {
-        rootNode = createShaderModel(shadingModel, 
-                               image_3d, normalmap_3d.get(), 
-                               (gpuTransferFunction ? transferFunction.get() : 0),
-                               internalFormatMode,
-                               xSize, ySize, zSize,
-                               xMultiplier, yMultiplier, zMultiplier,
-                               numSlices, sliceEnd, alphaFunc);
+    if (useOsgVolume)
+    {
+
+        osg::ref_ptr<osgVolume::Volume> volume = new osgVolume::Volume;
+        osg::ref_ptr<osgVolume::VolumeTile> tile = new osgVolume::VolumeTile;
+        osg::ref_ptr<osgVolume::Layer> layer = new osgVolume::ImageLayer(image_3d);
+        tile->addLayer(layer.get());
+        volume->addChild(tile);
+        
+        rootNode = volume.get();        
+
     }
     else
     {
-        rootNode = createModel(shadingModel,
-                               image_3d, normalmap_3d, 
-                               internalFormatMode,
-                               xSize, ySize, zSize,
-                               xMultiplier, yMultiplier, zMultiplier,
-                               numSlices, sliceEnd, alphaFunc);
-    }
-    
-    if (matrix && rootNode)
-    {
-        osg::MatrixTransform* mt = new osg::MatrixTransform;
-        mt->setMatrix(*matrix);
-        mt->addChild(rootNode);
-        
-        rootNode = mt;
-    }
-    
+        if (useShader)
+        {
+            rootNode = createShaderModel(shadingModel, 
+                                   image_3d, normalmap_3d.get(), 
+                                   (gpuTransferFunction ? transferFunction.get() : 0),
+                                   internalFormatMode,
+                                   xSize, ySize, zSize,
+                                   xMultiplier, yMultiplier, zMultiplier,
+                                   numSlices, sliceEnd, alphaFunc);
+        }
+        else
+        {
+            rootNode = createModel(shadingModel,
+                                   image_3d, normalmap_3d, 
+                                   internalFormatMode,
+                                   xSize, ySize, zSize,
+                                   xMultiplier, yMultiplier, zMultiplier,
+                                   numSlices, sliceEnd, alphaFunc);
+        }
+        
+        if (matrix && rootNode)
+        {
+            osg::MatrixTransform* mt = new osg::MatrixTransform;
+            mt->setMatrix(*matrix);
+            mt->addChild(rootNode);
+
+            rootNode = mt;
+        }
+    }
+        
     if (!outputFile.empty())
     {