mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-30 07:58:42 -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.
127 lines
5.5 KiB
C++
127 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/tileselector.h>
|
|
|
|
#include <modules/globebrowsing/rendering/layer/layergroup.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
|
|
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
namespace tileselector {
|
|
|
|
ChunkTile getHighestResolutionTile(const LayerGroup& layerGroup,
|
|
const TileIndex& tileIndex) {
|
|
TileUvTransform uvTransform;
|
|
uvTransform.uvScale.x = 0;
|
|
ChunkTile mostHighResolution{
|
|
Tile::TileUnavailable, uvTransform, TileDepthTransform()
|
|
};
|
|
mostHighResolution.tile = Tile::TileUnavailable;
|
|
|
|
|
|
for (const std::shared_ptr<Layer>& layer : layerGroup.activeLayers()) {
|
|
ChunkTile chunkTile = layer->tileProvider()->getChunkTile(tileIndex);
|
|
bool tileIsOk = chunkTile.tile.status() == Tile::Status::OK;
|
|
bool tileHasMetaData = chunkTile.tile.metaData() != nullptr;
|
|
bool tileIsHigherResolution =
|
|
chunkTile.uvTransform.uvScale.x > mostHighResolution.uvTransform.uvScale.x;
|
|
if (tileIsOk && tileHasMetaData && tileIsHigherResolution) {
|
|
mostHighResolution = chunkTile;
|
|
}
|
|
}
|
|
|
|
return mostHighResolution;
|
|
}
|
|
|
|
std::vector<ChunkTile> getTilesSortedByHighestResolution(const LayerGroup& layerGroup,
|
|
const TileIndex& tileIndex)
|
|
{
|
|
std::vector<ChunkTile> tiles;
|
|
for (const std::shared_ptr<Layer>& layer : layerGroup.activeLayers()) {
|
|
tiles.push_back(layer->tileProvider()->getChunkTile(tileIndex));
|
|
}
|
|
|
|
std::sort(
|
|
tiles.begin(),
|
|
tiles.end(),
|
|
[](const ChunkTile& lhs, const ChunkTile& rhs) {
|
|
return lhs.uvTransform.uvScale.x > rhs.uvTransform.uvScale.x;
|
|
}
|
|
);
|
|
|
|
return tiles;
|
|
}
|
|
|
|
|
|
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
|
|
getTilesAndSettingsSortedByHighestResolution(const LayerGroup& layerGroup,
|
|
const TileIndex& tileIndex)
|
|
{
|
|
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> > tilesAndSettings;
|
|
for (const std::shared_ptr<Layer>& layer : layerGroup.activeLayers()) {
|
|
tilesAndSettings.push_back({
|
|
layer->tileProvider()->getChunkTile(tileIndex), &layer->renderSettings()
|
|
});
|
|
}
|
|
std::sort(
|
|
tilesAndSettings.begin(),
|
|
tilesAndSettings.end(),
|
|
[](const std::pair<ChunkTile, const LayerRenderSettings*> & lhs,
|
|
const std::pair<ChunkTile, const LayerRenderSettings*> & rhs)
|
|
{
|
|
return lhs.first.uvTransform.uvScale.x > rhs.first.uvTransform.uvScale.x;
|
|
}
|
|
);
|
|
return tilesAndSettings;
|
|
}
|
|
|
|
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
|
|
getTilesAndSettingsUnsorted(const LayerGroup& layerGroup,
|
|
const TileIndex& tileIndex)
|
|
{
|
|
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> > tilesAndSettings;
|
|
for (const std::shared_ptr<Layer>& layer : layerGroup.activeLayers()) {
|
|
tilesAndSettings.push_back({
|
|
layer->tileProvider()->getChunkTile(tileIndex), &layer->renderSettings()
|
|
});
|
|
}
|
|
std::reverse(tilesAndSettings.begin(), tilesAndSettings.end());
|
|
return tilesAndSettings;
|
|
}
|
|
|
|
void ascendToParent(TileIndex& tileIndex, TileUvTransform& uv) {
|
|
uv.uvOffset *= 0.5;
|
|
uv.uvScale *= 0.5;
|
|
|
|
uv.uvOffset += tileIndex.positionRelativeParent();
|
|
|
|
--tileIndex;
|
|
}
|
|
|
|
} // namespace tileselector¢
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|