From 39d5be5b171591c8c8b5e386bdee5e5ee6724157 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Tue, 9 Feb 2021 15:10:59 +0100 Subject: [PATCH] Small habitable zone updates * Show optimistic boundaries per default * Shorten down interval UI name to make tooltip visible * Increase interval for Kopparapu's formula --- data/assets/scene/solarsystem/sun/habitablezone.asset | 3 ++- modules/space/rendering/renderablehabitablezone.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset index 9727e641fa..1816f4500b 100644 --- a/data/assets/scene/solarsystem/sun/habitablezone.asset +++ b/data/assets/scene/solarsystem/sun/habitablezone.asset @@ -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", diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp index f2888a28c0..a8d0d4dc1d 100644 --- a/modules/space/rendering/renderablehabitablezone.cpp +++ b/modules/space/rendering/renderablehabitablezone.cpp @@ -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(),