From 1d5b051b65870a18a85f2f29d247cd039930eea6 Mon Sep 17 00:00:00 2001
From: Michal Marcinkowski <michal.j.marcinkowski@gmail.com>
Date: Fri, 23 Jan 2015 17:54:32 -0500
Subject: [PATCH] Targeting fixes for pluto viz etc.

---
 openspace-data                  | 2 +-
 scripts/default_startup.lua     | 2 +-
 src/rendering/renderablefov.cpp | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/openspace-data b/openspace-data
index 789072edac..a100e1b5bb 160000
--- a/openspace-data
+++ b/openspace-data
@@ -1 +1 @@
-Subproject commit 789072edac04fe14a9614e1859b68c0ad10aced3
+Subproject commit a100e1b5bbc009f4a2c92f39300a496fadabafe7
diff --git a/scripts/default_startup.lua b/scripts/default_startup.lua
index 4f044867a2..65cfe3c0e1 100644
--- a/scripts/default_startup.lua
+++ b/scripts/default_startup.lua
@@ -1,5 +1,5 @@
 --openspace.setPropertyValue('Earth.renderable.colorTexture', '${OPENSPACE_DATA}/modules/mars/textures/mars.png')
-openspace.time.setTime("2015-07-14T09:19:00.557") -- pluto
+openspace.time.setTime("2015-07-14T09:13:00.557") -- pluto
 
 --openspace.time.setDeltaTime(200000.0)
 --openspace.time.setDeltaTime(5000.00)
diff --git a/src/rendering/renderablefov.cpp b/src/rendering/renderablefov.cpp
index 35da69d54e..9977d1c494 100644
--- a/src/rendering/renderablefov.cpp
+++ b/src/rendering/renderablefov.cpp
@@ -359,6 +359,8 @@ void RenderableFov::computeColors(){
 	double t = 0.0;
 	if (diff <= 7.0) t = 1.f - diff / 7.0;
 
+	if (diff < 0) t = 0.0;
+
 	c_project = glm::vec4(0.0, 1.0, 0.00,1);
 	col_end   = glm::vec4(1.00, 0.29, 0.00, 1);
 	blue      = glm::vec4(0, 0.5, 0.7, 1);
@@ -412,9 +414,11 @@ void RenderableFov::render(const RenderData& data){
 
 		// set target based on visibility to specific instrument,
 		// from here on the _fovTarget is the target for all spice functions.
-		std::string potential[5] = { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" };
+		//std::string potential[5] = { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" };
+		std::string potential[2] = { "Pluto", "Charon" };
+
 		_fovTarget = potential[0]; //default
-		for (int i = 0; i < 5; i++){
+		for (int i = 0; i < 2; i++){
 			_withinFOV = openspace::SpiceManager::ref().targetWithinFieldOfView(_instrumentID, potential[i], 
 																				_spacecraft, _method,
 																				_aberrationCorrection, _time);