mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 07:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Windows

Browse Source 
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
This commit is contained in:
Alexander Bock
2016-01-02 21:40:15 +01:00
parent 0735d0fc2d
commit c87fdfd38b
14 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/spicemanager.cpp
+4 -4
View File
@@ -333,7 +333,7 @@ int SpiceManager::naifId(const string& body) const {
ghoul_assert(!body.empty(), "Empty body");
SpiceBoolean success;
int id;
SpiceInt id;
bods2c_c(body.c_str(), &id, &success);
if (!success)
throw SpiceException(format("Could not find NAIF ID of body '{}'", body));
@@ -344,7 +344,7 @@ bool SpiceManager::hasNaifId(const string& body) const {
ghoul_assert(!body.empty(), "Empty body");
SpiceBoolean success;
int id;
SpiceInt id;
bods2c_c(body.c_str(), &id, &success);
reset_c();
return success;
@@ -353,7 +353,7 @@ bool SpiceManager::hasNaifId(const string& body) const {
int SpiceManager::frameId(const string& frame) const {
ghoul_assert(!frame.empty(), "Empty frame");
int id;
SpiceInt id;
namfrm_c(frame.c_str(), &id);
if (id == 0)
throw SpiceException(format("Could not find NAIF ID of frame '{}'", frame));
@@ -363,7 +363,7 @@ int SpiceManager::frameId(const string& frame) const {
bool SpiceManager::hasFrameId(const string& frame) const {
ghoul_assert(!frame.empty(), "Empty frame");
int id;
SpiceInt id;
namfrm_c(frame.c_str(), &id);
return id != 0;
}