mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-15 10:09:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

SizeReferenceTileProvider hashes based on tile sizes instead of chunk indices

Browse Source
This commit is contained in:
Erik Broberg
2016-08-31 16:42:48 -04:00
parent c201957001
commit b8fb3dcbe6
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/globebrowsing/tile/tileprovider/texttileprovider.cpp
View File

@@ -141,6 +141,11 @@ namespace openspace {
return 1337; // unlimited
}
ChunkHashKey TextTileProvider::toHash(const ChunkIndex& chunkIndex) const {
return chunkIndex.hashKey();
}
Tile TextTileProvider::backgroundTile(const ChunkIndex& chunkIndex) const {
glm::uvec4 color = { 0, 0, 0, 0 };
return Tile::createPlainTile(_textureSize, color);
@@ -198,14 +203,11 @@ namespace openspace {
void SizeReferenceTileProvider::renderText(const FontRenderer& fontRenderer, const ChunkIndex& chunkIndex) const {
GeodeticPatch patch(chunkIndex);
bool aboveEquator = patch.isNorthern();
double lat = aboveEquator ? patch.minLat() : patch.maxLat();
double lon1 = patch.minLon();
double lon2 = patch.maxLon();
double tileLongitudalLength = _ellipsoid.longitudalDistance(lat, lon1, lon2);
double tileLongitudalLength = roundedLongitudalLength(chunkIndex);
std::string unit = "m";
if (tileLongitudalLength > 10000) {
if (tileLongitudalLength > 9999) {
tileLongitudalLength *= 0.001;
unit = "km";
}
@@ -224,6 +226,28 @@ namespace openspace {
);
}
int SizeReferenceTileProvider::roundedLongitudalLength(const ChunkIndex& chunkIndex) const {
GeodeticPatch patch(chunkIndex);
bool aboveEquator = patch.isNorthern();
double lat = aboveEquator ? patch.minLat() : patch.maxLat();
double lon1 = patch.minLon();
double lon2 = patch.maxLon();
int l = static_cast<int>(_ellipsoid.longitudalDistance(lat, lon1, lon2));
bool useKm = l > 9999;
if (useKm) l /= 1000;
l = std::round(l);
if (useKm) l *= 1000;
return l;
}
ChunkHashKey SizeReferenceTileProvider::toHash(const ChunkIndex& chunkIndex) const {
int l = roundedLongitudalLength(chunkIndex);
ChunkHashKey key = static_cast<ChunkHashKey>(l);
return key;
}
Tile SizeReferenceTileProvider::backgroundTile(const ChunkIndex& chunkIndex) const {
if (_backgroundTile.status == Tile::Status::OK) {
Tile tile;

9
modules/globebrowsing/tile/tileprovider/texttileprovider.h
View File

@@ -76,6 +76,9 @@ namespace openspace {
// Returns the tile which will be used to draw text onto.
// Default implementation returns a tile with a plain transparent texture.
virtual Tile backgroundTile(const ChunkIndex& chunkIndex) const;
// Default implementation uses ChunkIndex::hashKey()
virtual ChunkHashKey toHash(const ChunkIndex& chunkIndex) const;
// This method is pure and should be implemented by subclasses
virtual void renderText(const FontRenderer& fontRenderer, const ChunkIndex& chunkIndex) const = 0;
@@ -109,7 +112,13 @@ namespace openspace {
virtual void renderText(const FontRenderer& fontRenderer, const ChunkIndex& chunkIndex) const;
virtual Tile backgroundTile(const ChunkIndex& chunkIndex) const;
virtual ChunkHashKey toHash(const ChunkIndex& chunkIndex) const;
private:
int roundedLongitudalLength(const ChunkIndex& chunkIndex) const;
Ellipsoid _ellipsoid;
Tile _backgroundTile;
};