Ported osgbillboard over to osgViewer

examples/osgbillboard/GNUmakefile

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgbillboard.cpp
 
-LIBS     += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+LIBS     += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 
 INSTFILES = \

examples/osgbillboard/GNUmakefile.inst

@@ -4,12 +4,8 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgbillboard.cpp
 
-LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
-
+LIBS     += -losgViewer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 EXEC = osgbillboard
 
-INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
-
 include $(TOPDIR)/Make/makerules

examples/osgbillboard/osgbillboard.cpp

@@ -13,8 +13,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
 
-#include <osgProducer/Viewer>
-
+#include <osgViewer/Viewer>
 
 //
 // A simple demo demonstrating different texturing modes, 
@@ -161,74 +160,14 @@ osg::Node* createModel()
     return root;
 }
 
-int main( int argc, char **argv )
+int main(int, char**)
 {
-
-    // use an ArgumentParser object to manage the program arguments.
-    osg::ArgumentParser arguments(&argc,argv);
-
-    // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use billboard nodes.");
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
-    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-   
-    // initialize the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
-
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
-
-    // if user request help write it out to cout.
-    if (arguments.read("-h") || arguments.read("--help"))
-    {
-        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;
-    }
+    // construct the viewer
+    osgViewer::Viewer viewer;
     
-    // create a model from the images.
-    osg::Node* rootNode = createModel();
-
     // set the scene to render
-    viewer.setSceneData(rootNode);
+    viewer.setSceneData(createModel());
 
-    // 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;
+    // run the viewers frame loop
+    return viewer.run();
 }

examples/osgcamera/osgcamera.cpp

@@ -1,8 +1,4 @@
-// C++ source file - (C) 2003 Robert Osfield, released under the OSGPL.
-//
-// Simple example of use of Producer::RenderSurface to create an OpenGL
-// graphics window, and OSG for rendering.
-
+#if 1
 
 #include <osgDB/ReadFile>
 #include <osgViewer/Viewer>
@@ -172,7 +168,7 @@ int main( int argc, char **argv )
 
     viewer.setSceneData(loadedModel.get());
 
-    viewer.realize();
+    // viewer.realize();
 
     unsigned int numFrames = 0;
     while(!viewer.done() && !(limitNumberOfFrames && numFrames>=maxFrames))
@@ -183,3 +179,15 @@ int main( int argc, char **argv )
 
     return 0;
 }
+#else
+
+#include <osgViewer/Viewer>
+#include <osgDB/ReadFile>
+
+int main( int, char **)
+{
+    osgViewer::Viewer viewer;
+    viewer.setSceneData(osgDB::readNodeFile("cow.osg"));
+    viewer.run();
+}
+#endif