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

Timestamp:

09/26/08 13:29:00 (5 years ago)

Author:

robert

Message:

Added --isosurface and --mip paths into osgvolume example, and added associted shaders

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -59 +59 @@
 
 typedef std::vector< osg::ref_ptr<osg::Image> > ImageList;
+
+enum ShadingModel
+{
+    Standard,
+    Light,
+    Isosurface,
+    MaximumIntensityProjection
+};
 
 //  example ReadOperator
@@ -803 +811 @@
 };
 
-osg::Node* createShaderModel(osg::ref_ptr<osg::Image>& image_3d, 
+osg::Node* createShaderModel(ShadingModel shadingModel,
+                       osg::ref_ptr<osg::Image>& image_3d, 
                        osg::Image* normalmap_3d,
                        osg::TransferFunction1D* tf,
@@ -809 +818 @@
                        float xSize, float ySize, float zSize,
                        float /*xMultiplier*/, float /*yMultiplier*/, float /*zMultiplier*/,
-                       unsigned int /*numSlices*/=500, float /*sliceEnd*/=1.0f, float alphaFuncValue=0.02f, bool maximumIntensityProjection = false)
+                       unsigned int /*numSlices*/=500, float /*sliceEnd*/=1.0f, float alphaFuncValue=0.02f)
 {
     osg::Texture::FilterMode minFilter = osg::Texture::LINEAR;
@@ -841 +850 @@
         program->addShader(new osg::Shader(osg::Shader::VERTEX, volume_vert));
     }
-    
 
     if (!(normalmap_3d && tf))
@@ -872 +880 @@
     
 
-    if (normalmap_3d)
+    if (shadingModel==MaximumIntensityProjection)
+    {
+        if (tf)
+        {
+            osg::Texture1D* texture1D = new osg::Texture1D;
+            texture1D->setImage(tf->getImage());    
+            stateset->setTextureAttributeAndModes(1,texture1D,osg::StateAttribute::ON);
+
+            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume_tf_mip.frag");
+            if (fragmentShader)
+            {
+                program->addShader(fragmentShader);
+            }
+            else
+            {
+                #include "volume_tf_mip_frag.cpp"
+                program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_tf_mip_frag));
+            }
+
+            osg::Uniform* tfTextureSampler = new osg::Uniform("tfTexture",1);
+            stateset->addUniform(tfTextureSampler);
+
+        }
+        else
+        {    
+            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume_mip.frag");
+            if (fragmentShader)
+            {
+                program->addShader(fragmentShader);
+            }
+            else
+            {
+                #include "volume_mip_frag.cpp"
+                program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_mip_frag));
+            }
+        }
+    }
+    else if (shadingModel==Isosurface)
+    {
+        osg::Uniform* normalMapSampler = new osg::Uniform("normalMap",1);
+        stateset->addUniform(normalMapSampler);
+
+        osg::Texture3D* normalMap = new osg::Texture3D;
+        normalMap->setImage(normalmap_3d);    
+        stateset->setTextureAttributeAndModes(1,normalMap,osg::StateAttribute::ON);
+
+        if (tf)
+        {
+            osg::Texture1D* texture1D = new osg::Texture1D;
+            texture1D->setImage(tf->getImage());    
+            stateset->setTextureAttributeAndModes(0,texture1D,osg::StateAttribute::ON);
+
+            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume-tf-iso.frag");
+            if (fragmentShader)
+            {
+                program->addShader(fragmentShader);
+            }
+            else
+            {
+                #include "volume_tf_iso_frag.cpp"
+                program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_tf_iso_frag));
+            }
+
+            osg::Uniform* tfTextureSampler = new osg::Uniform("tfTexture",0);
+            stateset->addUniform(tfTextureSampler);
+
+        }
+        else
+        {    
+            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume_iso.frag");
+            if (fragmentShader)
+            {
+                program->addShader(fragmentShader);
+            }
+            else
+            {
+                #include "volume_iso_frag.cpp"
+                program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_iso_frag));
+            }
+        }
+    }
+    else if (normalmap_3d)
     {
         osg::notify(osg::NOTICE)<<"Setting up normalmapping shader"<<std::endl;
@@ -1038 +1127 @@
 }
 
-osg::Node* createModel(osg::ref_ptr<osg::Image>& image_3d, 
+osg::Node* createModel(ShadingModel shadeModel,
+                       osg::ref_ptr<osg::Image>& image_3d, 
                        osg::ref_ptr<osg::Image>& normalmap_3d,
                        osg::Texture::InternalFormatMode internalFormatMode,
@@ -1134 +1224 @@
     stateset->setAttributeAndModes(material);
     
-    if (maximumIntensityProjection)
+    if (shadeModel==MaximumIntensityProjection)
     {
         stateset->setAttribute(new osg::BlendFunc(osg::BlendFunc::ONE, osg::BlendFunc::ONE));
@@ -1215 +1305 @@
         else
         {
-            osg::ref_ptr<osg::Image> normalmap_3d = createNormalMapTexture(image_3d.get());
             osg::Texture3D* bump_texture3D = new osg::Texture3D;
             bump_texture3D->setResizeNonPowerOfTwoHint(false);
@@ -1715 +1804 @@
 
 
+    
+    ShadingModel shadingModel = Standard;
+    
+    bool maximumIntensityProjection = false;
+    while(arguments.read("--mip")) shadingModel =  MaximumIntensityProjection;
+
     bool createNormalMap = false;
-    while (arguments.read("-n")) createNormalMap=true;
-    
-    bool maximumIntensityProjection = false;
-    while(arguments.read("--mip")) maximumIntensityProjection = true;
+    while (arguments.read("-n")) 
+    {
+        shadingModel = Light;
+        createNormalMap=true;
+    }
+
+    while (arguments.read("--isosurface")) 
+    {
+        shadingModel = Isosurface;
+        createNormalMap=true;
+    }
 
     float xSize=1.0f, ySize=1.0f, zSize=1.0f;
@@ -2010 +2112 @@
     if (useShader)
     {
-        rootNode = createShaderModel(image_3d, normalmap_3d.get(), 
+        rootNode = createShaderModel(shadingModel, 
+                               image_3d, normalmap_3d.get(), 
                                (gpuTransferFunction ? transferFunction.get() : 0),
                                internalFormatMode,
                                xSize, ySize, zSize,
                                xMultiplier, yMultiplier, zMultiplier,
-                               numSlices, sliceEnd, alphaFunc, maximumIntensityProjection);
+                               numSlices, sliceEnd, alphaFunc);
     }
     else
     {
-        rootNode = createModel(image_3d, normalmap_3d, 
+        rootNode = createModel(shadingModel,
+                               image_3d, normalmap_3d, 
                                internalFormatMode,
                                xSize, ySize, zSize,
                                xMultiplier, yMultiplier, zMultiplier,
-                               numSlices, sliceEnd, alphaFunc, maximumIntensityProjection);
+                               numSlices, sliceEnd, alphaFunc);
     }