Move some OSG-dependant code into scene/util.

simgear/misc/CMakeLists.txt

@@ -2,7 +2,6 @@
 include (SimGearComponent)
 
 set(HEADERS 
-    PathOptions.hxx
     ResourceManager.hxx
     interpolator.hxx
     sg_dir.hxx
@@ -18,7 +17,6 @@ set(HEADERS
     )
 
 set(SOURCES 
-    PathOptions.cxx
     ResourceManager.cxx
     interpolator.cxx
     sg_dir.cxx

simgear/misc/PathOptions.cxx

@@ -1,41 +0,0 @@
-// PathOptions.cxx -- make an osgDB Options object from a path
-// Copyright (C) 2007  Tim Moore timoore@redhat.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
-
-#include <osgDB/Registry>
-
-#include "PathOptions.hxx"
-
-using namespace simgear;
-
-osgDB::ReaderWriter::Options* simgear::makeOptionsFromPath(const SGPath& path)
-{
-    using namespace osgDB;
-    ReaderWriter::Options *options
-        = new ReaderWriter::Options(*(Registry::instance()->getOptions()));
-    options->setDatabasePath(path.str());
-    return options;
-}
-
-#endif // of NO_OPENSCENEGRAPH_INTERFACE

simgear/misc/PathOptions.hxx

@@ -1,33 +0,0 @@
-// PathOptions.hxx -- make an osgDB Options object from a path
-// Copyright (C) 2007  Tim Moore timoore@redhat.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-#ifndef PATHOPTIONSHXX
-#define PATHOPTIONSHXX 1
-
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
-#include <osgDB/ReaderWriter>
-#include <simgear/misc/sg_path.hxx>
-
-namespace simgear
-{
-osgDB::ReaderWriter::Options* makeOptionsFromPath(const SGPath&);
-}
-#endif
-
-#endif