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

Completed support for "--levels min max" option where the levels that a

Browse Source 
source imager or DEM contributes to.
This commit is contained in:
Robert Osfield
2004-06-30 14:37:06 +00:00
parent c45138f977
commit ae3b1454e8
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgTerrain/DataSet
View File

@@ -738,6 +738,8 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced
bool _equalized[NUMBER_OF_POSITIONS];
unsigned int _maxSourceLevel;
unsigned int _imagery_maxNumColumns;
unsigned int _imagery_maxNumRows;
float _imagery_maxSourceResolutionX;

15
src/osgTerrain/DataSet.cpp
View File

@@ -1161,6 +1161,7 @@ DataSet::DestinationTile::DestinationTile():
_level(0),
_tileX(0),
_tileY(0),
_maxSourceLevel(0),
_imagery_maxNumColumns(4096),
_imagery_maxNumRows(4096),
_imagery_maxSourceResolutionX(0.0f),
@@ -1183,6 +1184,12 @@ void DataSet::DestinationTile::computeMaximumSourceResolution(CompositeSource* s
{
for(CompositeSource::source_iterator itr(sourceGraph);itr.valid();++itr)
{
if ((*itr)->getMaxLevel()<_level)
{
// skip the contribution of this source since this destination tile exceeds its contribution level.
continue;
}
SourceData* data = (*itr)->getSourceData();
if (data && (*itr)->getType()!=Source::MODEL)
@@ -1192,13 +1199,15 @@ void DataSet::DestinationTile::computeMaximumSourceResolution(CompositeSource* s
if (!sp._extents.intersects(_extents))
{
// std::cout<<"DataSet::DestinationTile::computeMaximumSourceResolution:: source does not overlap ignoring for this tile."<<std::endl;
// skip this source since it doesn't overlap this tile.
continue;
}
if (sp._numValuesX!=0 && sp._numValuesY!=0)
{
_maxSourceLevel = osg::maximum((*itr)->getMaxLevel(),_maxSourceLevel);
float sourceResolutionX = (sp._extents.xMax()-sp._extents.xMin())/(float)sp._numValuesX;
float sourceResolutionY = (sp._extents.yMax()-sp._extents.yMin())/(float)sp._numValuesY;
@@ -2932,8 +2941,8 @@ DataSet::CompositeDestination* DataSet::createDestinationGraph(CompositeDestinat
insertTileToQuadMap(destinationGraph);
if (currentLevel>=maxNumLevels-1)
{
if (currentLevel>=maxNumLevels-1 || currentLevel>=tile->_maxSourceLevel)
{
// bottom level can't divide any further.
destinationGraph->_tiles.push_back(tile);
}