mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-19 16:51:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved PatchCoverage specific logic from TileProvider to PatchCoverageProvider

Browse Source
This commit is contained in:
Erik Broberg
2016-05-09 18:27:30 -04:00
parent acfda284c9
commit a816b71a5a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/globebrowsing/other/patchcoverageprovider.cpp
View File

@@ -133,8 +133,12 @@ namespace openspace {
tileIndex.y += y;
// Returns only positive indices
//GeodeticTileIndex tileIndex2 = startIndex.getRelatedTile(x, y);
// If the tile index is negative or too big it needs to wrap around
int nIndices = pow(2, tileIndex.level);
GeodeticTileIndex positiveTileIndex = GeodeticTileIndex(tileIndex);
positiveTileIndex.x += (tileIndex.x < 0) ? nIndices : ((tileIndex.x > nIndices - 1) ? -nIndices : 0);
positiveTileIndex.y += (tileIndex.y < 0) ? nIndices : ((tileIndex.y > nIndices - 1) ? -nIndices : 0);
int numLevelsToLoop = tileIndex.level;
@@ -142,7 +146,7 @@ namespace openspace {
for (int j = numLevelsToLoop; j >= 0; j--)
{
// Try if the texture exists
std::shared_ptr<Texture> tile = tileProvider->getTile(tileIndex);
std::shared_ptr<Texture> tile = tileProvider->getTile(positiveTileIndex);
if (tile == nullptr)
{ // If it doesn't exist, go down a level
tileIndex.x /= 2;

6
modules/globebrowsing/other/tileprovider.cpp
View File

@@ -106,11 +106,7 @@ namespace openspace {
}
std::shared_ptr<Texture> TileProvider::getTile(GeodeticTileIndex tileIndex) {
// If the tile index is negative or too big it needs to wrap around
int nIndices = pow(2, tileIndex.level);
tileIndex.x += (tileIndex.x < 0) ? nIndices : ((tileIndex.x > nIndices - 1) ? -nIndices : 0);
tileIndex.y += (tileIndex.y < 0) ? nIndices : ((tileIndex.y > nIndices - 1) ? -nIndices : 0);
HashKey hashkey = tileIndex.hashKey();
if (_tileCache.exist(hashkey)) {