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

Added toggling of the osg::State ::setUseModelViewAndProjectionUniforms() and setUseVertexAttributeAliasing() via the --mv and --va command line options respectively

Browse Source
This commit is contained in:
Robert Osfield 2016-11-03 17:23:03 +00:00
parent 6d531fd643
commit 44c11a856b
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/osgshaderpipeline/osgshaderpipeline.cpp
View File

@ -228,20 +228,27 @@ bool setUpStateSet(osg::ArgumentParser& arguments, osg::StateSet* stateset)
struct RealizeOperation : public osg::GraphicsOperation struct RealizeOperation : public osg::GraphicsOperation
{ {
RealizeOperation(osg::StateSet* stateset) : RealizeOperation(osg::ArgumentParser& arguments, osg::StateSet* stateset) :
osg::GraphicsOperation("RealizeOperation",false), osg::GraphicsOperation("RealizeOperation",false)
_stateset(stateset)
{ {
_stateset = stateset;
_useModelViewAndProjectionUniforms = arguments.read("--mv");
_useVertexAttributeAliasing = arguments.read("--va");
} }
virtual void operator () (osg::GraphicsContext* gc) virtual void operator () (osg::GraphicsContext* gc)
{ {
OSG_NOTICE<<std::endl<<"---------- RealizeOperation() : Pushing StateSet on to GraphicsContext's State. -----"<<std::endl<<std::endl;; OSG_NOTICE<<std::endl<<"---------- RealizeOperation() : Pushing StateSet on to GraphicsContext's State. -----"<<std::endl<<std::endl;;
//gc->getState()->pushStateSet(_stateset.get());
gc->getState()->setRootStateSet(_stateset.get()); gc->getState()->setUseModelViewAndProjectionUniforms(_useModelViewAndProjectionUniforms);
gc->getState()->setUseVertexAttributeAliasing(_useVertexAttributeAliasing);
if (_stateset.valid()) gc->getState()->setRootStateSet(_stateset.get());
} }
osg::ref_ptr<osg::StateSet> _stateset; osg::ref_ptr<osg::StateSet> _stateset;
bool _useModelViewAndProjectionUniforms;
bool _useVertexAttributeAliasing;
}; };
int main(int argc, char** argv) int main(int argc, char** argv)
@ -263,12 +270,12 @@ int main(int argc, char** argv)
// set up the topmost StateSet with the shader pipeline settings. // set up the topmost StateSet with the shader pipeline settings.
setUpStateSet(arguments, stateset); setUpStateSet(arguments, stateset);
if (arguments.read("--state"))
{ bool useRootStateSet = arguments.read("--state");
OSG_NOTICE<<"Assigning RealizerOperation"<<std::endl;
viewer.setRealizeOperation(new RealizeOperation(stateset.get())); viewer.setRealizeOperation(new RealizeOperation(arguments, useRootStateSet ? stateset.get() : 0));
}
else if (!useRootStateSet)
{ {
viewer.getCamera()->setStateSet(stateset.get()); viewer.getCamera()->setStateSet(stateset.get());
} }