mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 20:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up code

Browse Source 
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
This commit is contained in:
Alexander Bock
2014-10-11 13:40:52 +02:00
parent 0e46642624
commit c226e9b82f
12 changed files with 57 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/engine/openspaceengine.cpp
View File

@@ -242,13 +242,16 @@ bool OpenSpaceEngine::initialize()
std::string timeKernel;
bool success = OsEng.configurationManager().getValue(keySpiceTimeKernel, timeKernel);
std::cout << "timeKernel = " << timeKernel << std::endl;
if (!success) {
LERROR("Configuration file does not contain a '" << keySpiceTimeKernel << "'");
return false;
}
SpiceManager::ref().loadKernel(std::move(timeKernel));
SpiceManager::KernelIdentifier id =
SpiceManager::ref().loadKernel(timeKernel);
if (id == SpiceManager::KernelFailed) {
LERROR("Error loading time kernel '" << timeKernel << "'");
return false;
}
using constants::configurationmanager::keySpiceLeapsecondKernel;
std::string leapSecondKernel;
@@ -257,8 +260,11 @@ bool OpenSpaceEngine::initialize()
LERROR("Configuration file does not contain a '" << keySpiceLeapsecondKernel << "'");
return false;
}
std::cout << "leapSecondKernel : " << leapSecondKernel << std::endl;
SpiceManager::ref().loadKernel(std::move(leapSecondKernel));
id = SpiceManager::ref().loadKernel(std::move(leapSecondKernel));
if (id == SpiceManager::KernelFailed) {
LERROR("Error loading leap second kernel '" << leapSecondKernel << "'");
return false;
}
//SpiceManager::ref().loadKernel("${OPENSPACE_DATA}/spice/de413.bsp");
//SpiceManager::ref().loadKernel("${OPENSPACE_DATA}/spice/jup260.bsp")