mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -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

3
modules/base/rendering/renderableplaneimagelocal.cpp
View File

@@ -102,7 +102,8 @@ RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& di
);
if (renderType == "Background") {
setRenderBin(Renderable::RenderBin::Background);
} else if (renderType == "Opaque") {
}
else if (renderType == "Opaque") {
setRenderBin(Renderable::RenderBin::Opaque);
}
else if (renderType == "Transparent") {

6
modules/base/rendering/renderablesphere.cpp
View File

@@ -424,7 +424,8 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
if (orientation == Orientation::Inside) {
glCullFace(GL_FRONT);
} else if (orientation == Orientation::Both) {
}
else if (orientation == Orientation::Both) {
glDisable(GL_CULL_FACE);
}
@@ -455,7 +456,8 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
if (orientation == Orientation::Inside) {
glCullFace(GL_BACK);
} else if (orientation == Orientation::Both) {
}
else if (orientation == Orientation::Both) {
glEnable(GL_CULL_FACE);
}
}

6
modules/base/rotation/staticrotation.cpp
View File

@@ -109,13 +109,15 @@ StaticRotation::StaticRotation(const ghoul::Dictionary& dictionary) : StaticRota
dictionary.value<glm::dvec3>(RotationInfo.identifier)
);
_matrixIsDirty = true;
} else if (dictionary.hasKeyAndValue<glm::dvec4>(RotationInfo.identifier)) {
}
else if (dictionary.hasKeyAndValue<glm::dvec4>(RotationInfo.identifier)) {
glm::dvec4 data = dictionary.value<glm::dvec4>(RotationInfo.identifier);
_eulerRotation = rotationMatrixToEulerAngles(
glm::mat3_cast(glm::dquat(data.w, data.x, data.y, data.z))
);
_matrixIsDirty = true;
} else if (dictionary.hasKeyAndValue<glm::dmat3>(RotationInfo.identifier)) {
}
else if (dictionary.hasKeyAndValue<glm::dmat3>(RotationInfo.identifier)) {
_eulerRotation = rotationMatrixToEulerAngles(
dictionary.value<glm::dmat3>(RotationInfo.identifier)
);

3
modules/base/shaders/renderabletrail_fs.glsl
View File

@@ -67,7 +67,8 @@ Fragment getFragment() {
if (distanceCenter > dLW) {
frag.color.a = 0.0;
} else {
}
else {
frag.color.a *= pow(float((dLW - distanceCenter) / dLW), blendFactor);
}

3
modules/base/timeframe/timeframeinterval.cpp
View File

@@ -133,7 +133,8 @@ TimeFrameInterval::TimeFrameInterval(const ghoul::Dictionary& dictionary)
dictionary.value<std::string>(StartInfo.identifier)
);
_hasStart = true;
} else if (dictionary.hasValue<double>(StartInfo.identifier)) {
}
else if (dictionary.hasValue<double>(StartInfo.identifier)) {
_start = dictionary.value<double>(StartInfo.identifier);
_hasStart = true;
}