diff --git a/CMakeLists.txt b/CMakeLists.txt index ce1eb0d62..e4a512b62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -759,7 +759,6 @@ IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) FIND_PACKAGE(FLTK) - FIND_PACKAGE(GLUT) FIND_PACKAGE(FOX) SET(wxWidgets_USE_LIBS base core gl net) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 39dcadabf..ab2f61d99 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -189,10 +189,6 @@ IF(DYNAMIC_OPENSCENEGRAPH) ADD_SUBDIRECTORY(osgpdf) - IF (GLUT_FOUND) - ADD_SUBDIRECTORY(osgviewerGLUT) - ENDIF(GLUT_FOUND) - IF (SDL_FOUND) ADD_SUBDIRECTORY(osgviewerSDL) ENDIF(SDL_FOUND) diff --git a/examples/osgviewerGLUT/CMakeLists.txt b/examples/osgviewerGLUT/CMakeLists.txt deleted file mode 100644 index 258815fa5..000000000 --- a/examples/osgviewerGLUT/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -SET(TARGET_SRC osgviewerGLUT.cpp ) - -INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} ) -SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY ) - -#### end var setup ### -SETUP_EXAMPLE(osgviewerGLUT) diff --git a/examples/osgviewerGLUT/osgviewerGLUT.cpp b/examples/osgviewerGLUT/osgviewerGLUT.cpp deleted file mode 100644 index 8694d6abb..000000000 --- a/examples/osgviewerGLUT/osgviewerGLUT.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* OpenSceneGraph example, osgviewerGlut. -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ - -// (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 - -#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) - // disable warning "glutCreateMenu_ATEXIT_HACK' : unreferenced local function has been removed" - #pragma warning( disable : 4505 ) -#endif - -#include -#ifdef WIN32 -#include -#endif - -#ifdef __APPLE__ -# include -#else -# include -#endif - -#include -#include -#include -#include - -osg::ref_ptr viewer; -osg::observer_ptr window; - -void display(void) -{ - // update and render the scene graph - if (viewer.valid()) viewer->frame(); - - // Swap Buffers - glutSwapBuffers(); - glutPostRedisplay(); -} - -void reshape( int w, int h ) -{ - // update the window dimensions, in case the window has been resized. - if (window.valid()) - { - window->resized(window->getTraits()->x, window->getTraits()->y, w, h); - window->getEventQueue()->windowResize(window->getTraits()->x, window->getTraits()->y, w, h ); - } -} - -void mousebutton( int button, int state, int x, int y ) -{ - if (window.valid()) - { - if (state==0) window->getEventQueue()->mouseButtonPress( x, y, button+1 ); - else window->getEventQueue()->mouseButtonRelease( x, y, button+1 ); - } -} - -void mousemove( int x, int y ) -{ - if (window.valid()) - { - window->getEventQueue()->mouseMotion( x, y ); - } -} - -void keyboard( unsigned char key, int /*x*/, int /*y*/ ) -{ - switch( key ) - { - case 27: - // clean up the viewer - if (viewer.valid()) viewer = 0; - glutDestroyWindow(glutGetWindow()); - break; - default: - if (window.valid()) - { - window->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) key ); - window->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::readRefNodeFile(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::Viewer; - window = viewer->setUpViewerAsEmbeddedInWindow(100,100,800,600); - viewer->setSceneData(loadedModel.get()); - viewer->setCameraManipulator(new osgGA::TrackballManipulator); - viewer->addEventHandler(new osgViewer::StatsHandler); - viewer->realize(); - - glutMainLoop(); - - return 0; -} - -/*EOF*/