Changeset 11674 for OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp

Timestamp:

07/10/10 19:14:59 (3 years ago)

Author:

robert

Message:

Added debug State::print(std::ostream&) method and extra debug messages in ShaderComposer? and ShaderAttribute?.

Added better shader composition testing in the osgshadercomposition example.

Files:

• OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp

@@ -63 +63 @@
         sa->addUniform(new osg::Uniform("baseTexture",0));
 
-#if 1
-        osg::ShaderAttribute* sa_dummy = new osg::ShaderAttribute;
-        sa_dummy->setType(osg::StateAttribute::Type(10001));
-        stateset->setAttribute(sa_dummy);
-#endif
-
     }
 
@@ -93 +87 @@
         stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
 
-#if 1
         osg::ShaderAttribute* sa = new osg::ShaderAttribute;
         sa->setType(osg::StateAttribute::Type(10001));
@@ -104 +97 @@
             sa->addShader(fragment_shader);
         }
-#endif
 
         group->addChild(pat);
@@ -163 +155 @@
         group->addChild(pat);
 
-        group->addChild(pat);
-
     }
 
@@ -176 +166 @@
     osgViewer::Viewer viewer(arguments);
 
-    OSG_NOTICE<<"********** Constructing scene graph ************ "<<std::endl<<std::endl;
-
     osg::ref_ptr<osg::Node> scenegraph = createSceneGraph(arguments);
     if (!scenegraph) return 1;
 
     viewer.setSceneData(scenegraph.get());
-
-    OSG_NOTICE<<std::endl<<"********** Finished constructing scene graph ************ "<<std::endl<<std::endl;
 
     viewer.realize();