mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-11 05:59:57 -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.
186 lines
8.1 KiB
C++
186 lines
8.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/rendering/layershadermanager.h>
|
|
#include <modules/globebrowsing/globes/renderableglobe.h>
|
|
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
|
|
#include <modules/globebrowsing/chunk/chunk.h>
|
|
#include <modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h>
|
|
#include <modules/globebrowsing/rendering/layer/layermanager.h>
|
|
#include <modules/globebrowsing/rendering/layer/layergroup.h>
|
|
|
|
#include <openspace/engine/openspaceengine.h>
|
|
#include <openspace/rendering/renderengine.h>
|
|
|
|
#include <ghoul/opengl/programobject.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
bool LayerShaderManager::LayerShaderPreprocessingData::LayerGroupPreprocessingData::operator==(
|
|
const LayerGroupPreprocessingData& other) const {
|
|
return lastLayerIdx == other.lastLayerIdx &&
|
|
layerBlendingEnabled == other.layerBlendingEnabled;
|
|
}
|
|
|
|
bool LayerShaderManager::LayerShaderPreprocessingData::operator==(
|
|
const LayerShaderPreprocessingData& other) const {
|
|
if (layeredTextureInfo.size() != other.layeredTextureInfo.size() ||
|
|
keyValuePairs.size() != other.keyValuePairs.size()) {
|
|
return false;
|
|
}
|
|
else {
|
|
bool equal = true;
|
|
for (size_t i = 0; i < layeredTextureInfo.size(); i++) {
|
|
equal &= (layeredTextureInfo[i] == other.layeredTextureInfo[i]);
|
|
}
|
|
for (size_t i = 0; i < keyValuePairs.size(); i++) {
|
|
equal &= (keyValuePairs[i] == other.keyValuePairs[i]);
|
|
}
|
|
return equal;
|
|
}
|
|
}
|
|
|
|
LayerShaderManager::LayerShaderPreprocessingData
|
|
LayerShaderManager::LayerShaderPreprocessingData::get(
|
|
const RenderableGlobe& globe)
|
|
{
|
|
LayerShaderManager::LayerShaderPreprocessingData preprocessingData;
|
|
|
|
std::shared_ptr<LayerManager> layerManager = globe.chunkedLodGlobe()->layerManager();
|
|
for (size_t i = 0; i < layergroupid::NUM_LAYER_GROUPS; i++) {
|
|
LayerShaderManager::LayerShaderPreprocessingData::LayerGroupPreprocessingData
|
|
layeredTextureInfo;
|
|
auto layerGroup = layerManager->layerGroup(i);
|
|
layeredTextureInfo.lastLayerIdx = layerGroup.activeLayers().size() - 1;
|
|
layeredTextureInfo.layerBlendingEnabled = layerGroup.layerBlendingEnabled();
|
|
|
|
preprocessingData.layeredTextureInfo[i] = layeredTextureInfo;
|
|
}
|
|
|
|
const auto& generalProps = globe.generalProperties();
|
|
const auto& debugProps = globe.debugProperties();
|
|
auto& pairs = preprocessingData.keyValuePairs;
|
|
|
|
pairs.emplace_back("useAtmosphere", std::to_string(generalProps.atmosphereEnabled));
|
|
pairs.emplace_back("performShading", std::to_string(generalProps.performShading));
|
|
pairs.emplace_back("showChunkEdges", std::to_string(debugProps.showChunkEdges));
|
|
pairs.emplace_back("showHeightResolution",
|
|
std::to_string(debugProps.showHeightResolution));
|
|
pairs.emplace_back("showHeightIntensities",
|
|
std::to_string(debugProps.showHeightIntensities));
|
|
pairs.emplace_back("defaultHeight", std::to_string(Chunk::DEFAULT_HEIGHT));
|
|
|
|
pairs.emplace_back("tilePaddingStart",
|
|
"ivec2(" +
|
|
std::to_string(RawTileDataReader::padding.start.x) + "," +
|
|
std::to_string(RawTileDataReader::padding.start.y) + ")"
|
|
);
|
|
pairs.emplace_back("tilePaddingSizeDiff",
|
|
"ivec2(" +
|
|
std::to_string(RawTileDataReader::padding.numPixels.x) + "," +
|
|
std::to_string(RawTileDataReader::padding.numPixels.y) + ")"
|
|
);
|
|
|
|
return preprocessingData;
|
|
}
|
|
|
|
LayerShaderManager::LayerShaderManager(const std::string& shaderName,
|
|
const std::string& vsPath,
|
|
const std::string& fsPath)
|
|
: _shaderName(shaderName)
|
|
, _vsPath(vsPath)
|
|
, _fsPath(fsPath)
|
|
, _updatedOnLastCall(false)
|
|
{}
|
|
|
|
LayerShaderManager::~LayerShaderManager() {
|
|
if (_programObject) {
|
|
RenderEngine& renderEngine = OsEng.renderEngine();
|
|
renderEngine.removeRenderProgram(_programObject);
|
|
_programObject = nullptr;
|
|
}
|
|
}
|
|
|
|
ghoul::opengl::ProgramObject* LayerShaderManager::programObject() const {
|
|
ghoul_assert(_programObject, "Program does not exist. Needs to be compiled!");
|
|
return _programObject.get();
|
|
}
|
|
|
|
void LayerShaderManager::recompileShaderProgram(
|
|
LayerShaderPreprocessingData preprocessingData)
|
|
{
|
|
_preprocessingData = preprocessingData;
|
|
ghoul::Dictionary shaderDictionary;
|
|
|
|
// Different layer types can be height layers or color layers for example.
|
|
// These are used differently within the shaders.
|
|
auto textureTypes = _preprocessingData.layeredTextureInfo;
|
|
for (size_t i = 0; i < textureTypes.size(); i++) {
|
|
// lastLayerIndex must be at least 0 for the shader to compile,
|
|
// the layer type is inactivated by setting use to false
|
|
std::string groupName = layergroupid::LAYER_GROUP_NAMES[i];
|
|
shaderDictionary.setValue(
|
|
"lastLayerIndex" + groupName,
|
|
glm::max(textureTypes[i].lastLayerIdx, 0)
|
|
);
|
|
shaderDictionary.setValue(
|
|
"use" + groupName,
|
|
textureTypes[i].lastLayerIdx >= 0
|
|
);
|
|
shaderDictionary.setValue(
|
|
"blend" + groupName,
|
|
textureTypes[i].layerBlendingEnabled
|
|
);
|
|
}
|
|
|
|
// Other settings such as "useAtmosphere"
|
|
auto keyValuePairs = _preprocessingData.keyValuePairs;
|
|
for (size_t i = 0; i < keyValuePairs.size(); i++) {
|
|
shaderDictionary.setValue(keyValuePairs[i].first, keyValuePairs[i].second);
|
|
}
|
|
|
|
// Remove old program
|
|
OsEng.renderEngine().removeRenderProgram(_programObject);
|
|
|
|
_programObject = OsEng.renderEngine().buildRenderProgram(
|
|
_shaderName,
|
|
_vsPath,
|
|
_fsPath,
|
|
shaderDictionary
|
|
);
|
|
|
|
ghoul_assert(_programObject != nullptr, "Failed to initialize programObject!");
|
|
using IgnoreError = ghoul::opengl::ProgramObject::ProgramObject::IgnoreError;
|
|
_programObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
|
|
_updatedOnLastCall = true;
|
|
}
|
|
|
|
bool LayerShaderManager::updatedOnLastCall() {
|
|
return _updatedOnLastCall;
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|