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

Refactor osgTerrain::ProxyLayer so that it is now a pure Proxy, defering implementations

Browse Source 
to an Implementation rather than a subclass of ProxyLayer.  Updating the osgTerrain and GDAL plugins
to comply with this refactor.
This commit is contained in:
Robert Osfield
2008-01-14 14:53:49 +00:00
parent 767bdf4d21
commit 828851c08a
6 changed files with 118 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/gdal/DataSetLayer.cpp
View File

@@ -32,11 +32,12 @@ _dataset(0), _gdalReader(0)
DataSetLayer::DataSetLayer(const std::string& fileName):
_dataset(0), _gdalReader(0)
{
openFile(fileName);
setFileName(fileName);
open();
}
DataSetLayer::DataSetLayer(const DataSetLayer& dataSetLayer,const osg::CopyOp& copyop):
ProxyLayer(dataSetLayer), _gdalReader(dataSetLayer._gdalReader)
Layer(dataSetLayer), _gdalReader(dataSetLayer._gdalReader)
{
if (dataSetLayer._dataset) open();
}
@@ -52,6 +53,9 @@ void DataSetLayer::open()
if (getFileName().empty()) return;
osg::notify(osg::NOTICE)<<"DataSetLayer::open()"<<getFileName()<<std::endl;
_dataset = static_cast<GDALDataset*>(GDALOpen(getFileName().c_str(),GA_ReadOnly));
setUpLocator();
@@ -59,6 +63,8 @@ void DataSetLayer::open()
void DataSetLayer::close()
{
osg::notify(osg::NOTICE)<<"DataSetLayer::close()"<<getFileName()<<std::endl;
if (_dataset)
{
GDALClose(static_cast<GDALDatasetH>(_dataset));