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

Added sampling down to 32x32 mesh for 64x64 height fields as a workaround to

Browse Source 
memory consumption issues with high res whole earth paged databases.
This commit is contained in:
Robert Osfield
2008-03-24 18:06:40 +00:00
parent 26526038ca
commit 600dbf5470
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -228,6 +228,24 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
numRows = elevationLayer->getNumRows();
}
double i_sampleFactor = 1.0;
double j_sampleFactor = 1.0;
unsigned int targetSize = 32;
if (numColumns==64 && numColumns>targetSize)
{
unsigned int originalNumColumns = numColumns;
unsigned int originalNumRows = numRows;
numColumns = targetSize;
numRows = targetSize;
i_sampleFactor = double(originalNumColumns-1)/double(numColumns-1);
j_sampleFactor = double(originalNumRows-1)/double(numRows-1);
}
bool treatBoundariesToValidDataAsDefaultValue = _terrain->getTreatBoundariesToValidDataAsDefaultValue();
osg::notify(osg::INFO)<<"TreatBoundariesToValidDataAsDefaultValue="<<treatBoundariesToValidDataAsDefaultValue<<std::endl;
@@ -312,10 +330,13 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
bool validValue = true;
unsigned int i_equiv = i_sampleFactor==1.0 ? i : (unsigned int) (double(i)*i_sampleFactor);
unsigned int j_equiv = i_sampleFactor==1.0 ? j : (unsigned int) (double(j)*j_sampleFactor);
if (elevationLayer)
{
float value = 0.0f;
validValue = elevationLayer->getValidValue(i,j, value);
validValue = elevationLayer->getValidValue(i_equiv,j_equiv, value);
// osg::notify(osg::INFO)<<"i="<<i<<" j="<<j<<" z="<<value<<std::endl;
ndc.z() = value;
}
@@ -618,7 +639,7 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
}
// _terrainGeometry->setUseDisplayList(false);
//geometry->setUseDisplayList(false);
geometry->setUseVertexBufferObjects(true);
}