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

Added s/getMaxNumOfTextureUnits control to osgGA::StateSetManipulator, and set the default to 4.

Browse Source
This commit is contained in:
Robert Osfield
2005-11-11 14:22:57 +00:00
parent 91f5b9b04e
commit e5685bc1ac
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgGA/StateSetManipulator.cpp
View File

@@ -16,7 +16,11 @@
using namespace osg;
using namespace osgGA;
StateSetManipulator::StateSetManipulator(): _drawState(NULL)
StateSetManipulator::StateSetManipulator():
_backface(false),
_lighting(false),
_texture(false),
_maxNumOfTextureUnits(4)
{
}
@@ -83,10 +87,9 @@ bool StateSetManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa)
// ( _drawState->getAttribute( osg::StateAttribute::TEXTURE ) );
// cout << tex->numTextureUnits() << endl;
unsigned int nunit = 8; // should actually use the _real_ num units here, but how?
unsigned int mode = osg::StateAttribute::OVERRIDE|osg::StateAttribute::OFF;
if ( _texture ) mode = osg::StateAttribute::INHERIT|osg::StateAttribute::ON;
for( unsigned int ii=0; ii<nunit; ii++ )
for( unsigned int ii=0; ii<_maxNumOfTextureUnits; ii++ )
{
_drawState->setTextureMode( ii, GL_TEXTURE_1D, mode );
_drawState->setTextureMode( ii, GL_TEXTURE_2D, mode );

3
src/osgWrappers/osgGA/StateSetManipulator.cpp
View File

@@ -34,6 +34,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator)
I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us);
I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, x);
I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage);
I_Method1(void, setMaximumNumOfTextureUnits, IN, unsigned int, i);
I_Method0(unsigned int, getMaximumNumOfTextureUnits);
I_Property(unsigned int, MaximumNumOfTextureUnits);
I_Property(osg::StateSet *, StateSet);
END_REFLECTOR