mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 09:10:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Coding style cleanup

Browse Source
This commit is contained in:
Alexander Bock
2020-02-14 19:37:06 +01:00
parent 166eee8b28
commit 5e29145395
119 changed files with 643 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rendering/transferfunction.cpp
View File

@@ -45,7 +45,8 @@ namespace {
return (0 == filepath.compare(
filepath.length() - ending.length(),
ending.length(), ending));
} else {
}
else {
return false;
}
}
@@ -95,7 +96,8 @@ void TransferFunction::update() {
if (_needsUpdate) {
if (hasExtension(_filepath, "txt")) {
setTextureFromTxt();
} else {
}
else {
setTextureFromImage();
}
_texture->uploadTexture();
@@ -133,13 +135,16 @@ void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture>
if (key == "width") {
iss >> width;
} else if (key == "lower") {
}
else if (key == "lower") {
iss >> lower;
lower = glm::clamp(lower, 0.f, 1.f);
} else if (key == "upper") {
}
else if (key == "upper") {
iss >> upper;
upper = glm::clamp(upper, lower, 1.f);
} else if (key == "mappingkey") {
}
else if (key == "mappingkey") {
float intensity;
glm::vec4 rgba = glm::vec4(0.f);
iss >> intensity;