mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-10 05:32:18 -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.
82 lines
3.9 KiB
C++
82 lines
3.9 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/gpu/gpulayergroup.h>
|
|
|
|
#include <modules/globebrowsing/rendering/layer/layergroup.h>
|
|
#include <modules/globebrowsing/rendering/layer/layermanager.h>
|
|
#include <modules/globebrowsing/rendering/gpu/gpuheightlayer.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
void GPULayerGroup::setValue(ghoul::opengl::ProgramObject* programObject,
|
|
const LayerGroup& layerGroup, const TileIndex& tileIndex)
|
|
{
|
|
auto& activeLayers = layerGroup.activeLayers();
|
|
ghoul_assert(
|
|
activeLayers.size() == _gpuActiveLayers.size(),
|
|
"GPU and CPU active layers must have same size!"
|
|
);
|
|
for (unsigned int i = 0; i < activeLayers.size(); ++i) {
|
|
_gpuActiveLayers[i]->setValue(
|
|
programObject,
|
|
*activeLayers[i],
|
|
tileIndex,
|
|
layerGroup.pileSize()
|
|
);
|
|
}
|
|
}
|
|
|
|
void GPULayerGroup::bind(ghoul::opengl::ProgramObject* programObject,
|
|
const LayerGroup& layerGroup, const std::string& nameBase,
|
|
int category)
|
|
{
|
|
auto activeLayers = layerGroup.activeLayers();
|
|
_gpuActiveLayers.resize(activeLayers.size());
|
|
int pileSize = layerGroup.pileSize();
|
|
for (size_t i = 0; i < _gpuActiveLayers.size(); ++i) {
|
|
// should maybe a proper GPULayer factory
|
|
_gpuActiveLayers[i] = (category == layergroupid::HeightLayers) ?
|
|
std::make_unique<GPUHeightLayer>() :
|
|
std::make_unique<GPULayer>();
|
|
std::string nameExtension = "[" + std::to_string(i) + "].";
|
|
_gpuActiveLayers[i]->bind(
|
|
programObject,
|
|
*activeLayers[i],
|
|
nameBase + nameExtension,
|
|
pileSize
|
|
);
|
|
}
|
|
}
|
|
|
|
void GPULayerGroup::deactivate() {
|
|
for (std::unique_ptr<GPULayer>& l : _gpuActiveLayers) {
|
|
l->deactivate();
|
|
}
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|