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

if'd 0 out resetting of the Projection and ModelView and Program object pointers in the popAllStateSets() as this was causing problems when using the RootStateSet.

Browse Source
This commit is contained in:
Robert Osfield 2016-11-03 20:28:57 +00:00
parent 4600acb3b7
commit 1c9219560b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/State.cpp
View File

@ -591,11 +591,12 @@ void State::popAllStateSets()
{
while (!_stateStateStack.empty()) popStateSet();
}
#if 0
applyProjectionMatrix(0);
applyModelViewMatrix(0);
_lastAppliedProgramObject = 0;
#endif
}
void State::popStateSet()
@ -1282,7 +1283,6 @@ bool State::checkGLErrors(const StateAttribute* attribute) const
return false;
}
void State::applyModelViewAndProjectionUniformsIfRequired()
{
if (!_lastAppliedProgramObject) return;
@ -1469,8 +1469,6 @@ void State::applyModelViewMatrix(const osg::Matrix& matrix)
loadModelViewMatrix();
}
#include <osg/io_utils>
void State::updateModelViewAndProjectionMatrixUniforms()
{
if (_modelViewProjectionMatrixUniform.valid()) _modelViewProjectionMatrixUniform->set((*_modelView) * (*_projection));