FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mike Weiblen, fix to the state leakage.

Browse Source
This commit is contained in:
Robert Osfield
2004-11-10 09:56:03 +00:00
parent 8f621d6ae1
commit a383330ae4
3 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
examples/osgshaders/GL2Scene.cpp
View File

@@ -1,5 +1,5 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield
* Copyright (C) 2003 3Dlabs Inc. Ltd.
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield
* Copyright (C) 2003-2004 3Dlabs Inc. Ltd.
*
* This application is open source and may be redistributed and/or modified
* freely and without restriction, both in commericial and non commericial applications,
@@ -11,7 +11,7 @@
*/
/* file: examples/osgshaders/GL2Scene.cpp
* author: Mike Weiblen 2004-09-15
* author: Mike Weiblen 2004-11-09
*
* Compose a scene of several instances of a model, with a different
* OpenGL Shading Language shader applied to each.
@@ -220,15 +220,12 @@ static osgGL2::ShaderObject* MarbleVertObj;
static osgGL2::ShaderObject* MarbleFragObj;
///////////////////////////////////////////////////////////////////////////
// for demo simplicity, this one callback animates all the shaders.
// TODO encapsulate inside an osgFX effect.
class AnimateCallback: public osg::NodeCallback
{
public:
AnimateCallback( osgGL2::ProgramObject* /*progObj*/ ) :
osg::NodeCallback(),
_enabled(true)
{}
AnimateCallback() : osg::NodeCallback(), _enabled(true) {}
virtual void operator() ( osg::Node* node, osg::NodeVisitor* nv )
{
@@ -267,21 +264,8 @@ GL2Scene::buildScene()
osg::Texture1D* sineTexture = make1DSineTexture( 32 /*1024*/ );
// the root of our scenegraph.
// attach an "empty" ProgramObject to the rootNode, which will act as
// the default StateAttribute. An empty ProgramObject (ie without any
// attached ShaderObjects) is a special case, which means to use the
// OpenGL 1.x "fixed functionality" rendering pipeline.
rootNode = new osg::Group;
rootNode->setUpdateCallback( new AnimateCallback(0) );
{
// TODO this definition of a "default ProgramObject state" will not
// be necessary when the OSG core has proper support for the unique
// requirements of ProgramObject.
osg::StateSet* ss = rootNode->getOrCreateStateSet();
osgGL2::ProgramObject* progObj = new osgGL2::ProgramObject;
_progObjList.push_back( progObj );
ss->setAttributeAndModes(progObj, osg::StateAttribute::ON);
}
rootNode->setUpdateCallback( new AnimateCallback );
// the simple Microshader (its source appears earlier in this file)
{

8
include/osgGL2/ProgramObject
View File

@@ -1,5 +1,5 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield
* Copyright (C) 2003 3Dlabs Inc. Ltd.
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield
* Copyright (C) 2003-2004 3Dlabs Inc. Ltd.
*
* This application is open source and may be redistributed and/or modified
* freely and without restriction, both in commericial and non commericial
@@ -11,7 +11,7 @@
*/
/* file: include/osgGL2/ProgramObject
* author: Mike Weiblen 2003-12-28
* author: Mike Weiblen 2004-11-09
*
* See http://www.3dlabs.com/opengl2/ for more information regarding
* the OpenGL Shading Language.
@@ -75,7 +75,7 @@ class OSGGL2_EXPORT ProgramObject : public osg::StateAttribute
* be pending. */
virtual void apply(osg::State& state) const;
virtual void compileGLObjects(osg::State& state) const { apply(state); }
virtual void compileGLObjects(osg::State& state) const;
/** release an OpenGL objects in specified graphics context if State
object is passed, otherwise release OpenGL objexts for all graphics context if

7
src/osgGL2/ProgramObject.cpp
View File

@@ -12,7 +12,7 @@
*/
/* file: src/osgGL2/ProgramObject.cpp
* author: Mike Weiblen 2004-07-08
* author: Mike Weiblen 2004-11-09
*
* See http://www.3dlabs.com/opengl2/ for more information regarding
* the OpenGL Shading Language.
@@ -208,6 +208,11 @@ int ProgramObject::compare(const osg::StateAttribute& sa) const
}
void ProgramObject::compileGLObjects(osg::State& state) const
{
}
// mark all PCPOs as needing a relink
void ProgramObject::dirtyProgramObject()
{