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

Added simple fallback from osg::Material::apply() when fixed function pipeline is disabled

Browse Source
This commit is contained in:
Robert Osfield
2017-03-23 14:53:08 +00:00
parent 7ccd25a4d5
commit b4152d9634
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/Material.cpp
View File

@@ -12,6 +12,7 @@
*/
#include <osg/Material>
#include <osg/BoundsChecking>
#include <osg/State>
#include <osg/Notify>
using namespace osg;
@@ -350,9 +351,9 @@ void Material::setAlpha(Face face,float alpha)
}
}
#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
void Material::apply(State&) const
{
#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
#ifdef OSG_GL1_AVAILABLE
if (_colorMode==OFF)
@@ -438,7 +439,12 @@ void Material::apply(State&) const
glMaterialf( GL_FRONT, GL_SHININESS, _shininessFront );
glMaterialf( GL_BACK, GL_SHININESS, _shininessBack );
}
#else
OSG_NOTICE<<"Warning: Material::apply(State&) - not supported."<<std::endl;
#endif
}
#else
void Material::apply(State& state) const
{
OSG_NOTICE<<"Warning: Material::apply(State&) - not supported."<<std::endl;
state.Color(_diffuseFront.r(), _diffuseFront.g(), _diffuseFront.b(), _diffuseFront.a());
}
#endif