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

Added deprecated comments for ShaderComposer

Browse Source
This commit is contained in:
Robert Osfield 2018-03-05 14:39:07 +00:00
parent 31d78b7bb3
commit 1b8567e11e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osg/ShaderComposer
View File

@ -25,6 +25,7 @@ class State;
typedef std::vector<osg::ShaderComponent*> ShaderComponents;
/// deprecated
class OSG_EXPORT ShaderComposer : public osg::Object
{
public:

10
include/osg/State
View File

@ -152,19 +152,19 @@ class OSG_EXPORT State : public Referenced
_extensionMap[id] = ptr;
}
/* Set whether shader composition is enabled.*/
/* deprecated.*/
void setShaderCompositionEnabled(bool flag) { _shaderCompositionEnabled = flag; }
/* Get whether shader composition is enabled.*/
/* deprecated.*/
bool getShaderCompositionEnabled() const { return _shaderCompositionEnabled; }
/** Set the ShaderComposor object that implements shader composition.*/
/** deprecated.*/
void setShaderComposer(ShaderComposer* sc) { _shaderComposer = sc; }
/** Get the ShaderComposor object.*/
/** deprecated.*/
ShaderComposer* getShaderComposer() { return _shaderComposer.get(); }
/** Get the const ShaderComposor object.*/
/** deprecated.*/
const ShaderComposer* getShaderComposer() const { return _shaderComposer.get(); }
/** Get the unform list in which to inject any uniforms that StateAttribute::apply(State&) methods provide.*/