From dadfc46218469347527e69979738e72a2ccf04e7 Mon Sep 17 00:00:00 2001
From: Hans-Christian Helltegen <hanhe945@student.liu.se>
Date: Thu, 20 Feb 2014 18:21:48 +0000
Subject: [PATCH] Added openspace-data as submodule. Added OPENSPACE-DATA path
 variable

---
 .gitmodules             | 5 ++++-
 openspace-data          | 1 +
 src/openspaceengine.cpp | 1 +
 src/util/spice.cpp      | 4 ++--
 src/util/time.cpp       | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 160000 openspace-data

diff --git a/.gitmodules b/.gitmodules
index 7b58bf7f57..26b837a0f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,7 @@
 	url = git@openspace.itn.liu.se:ghoul
 [submodule "ext/spice"]
 	path = ext/spice
-	url = git@openspace.itn.liu.se:/spice
\ No newline at end of file
+	url = git@openspace.itn.liu.se:/spice
+[submodule "openspace-data"]
+	path = openspace-data
+	url = git@openspace.itn.liu.se:/openspace-data
diff --git a/openspace-data b/openspace-data
new file mode 160000
index 0000000000..500458eba3
--- /dev/null
+++ b/openspace-data
@@ -0,0 +1 @@
+Subproject commit 500458eba30fef87fbdc924a8918902d27674125
diff --git a/src/openspaceengine.cpp b/src/openspaceengine.cpp
index c9e7277f90..321b988a62 100644
--- a/src/openspaceengine.cpp
+++ b/src/openspaceengine.cpp
@@ -96,6 +96,7 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
 	FileSys.registerPathToken("${BASE_PATH}", "..");
 #endif
 	FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/scripts");
+	FileSys.registerPathToken("${OPENSPACE-DATA}", "${BASE_PATH}/openspace-data");
     
     // OLD
 	//FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/openspace/scripts"); // FIX ME: tempoary path
diff --git a/src/util/spice.cpp b/src/util/spice.cpp
index 238a80101c..edffb5918d 100644
--- a/src/util/spice.cpp
+++ b/src/util/spice.cpp
@@ -68,7 +68,7 @@ void Spice::loadDefaultKernels() {
 	assert(this_);
 
 	// load
-	loadKernel(absPath("${BASE_PATH}/data/spice/de430_1850-2150.bsp"));
+	loadKernel(absPath("${OPENSPACE-DATA}/spice/de430_1850-2150.bsp"));
 	//Summary for: de430_1850-2150.bsp
 	//Bodies: MERCURY BARYCENTER (1)  SATURN BARYCENTER (6)   MERCURY (199)
 	//        VENUS BARYCENTER (2)    URANUS BARYCENTER (7)   VENUS (299)
@@ -79,7 +79,7 @@ void Spice::loadDefaultKernels() {
 	//        -----------------------------       -----------------------------
 	//        1849 DEC 26 00:00:00.000            2150 JAN 22 00:00:00.000
 	
-	loadKernel(absPath("${BASE_PATH}/data/spice/pck00010.tpc"));
+	loadKernel(absPath("${OPENSPACE-DATA}/spice/pck00010.tpc"));
 }
 
 bool Spice::loadKernel(const std::string &path) {
diff --git a/src/util/time.cpp b/src/util/time.cpp
index d7ba7321b5..15dac045e4 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -18,7 +18,7 @@ Time::Time() {
 	time_ = 0.0;
 
 	// load spice time kernel
-	furnsh_c (absPath("${BASE_PATH}/data/spice/naif0010.tls").c_str());
+	furnsh_c (absPath("${OPENSPACE-DATA}/spice/naif0010.tls").c_str());
 
 	// convert UTC to ET 
 	str2et_c ( "2006 JAN 31 01:00", &time_ );