mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-20 03:00:03 -06:00
* Simplest possible PBO implementation. * Add PBO class * TileLoadJob owns raw tile data * Working on a soluton to cache textures and reuse them * PBO and cached textures working for one texture type. Color textures. * Threadpool for tile requests uses LRU cache as queue * Remove framesUntilRequestFlush * Clean up * Clean up * Use prioritizing concurrent job manager * Use TileTextureInitData to initialize RawTileDataReader. * Class TextureContainer owns the textures to use for tiles. * Using TileTextureInitData to determine if new caches need to be created. * Remove WriteDataDescription * Remove TileDataLayout * Rendering many different layer types again * TileProviderByLevel gives layergroup id to tile providers * Comment away use of PBO * Erase unfinished requests to make room for new ones * Enable choice of PBO or not. * Enable resetting of asynctiledataprovider * Add the ability to use PBO and also load to CPU * Update ghoul * Solve culling issue. * Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider. * Add gpudata * Move fetching of shader preprocessing data to LayerManager * No comparisons to determine shader recompilation. * Show the tile cache size in the GUI * Clean up and comment. * Solve bug where float is interpreted as NaN * Enable ability to blend between layers again * Fix single image provider * Fix windows build error * Fix OSX compile issue. * Some clean up * Showing correct texture data size * Enable use of text tile providers again. No backgroupd image path however. * Change cache size from GUI * Clean up * Solve osx compilation error. * Update ghoul * Make it possible to switch between PBO and not during runtime. * Enable resetting of tile datasets * change function module in moduleengine to identify module by name * MemoryAwareTileCache is no longer a singleton * Update ownership of properties for globe browsing * Logging info about resetting tile reader. * Logging info * Fix requested changes * Fix some compile warnings. * Fix compilation warnings * Add ability to blend values with blend parameter. Also define settings through lua dict. * Fix some comments on pull request. * Change formatting * Change formatting * Change formatting * Fix pull request comments. * Those are details * Make Mercury great again. * Make Earth great again. * Solve conflict * Test to sometimes use valueblending and sometimes not * Not always use value blending * Update ghoul * Change from auto to explicit type. * Update test for LRU Cache * Include algorithm.
159 lines
5.5 KiB
C++
159 lines
5.5 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#include <modules/globebrowsing/tile/tileindex.h>
|
|
|
|
#include <modules/globebrowsing/geometry/geodetic2.h>
|
|
|
|
#include <ghoul/misc/dictionary.h>
|
|
|
|
#include <sstream>
|
|
|
|
namespace {
|
|
const char* KeyLevel = "Level";
|
|
const char* KeyX = "X";
|
|
const char* KeyY = "Y";
|
|
}
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
TileIndex::TileIndex(int x, int y, int level)
|
|
: x(x), y(y), level(level)
|
|
{}
|
|
|
|
TileIndex::TileIndex(const TileIndex& other)
|
|
: x(other.x), y(other.y), level(other.level)
|
|
{}
|
|
|
|
TileIndex::TileIndex(const Geodetic2& point, int level)
|
|
: level(level)
|
|
{
|
|
int numIndicesAtLevel = 1 << level;
|
|
double u = 0.5 + point.lon / (2 * glm::pi<double>());
|
|
double v = 0.25 - point.lat / (2 * glm::pi<double>());
|
|
double xIndexSpace = u * numIndicesAtLevel;
|
|
double yIndexSpace = v * numIndicesAtLevel;
|
|
|
|
x = floor(xIndexSpace);
|
|
y = floor(yIndexSpace);
|
|
}
|
|
|
|
TileIndex::TileIndex(const ghoul::Dictionary& dict) {
|
|
level = static_cast<int>(dict.value<double>(KeyLevel));
|
|
x = static_cast<int>(dict.value<double>(KeyX));
|
|
y = static_cast<int>(dict.value<double>(KeyY));
|
|
}
|
|
|
|
TileIndex TileIndex::child(Quad q) const {
|
|
return TileIndex(2 * x + q % 2, 2 * y + q / 2, level + 1);
|
|
}
|
|
|
|
TileIndex TileIndex::parent() const {
|
|
//ghoul_assert(level > 0, "tile at level 0 has no parent!");
|
|
return TileIndex(x / 2, y / 2, level - 1);
|
|
}
|
|
|
|
TileIndex& TileIndex::operator--() {
|
|
x /= 2;
|
|
y /= 2;
|
|
level--;
|
|
return *this;
|
|
}
|
|
|
|
TileIndex TileIndex::operator--(int) {
|
|
TileIndex tmp(*this);
|
|
--(*this);
|
|
return tmp;
|
|
}
|
|
|
|
TileIndex& TileIndex::operator-=(unsigned int levels) {
|
|
x <<= levels;
|
|
y <<= levels;
|
|
level -= levels;
|
|
return *this;
|
|
}
|
|
|
|
glm::vec2 TileIndex::positionRelativeParent() const {
|
|
// In OpenGL, positive y direction is up
|
|
return glm::vec2(isEastChild() ? 0.5 : 0, isNorthChild() ? 0.5 : 0);
|
|
}
|
|
|
|
TileIndex TileIndex::getRelatedTile(int deltaX, int deltaY) const {
|
|
int indicesAtThisLevel = 1 << level;
|
|
int newX = (indicesAtThisLevel + x + deltaX) % indicesAtThisLevel;
|
|
int newY = (indicesAtThisLevel + y + deltaY) % indicesAtThisLevel;
|
|
return TileIndex(newX, newY, level);
|
|
}
|
|
|
|
int TileIndex::manhattan(const TileIndex& other) const {
|
|
ghoul_assert(level == other.level, "makes no sense if not on same level");
|
|
return std::abs(x - other.x) + std::abs(y - other.y);
|
|
}
|
|
|
|
/**
|
|
Creates a hash which can be used as key in hash maps.
|
|
|
|
+-------+------------+-------+------------+
|
|
| USAGE | BIT RANGE | #BITS | MAX VALUE |
|
|
+-------+------------+-------+------------+
|
|
| level | 0 - 5 | 5 | 31 |
|
|
| x | 5 - 35 | 30 | 1073741824 |
|
|
| y | 35 - 64 | 29 | 536870912 |
|
|
+-------+------------+-------+------------+
|
|
|
|
*/
|
|
TileIndex::TileHashKey TileIndex::hashKey() const {
|
|
TileHashKey key = 0LL;
|
|
key |= level;
|
|
key |= x << 5;
|
|
key |= static_cast<TileHashKey>(y) << 35;
|
|
return key;
|
|
}
|
|
|
|
std::string TileIndex::toString() const {
|
|
std::stringstream ss;
|
|
for (int i = level; i > 0; i--) {
|
|
char digit = '0';
|
|
int mask = 1 << (i - 1);
|
|
if ((x & mask) != 0) {
|
|
digit++;
|
|
}
|
|
if ((y & mask) != 0) {
|
|
digit++;
|
|
digit++;
|
|
}
|
|
ss << digit;
|
|
}
|
|
return ss.str();
|
|
}
|
|
|
|
std::ostream& operator<<(std::ostream& os, const TileIndex& ci) {
|
|
os << "{ x = " << ci.x << ", y = " << ci.y << ", level = " << ci.level << " }";
|
|
return os;
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|