FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'releases/2.2.0' into next

Browse Source
This commit is contained in:
Tim Moore
2011-02-17 11:40:47 +01:00
parent 3a0fbae4d9 956b4406d0
commit feab25d0be
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGPagedLOD.cxx
+5 -3
View File
@@ -46,8 +46,10 @@ SGPagedLOD::~SGPagedLOD()
} }
SGPagedLOD::SGPagedLOD(const SGPagedLOD& plod,const CopyOp& copyop) SGPagedLOD::SGPagedLOD(const SGPagedLOD& plod,const CopyOp& copyop)
: osg::PagedLOD(plod, copyop), : osg::PagedLOD(plod, copyop)
_readerWriterOptions(plod._readerWriterOptions) #if !SG_PAGEDLOD_HAS_OPTIONS
, _readerWriterOptions(plod._readerWriterOptions)
#endif
{ {
} }
@@ -84,7 +86,7 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp, FrameStamp* framestamp,
dbp->requestNodeFile(getFileName(childNum), NodePathProxy(path), dbp->requestNodeFile(getFileName(childNum), NodePathProxy(path),
priority, framestamp, priority, framestamp,
getDatabaseRequest(childNum), getDatabaseRequest(childNum),
_readerWriterOptions.get()); getReaderWriterOptions());
} }
bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw) bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
simgear/scene/model/SGPagedLOD.hxx
+1 -1
View File
@@ -71,7 +71,7 @@ public:
protected: protected:
virtual ~SGPagedLOD(); virtual ~SGPagedLOD();
#if SG_PAGEDLOD_HAS_OPTIONS #if !SG_PAGEDLOD_HAS_OPTIONS
osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions; osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
#endif #endif
}; };