Changeset 5927 for OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp

Timestamp:

01/08/07 11:00:16 (6 years ago)

Author:

robert

Message:

Ported following examples to osgViewer:

osggeodemo
osggeometry
osghud
osgimpostor
osgkeyboard
osglauncher
osglight
osglightpoint
osglogicop
osglogo
osgmovie
osgmultiplecameras
osgmultitexture
osgoccluder
osgparametric
osgparticle

Files:

• OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp

@@ -1 @@
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
 #include <osg/MatrixTransform>
@@ -24 +24 @@
 #include <osg/ShapeDrawable>
 
+#include <iostream>
 
 class OccluderEventHandler : public osgGA::GUIEventHandler
@@ -29 +30 @@
     public:
     
-        OccluderEventHandler(osgProducer::Viewer* viewer):_viewer(viewer) {}
+        OccluderEventHandler(osgViewer::Viewer* viewer):_viewer(viewer) {}
     
         virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&);
@@ -40 +41 @@
         
         
-        osgProducer::Viewer*                    _viewer;
+        osgViewer::Viewer*                    _viewer;
         osg::ref_ptr<osg::Group>                _occluders;
         osg::ref_ptr<osg::ConvexPlanarOccluder> _convexPlanarOccluder;
@@ -47 +48 @@
 bool OccluderEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&)
 {
+#if 0
     switch(ea.getEventType())
     {
@@ -53 +55 @@
             if (ea.getKey()=='a')
             {
-
                 float x = ea.getXnormalized();
                 float y = ea.getYnormalized();
@@ -97 +98 @@
             return false;
     }
+#else
+    osg::notify(osg::NOTICE)<<"Computre intersections not implemented yet."<<std::endl;
+    return false;
+#endif
 }
 
@@ -285 +290 @@
    
     // initialize the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
+    osgViewer::Viewer viewer;
 
     bool manuallyCreateOccluders = false;
@@ -295 +297 @@
     if (manuallyCreateOccluders)
     {
-        viewer.getEventHandlerList().push_front(new OccluderEventHandler(&viewer));
-    }
-
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
+        viewer.addEventHandler(new OccluderEventHandler(&viewer));
+    }
 
     // if user request help write it out to cout.
@@ -305 +304 @@
     {
         arguments.getApplicationUsage()->write(std::cout);
-        return 1;
-    }
-
-    // any option left unread are converted into errors to write out later.
-    arguments.reportRemainingOptionsAsUnrecognized();
-
-    // report any errors if they have occured when parsing the program aguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
         return 1;
     }
@@ -322 +311 @@
     if (!loadedmodel)
     {
+        osg::notify(osg::NOTICE)<<"Please sepecify and model filename on the command line."<<std::endl;
         return 1;
     }
@@ -346 +336 @@
     viewer.setSceneData( rootnode.get() );
 
-
-    // create the windows and run the threads.
-    viewer.realize();
-
-
-    while( !viewer.done() )
-    {
-        // wait for all cull and draw threads to complete.
-        viewer.sync();
-
-        // update the scene by traversing it with the the update visitor which will
-        // call all node update callbacks and animations.
-        viewer.update();
-         
-        // fire off the cull and draw traversals of the scene.
-        viewer.frame();
-        
-    }
-
-    // wait for all cull and draw threads to complete.
-    viewer.sync();
-
-    // run a clean up frame to delete all OpenGL objects.
-    viewer.cleanup_frame();
-
-    // wait for all the clean up frame to complete.
-    viewer.sync();
-
-    return 0;
+    return viewer.run();
 }