Show
Ignore:
Timestamp:
07/10/10 19:14:59 (4 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp

    r11669 r11674  
    6363        sa->addUniform(new osg::Uniform("baseTexture",0)); 
    6464 
    65 #if 1 
    66         osg::ShaderAttribute* sa_dummy = new osg::ShaderAttribute; 
    67         sa_dummy->setType(osg::StateAttribute::Type(10001)); 
    68         stateset->setAttribute(sa_dummy); 
    69 #endif 
    70  
    7165    } 
    7266 
     
    9387        stateset->setMode(GL_BLEND, osg::StateAttribute::ON); 
    9488 
    95 #if 1 
    9689        osg::ShaderAttribute* sa = new osg::ShaderAttribute; 
    9790        sa->setType(osg::StateAttribute::Type(10001)); 
     
    10497            sa->addShader(fragment_shader); 
    10598        } 
    106 #endif 
    10799 
    108100        group->addChild(pat); 
     
    163155        group->addChild(pat); 
    164156 
    165         group->addChild(pat); 
    166  
    167157    } 
    168158 
     
    176166    osgViewer::Viewer viewer(arguments); 
    177167 
    178     OSG_NOTICE<<"********** Constructing scene graph ************ "<<std::endl<<std::endl; 
    179  
    180168    osg::ref_ptr<osg::Node> scenegraph = createSceneGraph(arguments); 
    181169    if (!scenegraph) return 1; 
    182170 
    183171    viewer.setSceneData(scenegraph.get()); 
    184  
    185     OSG_NOTICE<<std::endl<<"********** Finished constructing scene graph ************ "<<std::endl<<std::endl; 
    186172 
    187173    viewer.realize();