Merge branch 'develop' into feature/downloadmanager

Conflicts:
	openspace.cfg
	src/engine/openspaceengine.cpp
	support/cmake/support_macros.cmake

include/openspace/abuffer/abuffer.h

@@ -45,7 +45,6 @@ namespace openspace {
 
 class ABuffer {
 public:
-
 	struct fragmentData {
 		GLfloat _position[3];
 		GLfloat _color[4];

include/openspace/engine/openspaceengine.h

@@ -59,7 +59,7 @@ namespace scripting {
 
 class OpenSpaceEngine {
 public:
-    static bool create(int argc, char** argv, std::vector<std::string>& sgctArguments, std::string& openGlVersion);
+    static bool create(int argc, char** argv, std::vector<std::string>& sgctArguments);
     static void destroy();
     static OpenSpaceEngine& ref();
 

include/openspace/rendering/renderengine.h

@@ -51,7 +51,7 @@ public:
 	RenderEngine();
 	~RenderEngine();
 	
-	bool initialize(const std::string& renderingMethod);
+	bool initialize();
 
     void setSceneGraph(Scene* sceneGraph);
     Scene* scene();

include/openspace/scripting/scriptengine.h

@@ -92,7 +92,7 @@ private:
     
     lua_State* _state;
     std::set<LuaLibrary> _registeredLibraries;
-
+    
 	//sync variables
 	std::mutex _mutex;
 	std::vector<std::string> _queuedScripts;

include/openspace/util/spicemanager.h

@@ -630,6 +630,42 @@ public:
 	 */
 	bool getFieldOfView(int instrument, std::string& fovShape, std::string& frameName,
 		glm::dvec3& boresightVector, std::vector<glm::dvec3>& bounds) const;
+	
+	/**
+	This routine computes a set of points on the umbral or penumbral terminator of
+    a specified target body, where SPICE models the target shape as an ellipsoid.
+	\param numberOfPoints - number of points along terminator returned by this method
+	\param terminatorType - is a string indicating the type of terminator to compute: 
+	 umbral or penumbral. The umbral terminator is the boundary of the portion of the 
+	 ellipsoid surface in total shadow. The penumbral terminator is the boundary of 
+	 the portion of the surface that is completely illuminated. Note that in astronomy 
+	 references, the unqualified word "terminator" refers to the umbral terminator. 
+	 Here, the unqualified word refers to either type of terminator.
+    \param lightSource - name of body acting as light source
+	\param observer - name of bodserving body
+	\param target - name of target body
+	\param frame - name of the reference frame relative to which the output terminator 
+	 points are expressed.
+	\param aberrationCorrection - correction for light time and/or stellar aberration 
+	\param ephemerisTime - the epoch of participation of the observer
+	\param targetEpoch -  is the "target epoch.", time it takes for 
+	\param observerPosition - is the vector from the target body at targetEpoch
+	\param terminatorPoints - an array of points on the umbral or penumbral terminator 
+	 of the ellipsoid, as specified by the input argument `numberOfPoints'
+	 For further, more specific details please refer to
+	 http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/edterm_c.html
+	*/
+	bool getTerminatorEllipse(const int numberOfPoints, 
+		                      const std::string terminatorType,
+		                      const std::string lightSource,
+		                      const std::string observer,
+		                      const std::string target,
+		                      const std::string frame,
+		                      const std::string aberrationCorrection,
+		                      double ephemerisTime,
+		                      double& targetEpoch,
+							  glm::dvec3& observerPosition,
+							  std::vector<psc>& terminatorPoints);
 
 	/**
 	* This function adds a frame to a body