diff --git a/examples/osgdem/DataSet.cpp b/examples/osgdem/DataSet.cpp index ba9cf71f9..36f31cb43 100644 --- a/examples/osgdem/DataSet.cpp +++ b/examples/osgdem/DataSet.cpp @@ -1039,10 +1039,10 @@ void DataSet::DestinationTile::computeNeighboursFromQuadMap() { if (_dataSet) { - setNeighbours(_dataSet->getTile(_level,_X-1,_Y),_dataSet->getTile(_level,_X-1,_Y-1), - _dataSet->getTile(_level,_X,_Y-1),_dataSet->getTile(_level,_X+1,_Y-1), - _dataSet->getTile(_level,_X+1,_Y),_dataSet->getTile(_level,_X+1,_Y+1), - _dataSet->getTile(_level,_X,_Y+1),_dataSet->getTile(_level,_X-1,_Y+1)); + setNeighbours(_dataSet->getTile(_level,_tileX-1,_tileY),_dataSet->getTile(_level,_tileX-1,_tileY-1), + _dataSet->getTile(_level,_tileX,_tileY-1),_dataSet->getTile(_level,_tileX+1,_tileY-1), + _dataSet->getTile(_level,_tileX+1,_tileY),_dataSet->getTile(_level,_tileX+1,_tileY+1), + _dataSet->getTile(_level,_tileX,_tileY+1),_dataSet->getTile(_level,_tileX-1,_tileY+1)); } } @@ -1846,8 +1846,8 @@ DataSet::CompositeDestination* DataSet::createDestinationGraph(osgTerrain::Coord tile->_cs = cs; tile->_extents = extents; tile->_level = currentLevel; - tile->_X = currentX; - tile->_Y = currentY; + tile->_tileX = currentX; + tile->_tileY = currentY; tile->setMaximumImagerySize(maxImageSize,maxImageSize); tile->setMaximumTerrainSize(maxTerrainSize,maxTerrainSize); tile->computeMaximumSourceResolution(_sourceGraph.get()); diff --git a/examples/osgdem/DataSet.h b/examples/osgdem/DataSet.h index 36a899d46..78ace039a 100644 --- a/examples/osgdem/DataSet.h +++ b/examples/osgdem/DataSet.h @@ -699,8 +699,8 @@ class DataSet : public osg::Referenced float _terrain_maxSourceResolutionY; unsigned int _level; - unsigned int _X; - unsigned int _Y; + unsigned int _tileX; + unsigned int _tileY; }; @@ -744,7 +744,7 @@ class DataSet : public osg::Referenced void insertTileToQuadMap(DestinationTile* tile) { - _quadMap[tile->_level][tile->_X][tile->_Y] = tile; + _quadMap[tile->_level][tile->_tileX][tile->_tileY] = tile; } DestinationTile* getTile(unsigned int level,unsigned int X, unsigned int Y)