Stuart Buchanan
a760730285
Previously the STG Loader had a class member keeping track of each WS30 tile that had been loaded, to ensure the terrain was only loaded once. However, this was a class member on a loader, and we have multiple OSG loading threads. So the WS30 terrain was loaded ~6 times. Change to a static, protected with a mutex so we only load the tile once. 50% improvement in fps from the reduction in vertices, and an improvement in loading.
61 lines
2.1 KiB
C++
61 lines
2.1 KiB
C++
// tileentry.hxx -- routines to handle an individual scenery tile
|
|
//
|
|
// Written by Curtis Olson, started May 1998.
|
|
//
|
|
// Copyright (C) 1998 - 2001 Curtis L. Olson - http://www.flightgear.org/~curt
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License as
|
|
// published by the Free Software Foundation; either version 2 of the
|
|
// License, or (at your option) any later version.
|
|
//
|
|
// This program 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
|
|
// 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.
|
|
|
|
|
|
#ifndef _READERWRITERSTG_HXX
|
|
#define _READERWRITERSTG_HXX
|
|
|
|
#include <functional>
|
|
#include <mutex>
|
|
|
|
#include <osgDB/ReaderWriter>
|
|
#include <simgear/math/sg_types.hxx>
|
|
|
|
class SGGeod;
|
|
class SGBucket;
|
|
|
|
namespace simgear {
|
|
|
|
class ReaderWriterSTG : public osgDB::ReaderWriter {
|
|
public:
|
|
ReaderWriterSTG();
|
|
virtual ~ReaderWriterSTG();
|
|
|
|
virtual const char* className() const;
|
|
|
|
virtual ReadResult
|
|
readNode(const std::string&, const osgDB::Options*) const;
|
|
|
|
//pitch and roll are not common, so passed in "restofline" only
|
|
using STGObjectCallback = std::function<bool(const std::string& token, const std::string& modelpath, const SGGeod& position, const double hdg, const string_list& restofline)>;
|
|
//add/remove a callback that is invoked for unknown STG token
|
|
static void setSTGObjectHandler(const std::string &token, STGObjectCallback callback);
|
|
static void removeSTGObjectHandler(const std::string &token, STGObjectCallback callback);
|
|
private:
|
|
struct _ModelBin;
|
|
|
|
inline static std::map<std::string, osg::ref_ptr<osg::Node> > _tileMap;
|
|
inline static std::mutex _tileMapMutex; // protects the _lineFeatureLists;
|
|
|
|
};
|
|
|
|
}
|
|
#endif // _READERWRITERSTG_HXX
|