mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-11-15 18:12:58 -05:00
parent 67033c4583 41dae755f5
commit 0264a3026c
441 changed files with 13553 additions and 6101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/layershadermanager.cpp
+23 -10
View File
@@ -37,13 +37,15 @@
namespace openspace::globebrowsing {
bool LayerShaderManager::LayerShaderPreprocessingData::LayerGroupPreprocessingData::operator==(
const LayerGroupPreprocessingData& other) const {
bool
LayerShaderManager::LayerShaderPreprocessingData::LayerGroupPreprocessingData::operator==(
const LayerGroupPreprocessingData& other) const
{
return layerType == other.layerType &&
blendMode == other.blendMode &&
layerAdjustmentType == other.layerAdjustmentType &&
lastLayerIdx == other.lastLayerIdx &&
layerBlendingEnabled == other.layerBlendingEnabled;
blendMode == other.blendMode &&
layerAdjustmentType == other.layerAdjustmentType &&
lastLayerIdx == other.lastLayerIdx &&
layerBlendingEnabled == other.layerBlendingEnabled;
}
bool LayerShaderManager::LayerShaderPreprocessingData::operator==(
@@ -92,7 +94,9 @@ LayerShaderManager::LayerShaderPreprocessingData
for (const std::shared_ptr<Layer>& layer : layers) {
layeredTextureInfo.layerType.push_back(layer->type());
layeredTextureInfo.blendMode.push_back(layer->blendMode());
layeredTextureInfo.layerAdjustmentType.push_back(layer->layerAdjustment().type());
layeredTextureInfo.layerAdjustmentType.push_back(
layer->layerAdjustment().type()
);
}
preprocessingData.layeredTextureInfo[i] = layeredTextureInfo;
@@ -175,7 +179,10 @@ void LayerShaderManager::recompileShaderProgram(
for (int j = 0; j < textureTypes[i].lastLayerIdx + 1; ++j) {
std::string key = groupName + std::to_string(j) + "LayerType";
shaderDictionary.setValue(key, static_cast<int>(textureTypes[i].layerType[j]));
shaderDictionary.setValue(
key,
static_cast<int>(textureTypes[i].layerType[j])
);
}
// This is to avoid errors from shader preprocessor
@@ -184,7 +191,10 @@ void LayerShaderManager::recompileShaderProgram(
for (int j = 0; j < textureTypes[i].lastLayerIdx + 1; ++j) {
std::string key = groupName + std::to_string(j) + "BlendMode";
shaderDictionary.setValue(key, static_cast<int>(textureTypes[i].blendMode[j]));
shaderDictionary.setValue(
key,
static_cast<int>(textureTypes[i].blendMode[j])
);
}
// This is to avoid errors from shader preprocessor
@@ -193,7 +203,10 @@ void LayerShaderManager::recompileShaderProgram(
for (int j = 0; j < textureTypes[i].lastLayerIdx + 1; ++j) {
std::string key = groupName + std::to_string(j) + "LayerAdjustmentType";
shaderDictionary.setValue(key, static_cast<int>(textureTypes[i].layerAdjustmentType[j]));
shaderDictionary.setValue(
key,
static_cast<int>(textureTypes[i].layerAdjustmentType[j])
);
}
}