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

Timestamp:

09/26/08 17:47:31 (5 years ago)

Author:

robert

Message:

Improved GLSL isosurface support when using a transfer function

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -877 +877 @@
 
         stateset->setTextureAttributeAndModes(0,texture3D,osg::StateAttribute::ON);
+
+        osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0);
+        stateset->addUniform(baseTextureSampler);
     }
     
@@ -944 +947 @@
             stateset->setTextureAttributeAndModes(0,texture1D,osg::StateAttribute::ON);
 
-            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume-tf-iso.frag");
+            osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume_tf_iso.frag");
             if (fragmentShader)
             {
@@ -1057 +1060 @@
     else
     {    
+
         osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume.frag");
         if (fragmentShader)
@@ -1068 +1072 @@
         }
     }
-    osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0);
-    stateset->addUniform(baseTextureSampler);
 
     osg::Uniform* sampleDensity = new osg::Uniform("sampleDensity", 0.01f);