1159784538
Create the local path in the right order in OptionsPusher. When OptionsPusher is used, put it inside a new code block so the order of destruction with respect to the mutex on reader functions id clear. Add #include <algorithm> to top of ModelRegistry.cxx. Change include syntax in PathOptions.cxx
34 lines
1.2 KiB
C++
34 lines
1.2 KiB
C++
// 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$
|
|
|
|
#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;
|
|
}
|