mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2039 from OpenSpace/issue/1964

Browse Source 
Issue/1964
This commit is contained in:
Malin E
2022-04-26 11:17:21 +02:00
committed by GitHub
parent 7f50b877ac 966cbf8e66
commit 2fda3a14c4
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/examples/temperature_land_highres.asset
+1 -1
View File
@@ -32,7 +32,7 @@ local layer_folder = {
Type = "TemporalTileLayer",
Mode = "Folder",
Folder = {
Folder = "C:/Development/sync/http/earth_textures_climate/1",
Folder = path,
Format = "%Y-%m-%d-land.png"
},
Interpolation = true,
modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+10 -6
View File
@@ -505,6 +505,13 @@ 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()) {
curr = _folder.files.end() - 1;
next = curr;
nextNext = curr;
}
It prev = curr != _folder.files.begin() ? curr - 1 : curr;
_interpolateTileProvider->t1 = retrieveTileProvider(Time(curr->first));
@@ -512,14 +519,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::clamp(factor, 0.f, 1.f);
return _interpolateTileProvider.get();
}