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

Merge commit '635df258d480830c85d3f01247fc0ff931353946' into feature/websocketnavigation

Browse Source 
* commit '635df258d480830c85d3f01247fc0ff931353946':
  Add option to press Shift while clicking the time shifting to immediately jump, instead of interpolate
  Remove Hyperion's rotation as there is no SPICE information for it available
  Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string
  Add Hyperion and Mimas to Saturn's major moons (#closes 730)
  Change originChange origin of the radiosphere to Earth Do not show radiosphere before 1936
  Update ghoul repository
This commit is contained in:
Matthew Territo
2018-10-09 16:51:23 -06:00
parent d7dddf5352 635df258d4
commit 31befae5eb
10 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/openspace/properties/numericalproperty.inl
View File

@@ -389,13 +389,13 @@ template <typename T>
std::string NumericalProperty<T>::generateAdditionalJsonDescription() const {
std::string result = "{ ";
result +=
"\"" + MinimumValueKey + "\": " + luaToJson(std::to_string(_minimumValue)) + ",";
"\"" + MinimumValueKey + "\": " + luaToJson(ghoul::to_string(_minimumValue)) + ",";
result +=
"\"" + MaximumValueKey + "\": " + luaToJson(std::to_string(_maximumValue)) + ",";
"\"" + MaximumValueKey + "\": " + luaToJson(ghoul::to_string(_maximumValue)) + ",";
result +=
"\"" + SteppingValueKey + "\": " + luaToJson(std::to_string(_stepping)) + ",";
"\"" + SteppingValueKey + "\": " + luaToJson(ghoul::to_string(_stepping)) + ",";
result +=
"\"" + ExponentValueKey + "\": " + luaToJson(std::to_string(_exponent));
"\"" + ExponentValueKey + "\": " + luaToJson(ghoul::to_string(_exponent));
result += " }";
return result;
}