Mixed cleanup

This commit is contained in:
Emma Broman
2020-07-08 15:28:54 +02:00
parent 8d45d25ed4
commit cb19f730df
34 changed files with 46 additions and 142 deletions
@@ -688,8 +688,10 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
float distToCamera,
float fadeInVariable
) {
glm::vec4 textColor = glm::vec4(glm::vec3(_labelsColor), _labelsOpacity);
textColor.a *= fadeInVariable;
glm::vec4 textColor = glm::vec4(
glm::vec3(_labelsColor),
_labelsOpacity * fadeInVariable
);
glm::dvec4 cameraUpVecWorld = glm::dvec4(data.camera.lookUpVectorWorldSpace(), 0.0);