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

Small habitable zone updates

Browse Source 
* Show optimistic boundaries per default
* Shorten down interval UI name to make tooltip visible
* Increase interval for Kopparapu's formula
This commit is contained in:
Emma Broman
2021-02-09 15:10:59 +01:00
parent f9e712a8e7
commit 39d5be5b17
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/assets/scene/solarsystem/sun/habitablezone.asset
View File

@@ -11,7 +11,8 @@ local HabitableZone = {
Texture = textures .. "/hot_to_cold_faded.png",
EffectiveTemperature = 5780, -- Kelvin
Luminosity = 1, -- solar
Opacity = 0.1
Opacity = 0.1,
Optimistic = true
},
GUI = {
Name = "Sun Habitable Zone",

10
modules/space/rendering/renderablehabitablezone.cpp
View File

@@ -69,10 +69,10 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo KopparapuTeffIntervalInfo = {
"KopparapuTeffInterval",
"Effective Temperature Interval (Kopparapu's formula)" ,
"The range for which Kopparapu's formula is used for the habitable zone "
"computation. For stars with effective temperatures outside the range, a "
"simpler method by Tom E. Harris is used. This method only uses the star "
"Kopparapu TEFF" ,
"The effective temperature interval for which Kopparapu's formula is used for "
"the habitable zone computation. For stars with temperatures outside the range, "
"a simpler method by Tom E. Harris is used. This method only uses the star "
"luminosity and does not include computation of the optimistic boundaries."
};
} // namespace
@@ -130,7 +130,7 @@ RenderableHabitableZone::RenderableHabitableZone(const ghoul::Dictionary& dictio
, _teff(EffectiveTemperatureInfo, 5780.f, 0.f, 7.5e4f)
, _luminosity(LuminosityInfo, 1.f, 0.f, 1e8f)
, _showOptimistic(OptimisticInfo, false)
, _kopparapuTeffInterval(KopparapuTeffIntervalInfo, glm::vec2(2000.f, 8000.f))
, _kopparapuTeffInterval(KopparapuTeffIntervalInfo, glm::vec2(1000.f, 10000.f))
{
documentation::testSpecificationAndThrow(
Documentation(),