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

Ported osgUtil, osgDB, osgGA, NodeKits and plugins to compile against OpenGL ES 1.1 and OpenGL ES 2.0.

Browse Source
This commit is contained in:
Robert Osfield
2009-10-28 20:31:57 +00:00
parent 7e7135be59
commit d17d7159a1
37 changed files with 318 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgFX/AnisotropicLighting.cpp
View File

@@ -216,7 +216,11 @@ namespace
texenv->setMode(osg::TexEnv::DECAL);
ss->setTextureAttributeAndModes(0, texenv.get(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
ss->setMode( GL_ALPHA_TEST, osg::StateAttribute::OFF );
#if !defined(OSG_GLES2_AVAILABLE)
ss->setMode( GL_ALPHA_TEST, osg::StateAttribute::OFF );
#else
osg::notify(osg::NOTICE)<<"Warning: osgFX::AnisotropicLighting unable to disable GL_ALPHA_TEST."<<std::endl;
#endif
addPass(ss.get());
}

1
src/osgFX/Scribe.cpp
View File

@@ -58,7 +58,6 @@ namespace
ss->setAttributeAndModes(_wf_mat.get(), osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
ss->setMode(GL_LIGHTING, osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
ss->setTextureMode(0, GL_TEXTURE_1D, osg::StateAttribute::OVERRIDE|osg::StateAttribute::OFF);
ss->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::OVERRIDE|osg::StateAttribute::OFF);
addPass(ss.get());

5
src/osgFX/SpecularHighlights.cpp
View File

@@ -50,6 +50,8 @@ namespace
void apply(osg::State& state) const
{
#ifdef OSG_GL_MATRICES_AVAILABLE
glMatrixMode(GL_TEXTURE);
if (_active) {
@@ -74,6 +76,9 @@ namespace
}
glMatrixMode(GL_MODELVIEW);
#else
osg::notify(osg::NOTICE)<<"Warning: osgFX::SpecualHighlights unable to set texture matrix."<<std::endl;
#endif
}
private: