Show
Ignore:
Timestamp:
05/11/09 13:39:12 (6 years ago)
Author:
robert
Message:

Moved Registry::ReadFileCallback? + WriteFileCallback?, and osgDB::ReaderWriter::Options into their own separate Options file and into the osgDB namespace.

Introduced a new callback osgDB::FindFileCallback? that overrides the default behavior of findDataFile/findLibraryFile.

Introduced support for assigning ReaderWriter::Options directory to PagedLOD.

Introduced new osgDB::FileLocationCallback? for assistancing the DatabasePager? to know when a file is hosted on a local or remote file system.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/PagedLOD.cpp

    r9387 r10174  
    5959PagedLOD::PagedLOD(const PagedLOD& plod,const CopyOp& copyop): 
    6060    LOD(plod,copyop), 
     61    _databaseOptions(plod._databaseOptions), 
    6162    _databasePath(plod._databasePath), 
    6263    _frameNumberOfLastTraversal(plod._frameNumberOfLastTraversal), 
     
    214215                    if (_databasePath.empty()) 
    215216                    { 
    216                         nv.getDatabaseRequestHandler()->requestNodeFile(_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp(), _perRangeDataList[numChildren]._databaseRequest); 
     217                        nv.getDatabaseRequestHandler()->requestNodeFile(_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp(), _perRangeDataList[numChildren]._databaseRequest, _databaseOptions.get()); 
    217218                    } 
    218219                    else 
    219220                    { 
    220221                        // prepend the databasePath to the child's filename. 
    221                         nv.getDatabaseRequestHandler()->requestNodeFile(_databasePath+_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp(), _perRangeDataList[numChildren]._databaseRequest); 
    222                     } 
    223                 } 
    224  
     222                        nv.getDatabaseRequestHandler()->requestNodeFile(_databasePath+_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp(), _perRangeDataList[numChildren]._databaseRequest, _databaseOptions.get()); 
     223                    } 
     224                } 
    225225 
    226226            }