Changeset 10691 for OpenSceneGraph/trunk/src/osg/StateSet.cpp

Timestamp:

10/25/09 12:52:01 (4 years ago)

Author:

robert

Message:

Introduced usage of OSG_GLES*_AVAILABLE macros to headers and .cpp's to enable building against OpenGL ES 1.x and 2.x headers

Files:

• OpenSceneGraph/trunk/src/osg/StateSet.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osg/StateSet.cpp

@@ -22 +22 @@
 #include <osg/FrontFace>
 #include <osg/PolygonMode>
+#include <osg/Material>
 #include <osg/BlendFunc>
 #include <osg/Depth>
@@ -27 +28 @@
 #include <osg/Node>
 
+#include <osg/TexGen>
+#include <osg/Texture1D>
 #include <osg/TextureCubeMap>
 #include <osg/TextureRectangle>
@@ -790 +793 @@
         notify(NOTICE)<<"Error: Setting mode 'GL_COLOR_MATERIAL' via osg::StateSet::setMode(mode,value) ignored.\n";
         notify(NOTICE)<<"       The mode 'GL_COLOR_MATERIAL' is set by the osg::Material StateAttribute.\n";
-        notify(NOTICE)<<"       Setting this as a mode fools osg's State tracking."<<std::endl;
+        notify(NOTICE)<<"       Setting this mode would confuse osg's State tracking."<<std::endl;
     }
     else
@@ -812 +815 @@
         notify(NOTICE)<<"Error: Setting mode 'GL_COLOR_MATERIAL' via osg::StateSet::removeMode(mode) ignored.\n";
         notify(NOTICE)<<"       The mode 'GL_COLOR_MATERIAL' is set by the osg::Material StateAttribute.\n";
-        notify(NOTICE)<<"       Setting this as a mode fools osg's State tracking."<<std::endl;
+        notify(NOTICE)<<"       Setting this mode would confuse osg's State tracking."<<std::endl;
     }
     else