Changeset 5339 for OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp

Timestamp:

07/19/06 14:58:45 (7 years ago)

Author:

robert

Message:

Added scene handler init to custom realize callback

Files:

• OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp

@@ -738 +738 @@
         virtual void operator()( osgProducer::OsgCameraGroup&, osgProducer::OsgSceneHandler& sh, const Producer::RenderSurface& )
         {
-            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-        
-            unsigned int contextID = sh.getSceneView()->getState()->getContextID();
-            osg::GL2Extensions* gl2ext = osg::GL2Extensions::Get(contextID,true);
-            if( gl2ext )
             {
-                if( !gl2ext->isGlslSupported() )
+                OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
+
+                unsigned int contextID = sh.getSceneView()->getState()->getContextID();
+                osg::GL2Extensions* gl2ext = osg::GL2Extensions::Get(contextID,true);
+                if( gl2ext )
                 {
-                    _supported = false;
-                    _errorMessage = "ERROR: GLSL not supported by OpenGL driver.";
-                }
-
-                GLint numVertexTexUnits = 0;
-                glGetIntegerv( GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &numVertexTexUnits );
-                if( numVertexTexUnits <= 0 )
-                {
-                    _supported = false;
-                    _errorMessage = "ERROR: vertex texturing not supported by OpenGL driver.";
+                    if( !gl2ext->isGlslSupported() )
+                    {
+                        _supported = false;
+                        _errorMessage = "ERROR: GLSL not supported by OpenGL driver.";
+                    }
+
+                    GLint numVertexTexUnits = 0;
+                    glGetIntegerv( GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &numVertexTexUnits );
+                    if( numVertexTexUnits <= 0 )
+                    {
+                        _supported = false;
+                        _errorMessage = "ERROR: vertex texturing not supported by OpenGL driver.";
+                    }
                 }
             }
+                        
+            sh.init();
         }