From 44dab36dff87b2036cdaae0133571f920a96c641 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 5 Jan 2007 14:48:50 +0000
Subject: [PATCH] Converted osganimate example to osgViewer

---
 examples/osganimate/GNUmakefile    |  2 +-
 examples/osganimate/osganimate.cpp | 40 +++---------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/examples/osganimate/GNUmakefile b/examples/osganimate/GNUmakefile
index 79a25454f..e02b96063 100644
--- a/examples/osganimate/GNUmakefile
+++ b/examples/osganimate/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osganimate.cpp\
 
-LIBS     += -losgProducer -lProducer -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+LIBS     += -losgViewer -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/examples/osganimate/osganimate.cpp b/examples/osganimate/osganimate.cpp
index 28bc4605b..8677927de 100644
--- a/examples/osganimate/osganimate.cpp
+++ b/examples/osganimate/osganimate.cpp
@@ -15,8 +15,8 @@
 
 #include <osgSim/OverlayNode>
 
-#include <osgProducer/Viewer>
-
+#include <osgViewer/Viewer>
+#include <iostream>
 
 osg::AnimationPath* createAnimationPath(const osg::Vec3& center,float radius,double looptime)
 {
@@ -215,13 +215,7 @@ int main( int argc, char **argv )
     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());
+    osgViewer::Viewer viewer;
 
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
@@ -262,31 +256,5 @@ int main( int argc, char **argv )
     // set the scene to render
     viewer.setSceneData(rootnode);
 
-    // 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();
 }