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

Added applying of all parents uniforms

Browse Source
This commit is contained in:
Robert Osfield 2005-04-13 14:31:25 +00:00
parent 0015a31de8
commit 789cb7dea7
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgshaders/GL2Scene.cpp
View File

@ -38,6 +38,8 @@
#include <osg/Shader>
#include <osg/Uniform>
#include <iostream>
#include "GL2Scene.h"
#include "Noise.h"

31
src/osg/State.cpp
View File

@ -282,6 +282,21 @@ void State::apply(const StateSet* dstate)
if (_lastAppliedProgramObject)
{
for(StateSetStack::iterator sitr=_stateStateStack.begin();
sitr!=_stateStateStack.end();
++sitr)
{
const StateSet* stateset = *sitr;
const StateSet::UniformList& uniformList = stateset->getUniformList();
for(StateSet::UniformList::const_iterator itr=uniformList.begin();
itr!=uniformList.end();
++itr)
{
_lastAppliedProgramObject->apply(*(itr->second.first));
}
}
const StateSet::UniformList& uniformList = dstate->getUniformList();
for(StateSet::UniformList::const_iterator itr=uniformList.begin();
itr!=uniformList.end();
@ -325,12 +340,18 @@ void State::apply()
if (_lastAppliedProgramObject && !_stateStateStack.empty())
{
const StateSet::UniformList& uniformList = _stateStateStack.back()->getUniformList();
for(StateSet::UniformList::const_iterator itr=uniformList.begin();
itr!=uniformList.end();
++itr)
for(StateSetStack::iterator sitr=_stateStateStack.begin();
sitr!=_stateStateStack.end();
++sitr)
{
_lastAppliedProgramObject->apply(*(itr->second.first));
const StateSet* stateset = *sitr;
const StateSet::UniformList& uniformList = stateset->getUniformList();
for(StateSet::UniformList::const_iterator itr=uniformList.begin();
itr!=uniformList.end();
++itr)
{
_lastAppliedProgramObject->apply(*(itr->second.first));
}
}
}