diff --git a/Make/dependencies b/Make/dependencies index 8f5f88477..5b8e1265d 100644 --- a/Make/dependencies +++ b/Make/dependencies @@ -47,6 +47,4 @@ INVENTOR_INSTALLED ?= no PERFORMER_INSTALLED ?= no -DEMETER_INSTALLED ?= no - GLUT_INSTALLED ?= no diff --git a/Make/makedirdefs b/Make/makedirdefs index 2aa13b0fd..0bb78855e 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -272,10 +272,6 @@ ifeq ($(PRODUCER_INSTALLED),yes) EXAMPLE_DIRS += osgsimulation endif - ifeq ($(DEMETER_INSTALLED),yes) - EXAMPLE_DIRS += osgdemeter - endif - endif ifeq ($(GLUT_INSTALLED),yes) diff --git a/examples/osgdemeter/GNUmakefile b/examples/osgdemeter/GNUmakefile deleted file mode 100644 index 68a6309b6..000000000 --- a/examples/osgdemeter/GNUmakefile +++ /dev/null @@ -1,18 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osgdemeter.cpp\ - -LIBS += -lDemeterOSG -lDemeter -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -INSTFILES = \ - $(CXXFILES)\ - GNUmakefile.inst=GNUmakefile - -EXEC = osgdemeter - -INC += $(X_INC) - -include $(TOPDIR)/Make/makerules - diff --git a/examples/osgdemeter/GNUmakefile.inst b/examples/osgdemeter/GNUmakefile.inst deleted file mode 100644 index 9e5e0ac91..000000000 --- a/examples/osgdemeter/GNUmakefile.inst +++ /dev/null @@ -1,14 +0,0 @@ -TOPDIR = ../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osgviewer.cpp\ - -LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -EXEC = osgviewer - -INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -LDFLAGS += $(PRODUCER_LIB_DIR) - -include $(TOPDIR)/Make/makerules diff --git a/examples/osgdemeter/osgdemeter.cpp b/examples/osgdemeter/osgdemeter.cpp deleted file mode 100644 index 6f0128192..000000000 --- a/examples/osgdemeter/osgdemeter.cpp +++ /dev/null @@ -1,207 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield - * - * This application is open source and may be redistributed and/or modified - * freely and without restriction, both in commericial and non commericial applications, - * as long as this copyright notice is maintained. - * - * This application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - -#include -#include -#include -#include - -#include -#include -#include - -Demeter::Terrain* loadTerrain() -{ - -#ifdef _WIN32 - char fileSeparator = '\\'; -#else - char fileSeparator = '/'; -#endif - char szMediaPath[17]; - sprintf(szMediaPath,"..%cdata%cLlano",fileSeparator,fileSeparator); - Demeter::Settings::GetInstance()->SetMediaPath(szMediaPath); - - Demeter::Settings::GetInstance()->SetTessellateMethod(Demeter::Settings::TM_2D_ROLLONLY); - - // Load a terrain that was generated in the Demeter Texture Editor - Demeter::Terrain* pTerrain = new Demeter::Terrain(500000,0.0f,0.0f); - try - { -#ifdef _DEBUG - Demeter::Loader::GetInstance()->LoadElevations("DemeterElevationLoaderDebug","Llano.terrain",pTerrain); - Demeter::Loader::GetInstance()->LoadTerrainTexture("DemeterTextureLoaderDebug","Llano.terrain",pTerrain); -#else - Demeter::Loader::GetInstance()->LoadElevations("DemeterElevationLoader","Llano.terrain",pTerrain); - Demeter::Loader::GetInstance()->LoadTerrainTexture("DemeterTextureLoader","Llano.terrain",pTerrain); -#endif - } - catch(Demeter::DemeterException* pEx) - { - std::cerr<GetErrorMessage()<SetTerrain(pTerrain); - - osg::Geode* pGeode = new osg::Geode; - pGeode->addDrawable(pDrawable); - - float detailThreshold = 9.0f; - pTerrain->SetDetailThreshold(detailThreshold); - - return pGeode; -} - -class KeyboardEventHandler : public osgGA::GUIEventHandler -{ -public: - - KeyboardEventHandler(Demeter::Terrain* pTerrain): - _pTerrain(pTerrain) {} - - virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&) - { - switch(ea.getEventType()) - { - case(osgGA::GUIEventAdapter::KEYDOWN): - { - if (ea.getKey()=='n') - { - _pTerrain->SetDetailThreshold(_pTerrain->GetDetailThreshold()+0.1f); - std::cout << "_pTerrain->GetDetailThreshold() = "<<_pTerrain->GetDetailThreshold() << std::endl; - return true; - } - else if (ea.getKey()=='n') - { - _pTerrain->SetDetailThreshold(_pTerrain->GetDetailThreshold()-0.1f); - std::cout << "_pTerrain->GetDetailThreshold() = "<<_pTerrain->GetDetailThreshold() << std::endl; - return true; - } - break; - } - default: - break; - } - return false; - } - - virtual void accept(osgGA::GUIEventHandlerVisitor& v) - { - v.visit(*this); - } - - Demeter::Terrain* _pTerrain; - -}; - - -int main( int argc, char **argv ) -{ - - // 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()->setApplicationName(arguments.getApplicationName()); - arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" example integrates the Demeter terrain engine with the OSG."); - arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); - arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); - - - // construct 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; - } -// -// if (arguments.argc()<=1) -// { -// arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION); -// return 1; -// } - - osg::Timer timer; - osg::Timer_t start_tick = timer.tick(); - - - Demeter::Terrain* pTerrain = loadTerrain(); - - // read the scene from the list of file specified commandline args. - osg::ref_ptr loadedModel = createSceneWithTerrain(pTerrain); - - - // if no model has been successfully loaded report failure. - if (!loadedModel) - { - std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl; - return 1; - } - - osg::Timer_t end_tick = timer.tick(); - - std::cout << "Time to load = "<