FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cirular reference in DatabaseRequest

Browse Source
This commit is contained in:
Robert Osfield
2008-05-30 11:43:04 +00:00
parent f07d106366
commit 0cc38108a5
4 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/PagedLOD
View File

@@ -121,7 +121,7 @@ class OSG_EXPORT PagedLOD : public LOD
protected :
virtual ~PagedLOD() {}
virtual ~PagedLOD();
void expandPerRangeDataTo(unsigned int pos);

22
include/osgDB/DatabasePager
View File

@@ -324,17 +324,17 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
_numOfRequests(0)
{}
std::string _fileName;
int _frameNumberFirstRequest;
double _timestampFirstRequest;
float _priorityFirstRequest;
int _frameNumberLastRequest;
double _timestampLastRequest;
float _priorityLastRequest;
unsigned int _numOfRequests;
osg::ref_ptr<osg::Group> _groupForAddingLoadedSubgraph;
osg::ref_ptr<osg::Node> _loadedModel;
DataToCompileMap _dataToCompileMap;
std::string _fileName;
int _frameNumberFirstRequest;
double _timestampFirstRequest;
float _priorityFirstRequest;
int _frameNumberLastRequest;
double _timestampLastRequest;
float _priorityLastRequest;
unsigned int _numOfRequests;
osg::observer_ptr<osg::Group> _groupForAddingLoadedSubgraph;
osg::ref_ptr<osg::Node> _loadedModel;
DataToCompileMap _dataToCompileMap;
osg::ref_ptr<ReaderWriter::Options> _loadOptions;
bool isRequestCurrent (int frameNumber) const