Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex

data/scene/osirisrex/bennu/bennu.mod

@@ -37,7 +37,7 @@ return {
             },
             Textures = {
                 Type = "simple",
-                Color =  "textures/white.png",
+                Color =  "textures/gray.png",
                 Project = "textures/defaultProj.png",
                 Default = "textures/defaultProj.png"
             },

modules/newhorizons/shaders/renderableModelProjection_fs.glsl

@@ -58,8 +58,8 @@ void main() {
 
     if ((inRange(projected.x, 0, 1) && inRange(projected.y, 0, 1)) && (dot(n, boresight) < 0)) {
         color = texture(projectionTexture, projected.xy);
-        color.a = 1.0;
-        stencil = vec4(1.0);
+        //color.a = 1.0;
+        stencil =  vec4(1.0);
     }
     else {
       color = vec4(0.0);//vec4(vec3(0.0), 1.0);

modules/newhorizons/shaders/renderableModel_fs.glsl

@@ -47,7 +47,7 @@ Fragment getFragment() {
         textureColor.rgb = mix(
             textureColor.rgb,
             projectionColor.rgb,
-            _projectionFading
+            _projectionFading * projectionColor.a
         );
     }