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

19
src/osg/StateSet.cpp
View File

@@ -124,9 +124,6 @@ StateSet::StateSet(const StateSet& rhs,const CopyOp& copyop):Object(rhs,copyop)
Uniform* uni = copyop(rup.first.get());
if( uni ) _uniformList[name] = RefUniformPair(uni, rup.second);
}
Program* prog = copyop( rhs._program );
if( prog ) _program = prog;
#endif //]
_renderingHint = rhs._renderingHint;
@@ -312,19 +309,7 @@ int StateSet::compare(const StateSet& rhs,bool compareAttributeContents) const
{
if (rhs_uniform_itr!=rhs._uniformList.end()) return -1;
}
else if (rhs_uniform_itr == rhs._uniformList.end()) return 1;
if (_program.valid())
{
if (rhs._program.valid())
{
int result = _program->compare(*rhs._program);
if (result!=0) return result;
}
else return 1;
}
else if (rhs._program.valid()) return -1;
else if (rhs_uniform_itr == rhs._uniformList.end()) return 1;
return 0;
}
@@ -426,8 +411,6 @@ void StateSet::clear()
_textureAttributeList.clear();
_uniformList.clear();
_program = 0;
}
void StateSet::merge(const StateSet& rhs)