Updated Spice version

More changes to make the application run

ext/spice/include/SpiceZpl.h

@@ -111,7 +111,7 @@
 #define HAVE_PLATFORM_MACROS_H
  
  
-   #define   CSPICE_PC_MS
+   #define   CSPICE_MAC_OSX_INTEL_64BIT_GCC
  
 #endif
  

include/openspace/util/spicemanager.h

@@ -85,7 +85,7 @@ public:
 	* \param filePath The path to the kernel that should be examined
 	* \return true if the operation was successful
 	*/
-	bool findCkCoverage(std::string& path);
+	bool findCkCoverage(const std::string& path);
 
 	/**
 	* Function to find and store the intervals covered by a spk file, this is done
@@ -95,7 +95,7 @@ public:
 	* \param filePath The path to the kernel that should be examined
 	* \return true if the operation was successful
 	*/
-	bool findSpkCoverage(std::string& path);
+	bool findSpkCoverage(const std::string& path);
 	
 	/**
 	 * \return true if SPK kernels have been loaded to cover <code>target</code>

shaders/ABuffer/abufferSort.hglsl

@@ -57,6 +57,9 @@ int build_local_fragments_list() {
 	return int(frag_count);
 #endif
 
+#if ABUFFER_IMPLEMENTATION == ABUFFER_FRAMEBUFFER
+	return 0;
+#endif
 }
 
 float pscLength(vec4 v1, vec4 v2) {

shaders/gui_fs.glsl

@@ -26,9 +26,11 @@
 
 uniform sampler2D tex;
 
-layout(location = 1) in vec2 in_uv;
-layout(location = 2) in vec4 in_color;
+layout(location = 1) in vec2 out_uv;
+layout(location = 2) in vec4 out_color;
+
 layout(location = 0) out vec4 FragColor;
+
 void main() {
-   FragColor = in_color * texture(tex, in_uv.st);
+   FragColor = out_color * texture(tex, out_uv.st);
 }

src/util/spicemanager.cpp

@@ -31,7 +31,7 @@
 
 #include <algorithm>
 
-#define  MAXOBJ 1000
+#define  MAXOBJ 64
 #define  WINSIZ 10000
 
 namespace {
@@ -147,7 +147,7 @@ SpiceManager::KernelIdentifier SpiceManager::loadKernel(const std::string& fileP
 	}
 }
 
-bool SpiceManager::findCkCoverage(std::string& path) {
+bool SpiceManager::findCkCoverage(const std::string& path) {
 	SpiceInt frame, numberOfIntervals;
 	SpiceDouble b, e;
 	std::pair <double, double> tempInterval;
@@ -178,7 +178,7 @@ bool SpiceManager::findCkCoverage(std::string& path) {
 	return true;
 }
 
-bool SpiceManager::findSpkCoverage(std::string& path) {
+bool SpiceManager::findSpkCoverage(const std::string& path) {
 	SpiceInt obj, numberOfIntervals;
 	SpiceDouble b, e;
 	std::pair <double, double> tempInterval;
@@ -186,7 +186,6 @@ bool SpiceManager::findSpkCoverage(std::string& path) {
 	SPICEDOUBLE_CELL(cover, WINSIZ);
 	
 	spkobj_c(path.c_str(), &ids);
-
 	for (SpiceInt i = 0; i < card_c(&ids); ++i) {
 		obj = SPICE_CELL_ELEM_I(&ids, i);