mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-25 21:48:41 -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.
115 lines
5.0 KiB
C++
115 lines
5.0 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/geometry/geodetic2.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/presentationslideprovider.h>
|
|
#include <modules/globebrowsing/tile/tileindex.h>
|
|
|
|
#include <ghoul/io/texture/texturereader.h>
|
|
#include <ghoul/filesystem/filesystem.h>
|
|
#include <ghoul/logging/logmanager.h>
|
|
|
|
#include <openspace/engine/openspaceengine.h>
|
|
|
|
namespace {
|
|
const std::string _loggerCat = "PresentationSlideProvider";
|
|
|
|
const std::string KeyDefaultProvider = "DefaultProvider";
|
|
const std::string KeySlideProviders = "SlideProviders";
|
|
const std::string KeyTileIndex = "TileIndex";
|
|
const std::string KeyTileProvider = "TileProvider";
|
|
}
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
namespace tileprovider {
|
|
|
|
PresentationSlideProvider::PresentationSlideProvider(const ghoul::Dictionary& dictionary)
|
|
: _slideIndex("slideIndex", "slideIndex", 0, 0, 0)
|
|
{
|
|
setName("SlideProvider");
|
|
ghoul::Dictionary defaultProviderDict = dictionary.value<ghoul::Dictionary>(KeyDefaultProvider);
|
|
_defaultProvider = TileProvider::createFromDictionary(defaultProviderDict);
|
|
|
|
ghoul::Dictionary tileIndexDict = dictionary.value<ghoul::Dictionary>(KeyTileIndex);
|
|
_tileIndex = TileIndex(tileIndexDict);
|
|
|
|
ghoul::Dictionary slideProvidersDict = dictionary.value<ghoul::Dictionary>(KeySlideProviders);
|
|
_slideProviders.resize(slideProvidersDict.size());
|
|
for (size_t i = 0; i < slideProvidersDict.size(); i++) {
|
|
std::string dictKey = std::to_string(i + 1);
|
|
ghoul::Dictionary providerDict = slideProvidersDict.value<ghoul::Dictionary>(dictKey);
|
|
_slideProviders[i] = TileProvider::createFromDictionary(providerDict);
|
|
}
|
|
|
|
_slideIndex.setMaxValue(_slideProviders.size() - 1);
|
|
addProperty(_slideIndex);
|
|
}
|
|
|
|
Tile PresentationSlideProvider::getTile(const TileIndex& tileIndex) {
|
|
if(tileIndex == _tileIndex){
|
|
return slideProvider()->getTile(tileIndex);
|
|
}
|
|
return Tile::TileUnavailable;
|
|
|
|
}
|
|
|
|
Tile::Status PresentationSlideProvider::getTileStatus(const TileIndex& tileIndex) {
|
|
if(tileIndex == _tileIndex){
|
|
return slideProvider()->getTileStatus(tileIndex);
|
|
}
|
|
return Tile::Status::Unavailable;
|
|
}
|
|
|
|
TileDepthTransform PresentationSlideProvider::depthTransform() {
|
|
return slideProvider()->depthTransform();
|
|
}
|
|
|
|
void PresentationSlideProvider::update() {
|
|
slideProvider()->update();
|
|
_defaultProvider->update();
|
|
}
|
|
|
|
void PresentationSlideProvider::reset() {
|
|
for(auto& tp : _slideProviders){
|
|
tp->reset();
|
|
}
|
|
_defaultProvider->reset();
|
|
}
|
|
|
|
int PresentationSlideProvider::maxLevel() {
|
|
return _defaultProvider->maxLevel();
|
|
}
|
|
|
|
TileProvider* PresentationSlideProvider::slideProvider() {
|
|
int maxIndex = static_cast<int>(_slideProviders.size()) - 1;
|
|
int clampedIndex = std::max(0, std::min(_slideIndex.value(), maxIndex));
|
|
_slideIndex.setValue(clampedIndex);
|
|
return _slideProviders[clampedIndex].get();
|
|
}
|
|
|
|
} // namespace tileprovider
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|