mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-09 05:00:42 -06:00
f51f293989
* 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.
93 lines
3.8 KiB
C++
93 lines
3.8 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/rendering/layer/layergroup.h>
|
|
|
|
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
LayerGroup::LayerGroup(std::string name)
|
|
: properties::PropertyOwner(std::move(name))
|
|
, _levelBlendingEnabled("blendTileLevels", "blend tile levels", false)
|
|
{
|
|
addProperty(_levelBlendingEnabled);
|
|
}
|
|
|
|
LayerGroup::LayerGroup(layergroupid::ID id, const ghoul::Dictionary& dict)
|
|
: LayerGroup(layergroupid::LAYER_GROUP_NAMES[id])
|
|
{
|
|
for (size_t i = 0; i < dict.size(); i++) {
|
|
std::string dictKey = std::to_string(i + 1);
|
|
ghoul::Dictionary layerDict = dict.value<ghoul::Dictionary>(dictKey);
|
|
|
|
try {
|
|
_layers.push_back(std::make_shared<Layer>(id, layerDict));
|
|
}
|
|
catch (const ghoul::RuntimeError& e) {
|
|
LERRORC(e.component, e.message);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
for (const auto& layer : _layers) {
|
|
addPropertySubOwner(layer.get());
|
|
}
|
|
}
|
|
|
|
void LayerGroup::update() {
|
|
_activeLayers.clear();
|
|
|
|
for (const auto& layer : _layers) {
|
|
if (layer->enabled()) {
|
|
layer->tileProvider()->update();
|
|
_activeLayers.push_back(layer);
|
|
}
|
|
}
|
|
}
|
|
|
|
const std::vector<std::shared_ptr<Layer>>& LayerGroup::layers() const {
|
|
return _layers;
|
|
}
|
|
|
|
const std::vector<std::shared_ptr<Layer>>& LayerGroup::activeLayers() const {
|
|
return _activeLayers;
|
|
}
|
|
|
|
int LayerGroup::pileSize() const{
|
|
return _levelBlendingEnabled.value() ? 3 : 1;
|
|
}
|
|
|
|
void LayerGroup::onChange(std::function<void(void)> callback) {
|
|
_onChangeCallback = callback;
|
|
_levelBlendingEnabled.onChange(callback);
|
|
for (const std::shared_ptr<Layer>& layer : _layers) {
|
|
layer->onChange(callback);
|
|
}
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|