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

Timestamp:

02/02/09 15:43:27 (4 years ago)

Author:

robert

Message:

Refactored osg::TransferFunction?1D to use an std::map internally which is kept in sync with the actual osg::Image that is passed to the GPU.

Added .osg support for osg::TransferFunction?1D.

Updated wrappers

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -717 +717 @@
     std::cout<<"Reading transfer function "<<filename<<std::endl;
 
-    osg::TransferFunction1D::ValueMap valueMap;
+    osg::TransferFunction1D::ColorMap colorMap;
     osgDB::ifstream fin(foundFile.c_str());
     while(fin)
@@ -726 +726 @@
         {
             std::cout<<"value = "<<value<<" ("<<red<<", "<<green<<", "<<blue<<", "<<alpha<<")"<<std::endl;
-            valueMap[value] = osg::Vec4(red,green,blue,alpha);
-        }
-    }
-    
-    if (valueMap.empty())
+            colorMap[value] = osg::Vec4(red,green,blue,alpha);
+        }
+    }
+    
+    if (colorMap.empty())
     {
         std::cout<<"Error: No values read from transfer function file: "<<filename<<std::endl;
@@ -737 +737 @@
     
     osg::TransferFunction1D* tf = new osg::TransferFunction1D;
-    tf->assign(valueMap, true);
+    tf->assign(colorMap);
     
     return tf;
@@ -852 +852 @@
         transferFunction = readTransferFunctionFile(tranferFunctionFile);
     }
+    
+    while(arguments.read("--test"))
+    {
+        transferFunction = new osg::TransferFunction1D;
+        transferFunction->setColor(0.0, osg::Vec4(1.0,0.0,0.0,0.0));
+        transferFunction->setColor(0.5, osg::Vec4(1.0,1.0,0.0,0.5));
+        transferFunction->setColor(1.0, osg::Vec4(0.0,0.0,1.0,1.0));
+    }
+
+    while(arguments.read("--test2"))
+    {
+        transferFunction = new osg::TransferFunction1D;
+        transferFunction->setColor(0.0, osg::Vec4(1.0,0.0,0.0,0.0));
+        transferFunction->setColor(0.5, osg::Vec4(1.0,1.0,0.0,0.5));
+        transferFunction->setColor(1.0, osg::Vec4(0.0,0.0,1.0,1.0));
+        transferFunction->assign(transferFunction->getColorMap());
+    }
 
     unsigned int numSlices=500;
@@ -976 +993 @@
             if (fin)
             {
-                osg::TransferFunction1D::ValueMap valueMap;
+                osg::TransferFunction1D::ColorMap colorMap;
                 float value = 0.0;
                 while(fin && value<=1.0)
@@ -984 +1001 @@
                     if (fin) 
                     {
-                        valueMap[value] = osg::Vec4(red/255.0f,green/255.0f,blue/255.0f,alpha/255.0f);
+                        colorMap[value] = osg::Vec4(red/255.0f,green/255.0f,blue/255.0f,alpha/255.0f);
                         std::cout<<"value = "<<value<<" ("<<red<<", "<<green<<", "<<blue<<", "<<alpha<<")";
-                        std::cout<<"  ("<<valueMap[value]<<")"<<std::endl;
+                        std::cout<<"  ("<<colorMap[value]<<")"<<std::endl;
                     }
                     value += 1/255.0;
                 }
 
-                if (valueMap.empty())
+                if (colorMap.empty())
                 {
                     std::cout<<"Error: No values read from transfer function file: "<<transfer_filename<<std::endl;
@@ -998 +1015 @@
 
                 transferFunction = new osg::TransferFunction1D;
-                transferFunction->assign(valueMap, true);
+                transferFunction->assign(colorMap);
             }
         }