Changeset 10765

Timestamp:

11/17/09 16:54:20 (4 years ago)

Author:

robert

Message:

Moved across to use OSG_FIXED_FUNCTION_AVAILABLE

Location:

OpenSceneGraph/trunk/src

Files:

• osg/State.cpp (modified) (1 diff)
• osg/StateSet.cpp (modified) (1 diff)
• osgUtil/SceneView.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -47 +47 @@
     _modelView = _identity;
 
-    #if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GL3_AVAILABLE)    
+    #if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         _useModelViewAndProjectionUniforms = true;
         _useVertexAttributeAliasing = true;

OpenSceneGraph/trunk/src/osg/StateSet.cpp

@@ -535 +535 @@
     setMode(GL_DEPTH_TEST,StateAttribute::ON);
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 
         // setAttributeAndModes(new AlphaFunc,StateAttribute::OFF);

OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

@@ -212 +212 @@
     if ((options & HEADLIGHT) || (options & SKY_LIGHT))
     {
-        #if !defined(OSG_GLES2_AVAILABLE)
+        #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             _lightingMode=(options&HEADLIGHT) ? HEADLIGHT : SKY_LIGHT;
             _light = new osg::Light;
@@ -227 +227 @@
         #endif
         
-        #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
+        #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             osg::LightModel* lightmodel = new osg::LightModel;
             lightmodel->setAmbientIntensity(osg::Vec4(0.1f,0.1f,0.1f,1.0f));
@@ -273 +273 @@
     _globalStateSet->setGlobalDefaults();
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         // set up an texture environment by default to speed up blending operations.
          osg::TexEnv* texenv = new osg::TexEnv;
@@ -677 +677 @@
     if (_lightingMode!=NO_SCENEVIEW_LIGHT)
     {
-        #if !defined(OSG_GLES2_AVAILABLE)
+        #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             // add GL_LIGHTING mode
             _globalStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
@@ -947 +947 @@
 #endif
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         switch(_lightingMode)
         {