mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove offset for max chunk level, fixing disappearing height tiles on Earth (#3791)

Browse Source
This commit is contained in:
Alexander Bock
2025-09-25 13:13:12 +02:00
committed by Alexander Bock
parent acb31380d0
commit 22e538115a
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/globebrowsing/src/rawtiledatareader.cpp
View File

@@ -118,27 +118,6 @@ GDALDataType toGDALDataType(GLenum glType) {
}
}
/**
* Use as a helper function when determining the maximum tile level. This function
* returns the negated number of overviews requred to downscale the highest overview
* dataset so that it fits within minimumPixelSize pixels in the x-dimension.
*/
int calculateTileLevelDifference(GDALDataset* dataset, int minimumPixelSize) {
GDALRasterBand* firstBand = dataset->GetRasterBand(1);
GDALRasterBand* maxOverview = nullptr;
const int numOverviews = firstBand->GetOverviewCount();
if (numOverviews <= 0) { // No overviews. Use first band.
maxOverview = firstBand;
}
else { // Pick the highest overview.
maxOverview = firstBand->GetOverview(numOverviews - 1);
}
const int sizeLevel0 = maxOverview->GetXSize();
const double diff = log2(minimumPixelSize) - log2(sizeLevel0);
const double intdiff = diff >= 0 ? ceil(diff) : floor(diff);
return static_cast<int>(intdiff);
}
bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) {
const glm::ivec2 e = lhs.start + lhs.numPixels;
const glm::ivec2 re = rhs.start + rhs.numPixels;
@@ -434,17 +413,7 @@ void RawTileDataReader::initialize() {
_padfTransform = geoTransform(_rasterXSize, _rasterYSize);
}
const double tileLevelDifference = calculateTileLevelDifference(
_dataset,
_initData.dimensions.x
);
const int numOverviews = _dataset->GetRasterBand(1)->GetOverviewCount();
_maxChunkLevel = static_cast<int>(-tileLevelDifference);
if (numOverviews > 0) {
_maxChunkLevel += numOverviews;
}
_maxChunkLevel = std::max(_maxChunkLevel, 2);
_maxChunkLevel = _dataset->GetRasterBand(1)->GetOverviewCount();
}
void RawTileDataReader::reset() {