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

From Jason Beverage, "I ran though the sample data that Gert provided earlier today and tracked down the problem. The xoffset in readHeightField and readImage were being applied even in projected coordinate systems. This patch should fix the issue."

Browse Source
This commit is contained in:
Robert Osfield
2006-11-14 12:55:00 +00:00
parent d0cc014f1b
commit bae46a0fbd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgTerrain/DataSet.cpp
View File

@@ -517,7 +517,7 @@ void DataSet::SourceData::readImage(DestinationData& destination)
// note, we have to handle the possibility of goegraphic datasets wrapping over on themselves when they pass over the dateline
// to do this we have to test geographic datasets via two passes, each with a 360 degree shift of the source cata.
double xoffset = d_bb.xMin() < s_bb.xMin() ? -360.0 : 0.0;
double xoffset = ((d_bb.xMin() < s_bb.xMin()) && (d_bb._isGeographic)) ? -360.0 : 0.0;
unsigned int numXChecks = d_bb._isGeographic ? 2 : 1;
for(unsigned int ic = 0; ic < numXChecks; ++ic, xoffset += 360.0)
{
@@ -875,7 +875,7 @@ void DataSet::SourceData::readHeightField(DestinationData& destination)
// note, we have to handle the possibility of goegraphic datasets wrapping over on themselves when they pass over the dateline
// to do this we have to test geographic datasets via two passes, each with a 360 degree shift of the source cata.
double xoffset = d_bb.xMin() < s_bb.xMin() ? -360.0 : 0.0;
double xoffset = ((d_bb.xMin() < s_bb.xMin()) && (d_bb._isGeographic)) ? -360.0 : 0.0;
unsigned int numXChecks = d_bb._isGeographic ? 2 : 1;
for(unsigned int ic = 0; ic < numXChecks; ++ic, xoffset += 360.0)
{