From 64be557abfec659a2cb4db84c7b515b5c3ad6ec5 Mon Sep 17 00:00:00 2001
From: Kalle Bladin <kallebladin@gmail.com>
Date: Tue, 30 Aug 2016 14:17:00 -0400
Subject: [PATCH] Use alpha from projection texture in
 RenderableModelProjection.

---
 data/scene/osirisrex/bennu/bennu.mod                          | 2 +-
 modules/newhorizons/shaders/renderableModelProjection_fs.glsl | 4 ++--
 modules/newhorizons/shaders/renderableModel_fs.glsl           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/scene/osirisrex/bennu/bennu.mod b/data/scene/osirisrex/bennu/bennu.mod
index d940c9415a..cddbc59bc4 100644
--- a/data/scene/osirisrex/bennu/bennu.mod
+++ b/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"
             },
diff --git a/modules/newhorizons/shaders/renderableModelProjection_fs.glsl b/modules/newhorizons/shaders/renderableModelProjection_fs.glsl
index fdedd40957..881e20e4b7 100644
--- a/modules/newhorizons/shaders/renderableModelProjection_fs.glsl
+++ b/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);
diff --git a/modules/newhorizons/shaders/renderableModel_fs.glsl b/modules/newhorizons/shaders/renderableModel_fs.glsl
index 240aba6ea4..5f3b5f285a 100644
--- a/modules/newhorizons/shaders/renderableModel_fs.glsl
+++ b/modules/newhorizons/shaders/renderableModel_fs.glsl
@@ -47,7 +47,7 @@ Fragment getFragment() {
         textureColor.rgb = mix(
             textureColor.rgb,
             projectionColor.rgb,
-            _projectionFading
+            _projectionFading * projectionColor.a
         );
     }