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

Timestamp:

02/02/07 23:30:36 (6 years ago)

Author:

robert

Message:

Convert GraphicsThread/GraphicsOperation? to more generic OperationsThread/Operation?.
This paves the way to running cull traversals in seperate threads.

Updated wrappers

Files:

• OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgshaderterrain/osgshaderterrain.cpp

@@ -241 +241 @@
 }
 
-class TestSupportOperation: public osg::GraphicsOperation
+class TestSupportOperation: public osg::Operation
 {
 public:
 
     TestSupportOperation():
-        osg::GraphicsOperation("TestSupportOperation",false),
+        osg::Operation("TestSupportOperation",false),
         _supported(true),
         _errorMessage() {}
 
-    virtual void operator () (osg::GraphicsContext* gc)
-    {
-        osg::notify(osg::NOTICE)<<"Not called"<<std::endl;
+    virtual void operator () (osg::Object* object)
+    {
+        osg::GraphicsContext* gc = dynamic_cast<osg::GraphicsContext*>(object);
+        if (!gc) return;
     
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
@@ -274 +275 @@
             }
         }
-
-        _supported = false;
-        _errorMessage = "ERROR: Pllalalal.";
-
+        else
+        {
+            _supported = false;
+            _errorMessage = "ERROR: GLSL not supported.";
+        }
     }
         
@@ -298 +300 @@
     
     osg::ref_ptr<TestSupportOperation> testSupportOperation = new TestSupportOperation;
-
-    osgViewer::Viewer::Windows windows;
-    viewer.getWindows(windows);
-    for(osgViewer::Viewer::Windows::iterator itr = windows.begin();
-        itr != windows.end();
-        ++itr)
-    {
-        (*itr)->add(testSupportOperation.get());
-    }
-
+#if 0 
+    // temporily commenting out as its causing the viewer to crash... no clue yet to why   
+    viewer.setRealizeOperation(testSupportOperation.get());
+#endif
     // create the windows and run the threads.
     viewer.realize();