mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 19:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added openspace-data as submodule. Added OPENSPACE-DATA path variable

Browse Source
This commit is contained in:
Hans-Christian Helltegen
2014-02-20 18:21:48 +00:00
parent 1bf4bf9410
commit dadfc46218
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+4 -1
View File
@@ -3,4 +3,7 @@
url = git@openspace.itn.liu.se:ghoul
[submodule "ext/spice"]
path = ext/spice
url = git@openspace.itn.liu.se:/spice
url = git@openspace.itn.liu.se:/spice
[submodule "openspace-data"]
path = openspace-data
url = git@openspace.itn.liu.se:/openspace-data
openspace-data
Submodule
+1
Submodule openspace-data added at 500458eba3
src/openspaceengine.cpp
+1
View File
@@ -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
src/util/spice.cpp
+2 -2
View File
@@ -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) {
src/util/time.cpp
+1 -1
View File
@@ -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_ );