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

Added compile/release and resize of GL objects to ShaderAttribute.

Browse Source 
Removed the StateAttribute::compose() method.

Fixed the default type value in ShaderAttribute
This commit is contained in:
Robert Osfield
2010-07-06 12:19:26 +00:00
parent 74ae526bb5
commit 46b221a832
7 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osg/ShaderAttribute.cpp
View File

@@ -19,7 +19,8 @@
using namespace osg;
ShaderAttribute::ShaderAttribute()
ShaderAttribute::ShaderAttribute():
_type(osg::StateAttribute::Type(-1))
{
_shaderComponent = new osg::ShaderComponent;
}
@@ -88,22 +89,17 @@ void ShaderAttribute::apply(State& state) const
}
}
void ShaderAttribute::compose(ShaderComposer& composer) const
void ShaderAttribute::compileGLObjects(State& state) const
{
OSG_NOTICE<<"ShaderAttribute::compose(..)"<<std::endl;
}
void ShaderAttribute::compileGLObjects(State&) const
{
OSG_NOTICE<<"ShaderAttribute::compileGLObjects(..)"<<std::endl;
if (_shaderComponent.valid()) _shaderComponent->compileGLObjects(state);
}
void ShaderAttribute::resizeGLObjectBuffers(unsigned int maxSize)
{
OSG_NOTICE<<"ShaderAttribute::resizeGLObjectBuffers(..)"<<std::endl;
if (_shaderComponent.valid()) _shaderComponent->resizeGLObjectBuffers(maxSize);
}
void ShaderAttribute::releaseGLObjects(State* state) const
{
OSG_NOTICE<<"ShaderAttribute::releaseGLObjects(..)"<<std::endl;
if (_shaderComponent.valid()) _shaderComponent->releaseGLObjects(state);
}