mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-25 13:38:34 -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.
151 lines
6.1 KiB
C++
151 lines
6.1 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/tileprovider/tileproviderbylevel.h>
|
|
#include <modules/globebrowsing/rendering/layer/layergroupid.h>
|
|
|
|
#include <ghoul/misc/dictionary.h>
|
|
#include <ghoul/logging/logmanager.h>
|
|
|
|
namespace {
|
|
const char* KeyProviders = "LevelTileProviders";
|
|
const char* KeyMaxLevel = "MaxLevel";
|
|
const char* KeyTileProvider = "TileProvider";
|
|
const char* KeyLayerGroupID = "LayerGroupID";
|
|
}
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
namespace tileprovider {
|
|
|
|
TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
|
|
std::string name = "Name unspecified";
|
|
dictionary.getValue("Name", name);
|
|
|
|
layergroupid::ID layerGroupID;
|
|
dictionary.getValue(KeyLayerGroupID, layerGroupID);
|
|
const char* _loggerCat = ("TileProviderByLevel" + name).c_str();
|
|
|
|
ghoul::Dictionary providers = dictionary.value<ghoul::Dictionary>(KeyProviders);
|
|
|
|
for (size_t i = 0; i < providers.size(); i++) {
|
|
try {
|
|
std::string dictKey = std::to_string(i + 1);
|
|
ghoul::Dictionary levelProviderDict = providers.value<ghoul::Dictionary>(
|
|
dictKey
|
|
);
|
|
double floatMaxLevel;
|
|
int maxLevel = 0;
|
|
if (!levelProviderDict.getValue<double>(KeyMaxLevel, floatMaxLevel)) {
|
|
throw std::runtime_error(
|
|
"Must define key '" + std::string(KeyMaxLevel) + "'"
|
|
);
|
|
}
|
|
maxLevel = std::round(floatMaxLevel);
|
|
|
|
ghoul::Dictionary providerDict;
|
|
if (!levelProviderDict.getValue<ghoul::Dictionary>(KeyTileProvider, providerDict)) {
|
|
throw std::runtime_error(
|
|
"Must define key '" + std::string(KeyTileProvider) + "'"
|
|
);
|
|
}
|
|
providerDict.setValue(KeyLayerGroupID, layerGroupID);
|
|
|
|
_levelTileProviders.push_back(
|
|
std::shared_ptr<TileProvider>(TileProvider::createFromDictionary(providerDict))
|
|
);
|
|
|
|
// Ensure we can represent the max level
|
|
if(static_cast<int>(_providerIndices.size()) < maxLevel){
|
|
_providerIndices.resize(maxLevel+1, -1);
|
|
}
|
|
|
|
// map this level to the tile provider index
|
|
_providerIndices[maxLevel] = _levelTileProviders.size() - 1;
|
|
}
|
|
catch (const ghoul::RuntimeError& e) {
|
|
LWARNING("Unable to create tile provider: " + std::string(e.what()));
|
|
}
|
|
}
|
|
|
|
// If all failed
|
|
if (_levelTileProviders.size() == 0) {
|
|
throw ghoul::RuntimeError("Failed to create tile provider: " + name);
|
|
}
|
|
|
|
// Fill in the gaps (value -1) in provider indices, from back to end
|
|
for(int i = _providerIndices.size() - 2; i >= 0; --i){
|
|
if(_providerIndices[i] == -1){
|
|
_providerIndices[i] = _providerIndices[i+1];
|
|
}
|
|
}
|
|
}
|
|
|
|
Tile TileProviderByLevel::getTile(const TileIndex& tileIndex) {
|
|
return levelProvider(tileIndex.level)->getTile(tileIndex);
|
|
}
|
|
|
|
Tile::Status TileProviderByLevel::getTileStatus(const TileIndex& index) {
|
|
return levelProvider(index.level)->getTileStatus(index);
|
|
}
|
|
|
|
TileDepthTransform TileProviderByLevel::depthTransform() {
|
|
TileDepthTransform transform;
|
|
transform.depthOffset = 0.0f;
|
|
transform.depthScale = 1.0f;
|
|
return transform;
|
|
}
|
|
|
|
void TileProviderByLevel::update() {
|
|
for(auto provider : _levelTileProviders){
|
|
provider->update();
|
|
}
|
|
}
|
|
|
|
void TileProviderByLevel::reset() {
|
|
for(auto provider : _levelTileProviders){
|
|
provider->reset();
|
|
}
|
|
}
|
|
|
|
int TileProviderByLevel::maxLevel() {
|
|
return _providerIndices.size()-1;
|
|
}
|
|
|
|
int TileProviderByLevel::providerIndex(int level) const {
|
|
int clampedLevel = std::max(
|
|
0,
|
|
std::min(level, static_cast<int>(_providerIndices.size()-1))
|
|
);
|
|
return _providerIndices[clampedLevel];
|
|
}
|
|
|
|
TileProvider* TileProviderByLevel::levelProvider(int level) const {
|
|
return _levelTileProviders[providerIndex(level)].get();
|
|
}
|
|
|
|
} // namespace tileprovider
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|