mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/jenkins warnings (#538)

Browse Source 
* Remove warnings from Jenkins
 * Improve Jenkins behavior
This commit is contained in:
Alexander Bock
2018-02-28 08:41:55 -05:00
committed by GitHub
parent 4831f4aa48
commit 9a00f38e09
68 changed files with 281 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,16 +302,16 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
float adjustedTransparency = _transparency;
if (_fadeInThreshold > 0.0) {
float distCamera = glm::length(data.camera.positionVec3());
double distCamera = glm::length(data.camera.positionVec3());
float funcValue = static_cast<float>(
(1.0 / double(_fadeInThreshold/1E24))*(distCamera / 1E24)
);
adjustedTransparency *= funcValue > 1.0 ? 1.0 : funcValue;
adjustedTransparency *= funcValue > 1.f ? 1.f : funcValue;
}
if (_fadeOutThreshold > -1.0) {
float distCamera = glm::distance(
double distCamera = glm::distance(
data.camera.positionVec3(),
data.position.dvec3()
);