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

2009-10-28 20:31:57 +00:00
parent 7e7135be59
commit d17d7159a1
37 changed files with 318 additions and 146 deletions
--- a/src/osgFX/AnisotropicLighting.cpp
+++ b/src/osgFX/AnisotropicLighting.cpp
@@ -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());
        }