Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show Earth's mass and show all semi-axes for non spherical bodies #2193

Merged
merged 10 commits into from
Jun 15, 2024
Merged

Show Earth's mass and show all semi-axes for non spherical bodies #2193

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5864b12
Remove Earth being hardcoded to not show mass
JiliTheSpaceboy May 29, 2024
653bd31
Displaying triaxial radii, attempt #1
JiliTheSpaceboy May 30, 2024
9f952e8
Merge branch 'CelestiaProject:master' into master
JiliTheSpaceboy May 30, 2024
b47aeb4
Display triaxial radii, attempt 2
JiliTheSpaceboy May 30, 2024
ee7a13b
Taking out commented old, replaced code
JiliTheSpaceboy May 30, 2024
296769d
Display triaxial radii, attempt 3
JiliTheSpaceboy May 31, 2024
7242a16
displayMass now can use scientific notation
JiliTheSpaceboy May 31, 2024
872a9e9
Reorder if else conditions in Radius
JiliTheSpaceboy May 31, 2024
fa548dd
Revert change to mass formatting
JiliTheSpaceboy Jun 13, 2024
71d1ae5
Apply suggestions from code review
375gnu Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/celestia/hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ displayMass(const util::NumberFormatter& formatter, Overlay& overlay, float mass
if (mass < 0.001f)
{
if (measurement == MeasurementSystem::Imperial)
overlay.print(_("Mass: {} lb\n"),
overlay.print(_("Mass: {%.4g} lb\n"),
ajtribick marked this conversation as resolved.
Show resolved Hide resolved
formatter.format(mass * astro::EarthMass / static_cast<float>(OneLbInKg), 4, SigDigitNum));
else
overlay.print(_("Mass: {} kg\n"),
overlay.print(_("Mass: {%.4g} kg\n"),
ajtribick marked this conversation as resolved.
Show resolved Hide resolved
formatter.format(mass * astro::EarthMass, 4, SigDigitNum));
}
else if (mass > 50.0f)
Expand Down Expand Up @@ -533,13 +533,28 @@ displayPlanetInfo(const util::NumberFormatter& formatter,
overlay.printf(_("Distance: %s\n"),
DistanceKmToStr(formatter, distance, 5, hudSettings.measurementSystem));

Eigen::Vector3f semiAxes = body.getSemiAxes();
375gnu marked this conversation as resolved.
Show resolved Hide resolved
if (body.getClassification() == BodyClassification::Invisible)
{
return;
}

overlay.printf(_("Radius: %s\n"),
DistanceKmToStr(formatter, body.getRadius(), 5, hudSettings.measurementSystem));
else if (body.isEllipsoid() && !body.isSphere()) // show mean radius along with triaxial semi-axes
{
double radiusMean = cbrt(semiAxes.prod());
375gnu marked this conversation as resolved.
Show resolved Hide resolved
double axis0 = semiAxes.x();
double axis1 = semiAxes.z();
double axis2 = semiAxes.y(); // polar semi-axis
overlay.print(_("Radius: {} ({} " UTF8_MULTIPLICATION_SIGN " {} " UTF8_MULTIPLICATION_SIGN " {})\n"),
DistanceKmToStr(formatter, radiusMean, 5, hudSettings.measurementSystem),
DistanceKmToStr(formatter, axis0, 5, hudSettings.measurementSystem),
DistanceKmToStr(formatter, axis1, 5, hudSettings.measurementSystem),
DistanceKmToStr(formatter, axis2, 5, hudSettings.measurementSystem));
}
else
{
overlay.print(_("Radius: {}\n"),
DistanceKmToStr(formatter, body.getRadius(), 5, hudSettings.measurementSystem));
}

displayApparentDiameter(overlay, body.getRadius(), distanceKm, loc);

Expand Down Expand Up @@ -593,7 +608,7 @@ displayPlanetInfo(const util::NumberFormatter& formatter,
if (body.getRotationModel(t)->isPeriodic())
displayRotationPeriod(formatter, overlay, body.getRotationModel(t)->getPeriod());

if (body.getName() != "Earth" && body.getMass() > 0)
if (body.getMass() > 0)
displayMass(formatter, overlay, body.getMass(), hudSettings.measurementSystem);

if (float density = body.getDensity(); density > 0)
Expand Down
Loading