From 36e97f1f62fcc0facde78fb99bd30f33cb859d11 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Wed, 19 Jul 2017 22:05:12 -0400
Subject: [PATCH] Cleanup of gitignore file Started work on fixing Rosetta

---
 .gitignore                                       | 16 +++++++---------
 .../base/rendering/renderabletrailtrajectory.cpp |  2 +-
 .../newhorizons/shaders/renderableModel_fs.glsl  |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index edc91fda99..a39f0eb829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,17 @@
-*~
-*.swp
 .DS_Store
 .vscode
 /bin/
 /build/
 /cache/
-Thumbs.db
-tmp/
-
-/documentation
 /doc
-/logs
+/documentation
 /ext/SGCT
+/logs
+tmp/
+Thumbs.db
 
+*~
+*.swp
 *.gglsl
 *.GhoulGenerated.glsl
 *.OpenSpaceGenerated.glsl
@@ -31,7 +30,6 @@ install_manifest.txt
 .project
 
 shaders/ABuffer/constants.hglsl
-log.html
 ScriptLog.txt
 
 data/scene/atmosphereearth/textures
@@ -119,4 +117,4 @@ data/spice/nh_kernels
 data/spice/OsirisRexKernels
 data/spice/plu055.bsp
 data/spice/Rosetta
-data/spice/sat375.bsp
\ No newline at end of file
+data/spice/sat375.bsp
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 381fd34a7a..1969e9a58c 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -255,7 +255,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         // If only trail so far should be rendered, we need to find the corresponding time
         // in the array and only render it until then
         _primaryRenderInformation.first = 0;
-        double t = (data.time.j2000Seconds() - _start) / (_end - _start);
+        double t = std::max(0.0, (data.time.j2000Seconds() - _start) / (_end - _start));
         _primaryRenderInformation.count = std::min(
             static_cast<GLsizei>(ceil(_vertexArray.size() * t)),
             static_cast<GLsizei>(_vertexArray.size() - 1)
diff --git a/modules/newhorizons/shaders/renderableModel_fs.glsl b/modules/newhorizons/shaders/renderableModel_fs.glsl
index aee1b79e80..fb0fde667e 100644
--- a/modules/newhorizons/shaders/renderableModel_fs.glsl
+++ b/modules/newhorizons/shaders/renderableModel_fs.glsl
@@ -84,7 +84,7 @@ Fragment getFragment() {
     }
 
     frag.color.a = 1.0;
-    // frag.depth = vs_positionScreenSpace.w;
-    frag.depth = 0.0;
+    frag.depth = vs_positionScreenSpace.w;
+    // frag.depth = 0.0;
     return frag;
 }