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

Apply color map also outside data range

Browse Source
This commit is contained in:
Malin E
2022-04-21 11:30:06 +02:00
parent 6ec1a56c6a
commit 497314668a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
View File

@@ -504,12 +504,12 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, true>(
);
It curr = next != _folder.files.begin() ? next - 1 : next;
It nextNext = next != _folder.files.end() ? next + 1 : curr;
if (next == _folder.files.end()) {
return retrieveTileProvider(Time(curr->first));
curr = next = nextNext = _folder.files.end() - 1;
}
It nextNext = next != _folder.files.end() ? next + 1 : curr;
It prev = curr != _folder.files.begin() ? curr - 1 : curr;
_interpolateTileProvider->t1 = retrieveTileProvider(Time(curr->first));
@@ -517,14 +517,11 @@ TemporalTileProvider::tileProvider<TemporalTileProvider::Mode::Folder, true>(
_interpolateTileProvider->future = retrieveTileProvider(Time(nextNext->first));
_interpolateTileProvider->before = retrieveTileProvider(Time(prev->first));
_interpolateTileProvider->factor = static_cast<float>(
(time.j2000Seconds() - curr->first) /
(next->first - curr->first)
float factor = static_cast<float>(
(time.j2000Seconds() - curr->first) / (next->first - curr->first)
);
if (_interpolateTileProvider->factor > 1.f) {
_interpolateTileProvider->factor = 1.f;
}
_interpolateTileProvider->factor = std::min(std::max(factor, 0.f), 1.f);
return _interpolateTileProvider.get();
}