Renamed osgsimpleviewer* examples to osgviewer* in prep for replacement of SimpleViewer by Viewer

examples/CMakeLists.txt

@@ -97,29 +97,27 @@ IF   (BUILD_OSG_WRAPPERS)
 ENDIF(BUILD_OSG_WRAPPERS)
 
 IF   (GLUT_FOUND)
-    ADD_SUBDIRECTORY(osgGLUTkeyboardmouse)
+    ADD_SUBDIRECTORY(osgviewerGLUT)
-    ADD_SUBDIRECTORY(osgGLUTsimple)
-    ADD_SUBDIRECTORY(osgsimpleviewerGLUT)
 ENDIF(GLUT_FOUND)
 
 IF   (SDL_FOUND)
-    ADD_SUBDIRECTORY(osgsimpleviewerSDL)
+    ADD_SUBDIRECTORY(osgviewerSDL)
 ENDIF(SDL_FOUND)
 
 IF   (wxWidgets_FOUND)
-    ADD_SUBDIRECTORY(osgsimpleviewerWX)
+    ADD_SUBDIRECTORY(osgviewerWX)
 ENDIF(wxWidgets_FOUND)
 
 IF   (QT_FOUND)
     IF   (QT4_FOUND)
-        ADD_SUBDIRECTORY(osgsimpleviewerQT4)
+        ADD_SUBDIRECTORY(osgviewerQT4)
     ELSE(QT4_FOUND)
-        ADD_SUBDIRECTORY(osgsimpleviewerQT3)
+        ADD_SUBDIRECTORY(osgviewerQT3)
     ENDIF(QT4_FOUND)
 ENDIF(QT_FOUND)
 
 IF   (FLTK_FOUND)
-    ADD_SUBDIRECTORY(osgsimpleviewerFLTK)
+    ADD_SUBDIRECTORY(osgviewerFLTK)
 ENDIF(FLTK_FOUND)
 
 IF   (WIN32)

examples/osgGLUTkeyboardmouse/CMakeLists.txt

@@ -1,6 +0,0 @@
-SET(TARGET_SRC osgGLUTkeyboardmouse.cpp )
-INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
-SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
-
-#### end var setup  ###
-SETUP_EXAMPLE(osgGLUTkeyboardmouse)

examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp

@@ -1,100 +0,0 @@
-// C++ source file - (C) 2003 Robert Osfield, released under the OSGPL.
-// (C) 2005 Mike Weiblen http://mew.cx/ released under the OSGPL.
-// Simple example using GLUT to create an OpenGL window and OSG for rendering.
-// Derived from osgGLUTsimple.cpp and osgkeyboardmouse.cpp
-
-#include <iostream>
-#ifdef WIN32
-#include <windows.h>
-#endif
-#ifdef __APPLE__
-#  include <GLUT/glut.h>
-#else
-#  include <GL/glut.h>
-#endif
-
-#include <osgViewer/SimpleViewer>
-#include <osgGA/TrackballManipulator>
-#include <osgDB/ReadFile>
-
-osg::ref_ptr<osgViewer::SimpleViewer> viewer;
-
-void display(void)
-{
-    // update and render the scene graph
-    viewer->frame();
-
-    // Swap Buffers
-    glutSwapBuffers();
-    glutPostRedisplay();
-}
-
-void reshape( int w, int h )
-{
-    // update the window dimensions, in case the window has been resized.
-    viewer->getEventQueue()->windowResize(0, 0, w, h );
-}
-
-void mousebutton( int button, int state, int x, int y )
-{
-    if (state==0) viewer->getEventQueue()->mouseButtonPress( x, y, button+1 );
-    else viewer->getEventQueue()->mouseButtonRelease( x, y, button+1 );
-}
-
-void mousemove( int x, int y )
-{
-    viewer->getEventQueue()->mouseMotion( x, y );
-}
-
-void keyboard( unsigned char key, int /*x*/, int /*y*/ )
-{
-    switch( key )
-    {
-        case 27:
-            glutDestroyWindow(glutGetWindow());
-            break;
-        default:
-            viewer->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) key );
-            viewer->getEventQueue()->keyRelease( (osgGA::GUIEventAdapter::KeySymbol) key );
-            break;
-    }
-}
-
-int main( int argc, char **argv )
-{
-    glutInit(&argc, argv);
-
-    if (argc<2)
-    {
-        std::cout << argv[0] <<": requires filename argument." << std::endl;
-        return 1;
-    }
-
-    // load the scene.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(argv[1]);
-    if (!loadedModel)
-    {
-        std::cout << argv[0] <<": No data loaded." << std::endl;
-        return 1;
-    }
-
-    glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_ALPHA );
-    glutInitWindowPosition( 100, 100 );
-    glutInitWindowSize( 800, 600 );
-    glutCreateWindow( argv[0] );
-    glutDisplayFunc( display );
-    glutReshapeFunc( reshape );
-    glutMouseFunc( mousebutton );
-    glutMotionFunc( mousemove );
-    glutKeyboardFunc( keyboard );
-
-    // create the view of the scene.
-    viewer = new osgViewer::SimpleViewer;
-    viewer->setSceneData(loadedModel.get());
-    viewer->setCameraManipulator(new osgGA::TrackballManipulator);
-
-    glutMainLoop();
-    return 0;
-}
-
-/*EOF*/

examples/osgGLUTsimple/CMakeLists.txt

@@ -1,7 +0,0 @@
-SET(TARGET_SRC osgGLUTsimple.cpp )
-
-INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
-SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
-
-#### end var setup  ###
-SETUP_EXAMPLE(osgGLUTsimple)

examples/osgGLUTsimple/osgGLUTsimple.cpp

@@ -1,74 +0,0 @@
-// C++ source file - (C) 2003 Robert Osfield, released under the OSGPL.
-// (C) 2005 Mike Weiblen http://mew.cx/ released under the OSGPL.
-// Simple example using GLUT to create an OpenGL window and OSG for rendering.
-// Derived from osgsimple.cpp
-
-#include <iostream>
-#ifdef WIN32
-#include <windows.h>
-#endif
-#ifdef __APPLE__
-#  include <GLUT/glut.h>
-#else
-#  include <GL/glut.h>
-#endif
-
-#include <osgViewer/SimpleViewer>
-#include <osgDB/ReadFile>
-
-osg::ref_ptr<osgViewer::SimpleViewer> viewer;
-
-void display(void)
-{
-    // update and render the scene
-    viewer->frame();
-
-    // Swap Buffers
-    glutSwapBuffers();
-    glutPostRedisplay();
-}
-
-void reshape( int w, int h )
-{
-    // update the window dimensions, in case the window has been resized.
-    viewer->getEventQueue()->windowResize(0, 0, w, h );
-}
-
-int main( int argc, char **argv )
-{
-    glutInit(&argc, argv);
-
-    if (argc<2)
-    {
-        std::cout << argv[0] <<": requires filename argument." << std::endl;
-        return 1;
-    }
-
-    // load the scene.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(argv[1]);
-    if (!loadedModel)
-    {
-        std::cout << argv[0] <<": No data loaded." << std::endl;
-        return 1;
-    }
-
-    glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_ALPHA );
-    glutInitWindowPosition( 100, 100 );
-    glutInitWindowSize( 800, 600 );
-    glutCreateWindow( argv[0] );
-    glutDisplayFunc( display );
-    glutReshapeFunc( reshape );
-
-    // create the view of the scene.
-    viewer = new osgViewer::SimpleViewer;
-    viewer->setSceneData(loadedModel.get());
-
-    // initialize the view to look at the center of the scene graph
-    const osg::BoundingSphere& bs = loadedModel->getBound();
-    viewer->getCamera()->setViewMatrixAsLookAt(bs.center()-osg::Vec3(0.0,2.0f*bs.radius(),0.0),bs.center(),osg::Vec3(0.0f,0.0f,1.0f));
-
-    glutMainLoop();
-    return 0;
-}
-
-/*EOF*/