From 33b6fdd6c6a526c780fdf08d53ddc499b900a364 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 1 Jun 2007 22:33:05 +0000 Subject: [PATCH] Renamed osgsimpleviewer* examples to osgviewer* in prep for replacement of SimpleViewer by Viewer --- examples/CMakeLists.txt | 14 ++- examples/osgGLUTkeyboardmouse/CMakeLists.txt | 6 -- .../osgGLUTkeyboardmouse.cpp | 100 ------------------ examples/osgGLUTsimple/CMakeLists.txt | 7 -- examples/osgGLUTsimple/osgGLUTsimple.cpp | 74 ------------- .../English.lproj/InfoPlist.strings | Bin .../English.lproj/Localizable.strings | 0 .../English.lproj/MainMenu.nib/classes.nib | 0 .../English.lproj/MainMenu.nib/info.nib | 0 .../MainMenu.nib/keyedobjects.nib | Bin .../Info.plist | 0 .../SimpleViewerCocoa.h | 0 .../SimpleViewerCocoa.mm | 0 .../main.m | 0 .../CMakeLists.txt | 0 .../osgsimpleviewerFLTK.cpp | 0 .../CMakeLists.txt | 0 .../osgsimpleviewerGLUT.cpp | 0 .../CMakeLists.txt | 0 .../osgsimpleviewerQT3.cpp | 0 .../CMakeLists.txt | 0 .../osgsimpleviewerQT4.cpp | 0 .../CMakeLists.txt | 0 .../SDLMainForMacOSX.h | 0 .../SDLMainForMacOSX.m | 0 .../osgsimpleviewerSDL.cpp | 0 .../CMakeLists.txt | 0 .../osgsimpleviewerWX.cpp | 0 .../osgsimpleviewerWX.h | 0 29 files changed, 6 insertions(+), 195 deletions(-) delete mode 100644 examples/osgGLUTkeyboardmouse/CMakeLists.txt delete mode 100644 examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp delete mode 100644 examples/osgGLUTsimple/CMakeLists.txt delete mode 100644 examples/osgGLUTsimple/osgGLUTsimple.cpp rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/English.lproj/InfoPlist.strings (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/English.lproj/Localizable.strings (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/English.lproj/MainMenu.nib/classes.nib (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/English.lproj/MainMenu.nib/info.nib (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/English.lproj/MainMenu.nib/keyedobjects.nib (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/Info.plist (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/SimpleViewerCocoa.h (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/SimpleViewerCocoa.mm (100%) rename examples/{osgsimpleviewerCocoa => osgviewerCocoa}/main.m (100%) rename examples/{osgsimpleviewerFLTK => osgviewerFLTK}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerFLTK => osgviewerFLTK}/osgsimpleviewerFLTK.cpp (100%) rename examples/{osgsimpleviewerGLUT => osgviewerGLUT}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerGLUT => osgviewerGLUT}/osgsimpleviewerGLUT.cpp (100%) rename examples/{osgsimpleviewerQT3 => osgviewerQT3}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerQT3 => osgviewerQT3}/osgsimpleviewerQT3.cpp (100%) rename examples/{osgsimpleviewerQT4 => osgviewerQT4}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerQT4 => osgviewerQT4}/osgsimpleviewerQT4.cpp (100%) rename examples/{osgsimpleviewerSDL => osgviewerSDL}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerSDL => osgviewerSDL}/SDLMainForMacOSX.h (100%) rename examples/{osgsimpleviewerSDL => osgviewerSDL}/SDLMainForMacOSX.m (100%) rename examples/{osgsimpleviewerSDL => osgviewerSDL}/osgsimpleviewerSDL.cpp (100%) rename examples/{osgsimpleviewerWX => osgviewerWX}/CMakeLists.txt (100%) rename examples/{osgsimpleviewerWX => osgviewerWX}/osgsimpleviewerWX.cpp (100%) rename examples/{osgsimpleviewerWX => osgviewerWX}/osgsimpleviewerWX.h (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8b5484d68..dfa21ede0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -97,29 +97,27 @@ IF (BUILD_OSG_WRAPPERS) ENDIF(BUILD_OSG_WRAPPERS) IF (GLUT_FOUND) - ADD_SUBDIRECTORY(osgGLUTkeyboardmouse) - ADD_SUBDIRECTORY(osgGLUTsimple) - ADD_SUBDIRECTORY(osgsimpleviewerGLUT) + ADD_SUBDIRECTORY(osgviewerGLUT) 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) diff --git a/examples/osgGLUTkeyboardmouse/CMakeLists.txt b/examples/osgGLUTkeyboardmouse/CMakeLists.txt deleted file mode 100644 index 1595f6d27..000000000 --- a/examples/osgGLUTkeyboardmouse/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp b/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp deleted file mode 100644 index eb3e2bdae..000000000 --- a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp +++ /dev/null @@ -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 -#ifdef WIN32 -#include -#endif -#ifdef __APPLE__ -# include -#else -# include -#endif - -#include -#include -#include - -osg::ref_ptr 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 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*/ diff --git a/examples/osgGLUTsimple/CMakeLists.txt b/examples/osgGLUTsimple/CMakeLists.txt deleted file mode 100644 index 628dc3a89..000000000 --- a/examples/osgGLUTsimple/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/examples/osgGLUTsimple/osgGLUTsimple.cpp b/examples/osgGLUTsimple/osgGLUTsimple.cpp deleted file mode 100644 index caff5f757..000000000 --- a/examples/osgGLUTsimple/osgGLUTsimple.cpp +++ /dev/null @@ -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 -#ifdef WIN32 -#include -#endif -#ifdef __APPLE__ -# include -#else -# include -#endif - -#include -#include - -osg::ref_ptr 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 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*/ diff --git a/examples/osgsimpleviewerCocoa/English.lproj/InfoPlist.strings b/examples/osgviewerCocoa/English.lproj/InfoPlist.strings similarity index 100% rename from examples/osgsimpleviewerCocoa/English.lproj/InfoPlist.strings rename to examples/osgviewerCocoa/English.lproj/InfoPlist.strings diff --git a/examples/osgsimpleviewerCocoa/English.lproj/Localizable.strings b/examples/osgviewerCocoa/English.lproj/Localizable.strings similarity index 100% rename from examples/osgsimpleviewerCocoa/English.lproj/Localizable.strings rename to examples/osgviewerCocoa/English.lproj/Localizable.strings diff --git a/examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/classes.nib b/examples/osgviewerCocoa/English.lproj/MainMenu.nib/classes.nib similarity index 100% rename from examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/classes.nib rename to examples/osgviewerCocoa/English.lproj/MainMenu.nib/classes.nib diff --git a/examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/info.nib b/examples/osgviewerCocoa/English.lproj/MainMenu.nib/info.nib similarity index 100% rename from examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/info.nib rename to examples/osgviewerCocoa/English.lproj/MainMenu.nib/info.nib diff --git a/examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/keyedobjects.nib b/examples/osgviewerCocoa/English.lproj/MainMenu.nib/keyedobjects.nib similarity index 100% rename from examples/osgsimpleviewerCocoa/English.lproj/MainMenu.nib/keyedobjects.nib rename to examples/osgviewerCocoa/English.lproj/MainMenu.nib/keyedobjects.nib diff --git a/examples/osgsimpleviewerCocoa/Info.plist b/examples/osgviewerCocoa/Info.plist similarity index 100% rename from examples/osgsimpleviewerCocoa/Info.plist rename to examples/osgviewerCocoa/Info.plist diff --git a/examples/osgsimpleviewerCocoa/SimpleViewerCocoa.h b/examples/osgviewerCocoa/SimpleViewerCocoa.h similarity index 100% rename from examples/osgsimpleviewerCocoa/SimpleViewerCocoa.h rename to examples/osgviewerCocoa/SimpleViewerCocoa.h diff --git a/examples/osgsimpleviewerCocoa/SimpleViewerCocoa.mm b/examples/osgviewerCocoa/SimpleViewerCocoa.mm similarity index 100% rename from examples/osgsimpleviewerCocoa/SimpleViewerCocoa.mm rename to examples/osgviewerCocoa/SimpleViewerCocoa.mm diff --git a/examples/osgsimpleviewerCocoa/main.m b/examples/osgviewerCocoa/main.m similarity index 100% rename from examples/osgsimpleviewerCocoa/main.m rename to examples/osgviewerCocoa/main.m diff --git a/examples/osgsimpleviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerFLTK/CMakeLists.txt rename to examples/osgviewerFLTK/CMakeLists.txt diff --git a/examples/osgsimpleviewerFLTK/osgsimpleviewerFLTK.cpp b/examples/osgviewerFLTK/osgsimpleviewerFLTK.cpp similarity index 100% rename from examples/osgsimpleviewerFLTK/osgsimpleviewerFLTK.cpp rename to examples/osgviewerFLTK/osgsimpleviewerFLTK.cpp diff --git a/examples/osgsimpleviewerGLUT/CMakeLists.txt b/examples/osgviewerGLUT/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerGLUT/CMakeLists.txt rename to examples/osgviewerGLUT/CMakeLists.txt diff --git a/examples/osgsimpleviewerGLUT/osgsimpleviewerGLUT.cpp b/examples/osgviewerGLUT/osgsimpleviewerGLUT.cpp similarity index 100% rename from examples/osgsimpleviewerGLUT/osgsimpleviewerGLUT.cpp rename to examples/osgviewerGLUT/osgsimpleviewerGLUT.cpp diff --git a/examples/osgsimpleviewerQT3/CMakeLists.txt b/examples/osgviewerQT3/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerQT3/CMakeLists.txt rename to examples/osgviewerQT3/CMakeLists.txt diff --git a/examples/osgsimpleviewerQT3/osgsimpleviewerQT3.cpp b/examples/osgviewerQT3/osgsimpleviewerQT3.cpp similarity index 100% rename from examples/osgsimpleviewerQT3/osgsimpleviewerQT3.cpp rename to examples/osgviewerQT3/osgsimpleviewerQT3.cpp diff --git a/examples/osgsimpleviewerQT4/CMakeLists.txt b/examples/osgviewerQT4/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerQT4/CMakeLists.txt rename to examples/osgviewerQT4/CMakeLists.txt diff --git a/examples/osgsimpleviewerQT4/osgsimpleviewerQT4.cpp b/examples/osgviewerQT4/osgsimpleviewerQT4.cpp similarity index 100% rename from examples/osgsimpleviewerQT4/osgsimpleviewerQT4.cpp rename to examples/osgviewerQT4/osgsimpleviewerQT4.cpp diff --git a/examples/osgsimpleviewerSDL/CMakeLists.txt b/examples/osgviewerSDL/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerSDL/CMakeLists.txt rename to examples/osgviewerSDL/CMakeLists.txt diff --git a/examples/osgsimpleviewerSDL/SDLMainForMacOSX.h b/examples/osgviewerSDL/SDLMainForMacOSX.h similarity index 100% rename from examples/osgsimpleviewerSDL/SDLMainForMacOSX.h rename to examples/osgviewerSDL/SDLMainForMacOSX.h diff --git a/examples/osgsimpleviewerSDL/SDLMainForMacOSX.m b/examples/osgviewerSDL/SDLMainForMacOSX.m similarity index 100% rename from examples/osgsimpleviewerSDL/SDLMainForMacOSX.m rename to examples/osgviewerSDL/SDLMainForMacOSX.m diff --git a/examples/osgsimpleviewerSDL/osgsimpleviewerSDL.cpp b/examples/osgviewerSDL/osgsimpleviewerSDL.cpp similarity index 100% rename from examples/osgsimpleviewerSDL/osgsimpleviewerSDL.cpp rename to examples/osgviewerSDL/osgsimpleviewerSDL.cpp diff --git a/examples/osgsimpleviewerWX/CMakeLists.txt b/examples/osgviewerWX/CMakeLists.txt similarity index 100% rename from examples/osgsimpleviewerWX/CMakeLists.txt rename to examples/osgviewerWX/CMakeLists.txt diff --git a/examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp b/examples/osgviewerWX/osgsimpleviewerWX.cpp similarity index 100% rename from examples/osgsimpleviewerWX/osgsimpleviewerWX.cpp rename to examples/osgviewerWX/osgsimpleviewerWX.cpp diff --git a/examples/osgsimpleviewerWX/osgsimpleviewerWX.h b/examples/osgviewerWX/osgsimpleviewerWX.h similarity index 100% rename from examples/osgsimpleviewerWX/osgsimpleviewerWX.h rename to examples/osgviewerWX/osgsimpleviewerWX.h