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

Removed setProgram from osg::StateSet as Program works just fine right now

Browse Source 
as a standard osg::StateAttribute and set in a StateSet with setAttribute.
This commit is contained in:
Robert Osfield
2005-04-14 15:53:28 +00:00
parent 16c55531da
commit 086efcdff1
3 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osg/StateSet
View File

@@ -295,17 +295,6 @@ class OSG_EXPORT StateSet : public Object
/** return the const list of all Uniforms contained in this const StateSet.*/
inline const UniformList& getUniformList() const { return _uniformList; }
void setProgram(Program* program) { _program = program; }
Program* getProgram() { return _program.get(); }
const Program* getProgram() const { return _program.get(); }
enum RenderingHint
{
DEFAULT_BIN = 0,
@@ -385,7 +374,6 @@ class OSG_EXPORT StateSet : public Object
TextureAttributeList _textureAttributeList;
UniformList _uniformList;
osg::ref_ptr<osg::Program> _program;
inline ModeList& getOrCreateTextureModeList(unsigned int unit)
{