Rename astro namespace to celestia::astro

- Tidy up includes in astro.h/astro.cpp
- Replace snprintf with fmt in astro.cpp
- Replace Date::toCStr() with Date::toString() returning std::string

Author: ajtribick

src/celengine/astro.cpp

@@ -30,6 +30,7 @@ using namespace Eigen;
 using namespace std;
 using namespace celmath;
 
+namespace astro = celestia::astro;
 
 Body::Body(PlanetarySystem* _system, const std::string& _name) :
     system(_system),

src/celengine/astro.h

@@ -16,6 +16,7 @@
 
 #include "astro.h"
 
+namespace astro = celestia::astro;
 
 namespace
 {

src/celengine/body.cpp

@@ -14,6 +14,8 @@
 #include <celutil/gettext.h>
 #endif
 
+namespace astro = celestia::astro;
+
 namespace celestia::engine
 {
 
@@ -69,7 +71,7 @@ std::string DateFormatter::formatDate(double tdb, bool local, astro::Date::Forma
     return utf8FormattedDate;
 #else
     astro::Date d = local ? astro::TDBtoLocal(tdb) : astro::TDBtoUTC(tdb);
-    return d.toCStr(format);
+    return d.toString(format);
 #endif
 }
 

src/celengine/boundaries.cpp

@@ -17,6 +17,8 @@
 #include "astro.h"
 #include "hash.h"
 
+namespace astro = celestia::astro;
+
 Eigen::Vector3d DeepSkyObject::getPosition() const
 {
     return position;
@@ -86,14 +88,14 @@ bool DeepSkyObject::pick(const Eigen::ParametrizedLine<double, 3>& ray,
 bool DeepSkyObject::load(const AssociativeArray* params, const fs::path& resPath)
 {
     // Get position
-    if (auto position = params->getLengthVector<double>("Position", KM_PER_LY<double>); position.has_value())
+    if (auto pos = params->getLengthVector<double>("Position", astro::KM_PER_LY<double>); pos.has_value())
     {
-        setPosition(*position);
+        setPosition(*pos);
     }
     else
     {
-        auto distance = params->getLength<double>("Distance", KM_PER_LY<double>).value_or(1.0);
-        auto RA = params->getAngle<double>("RA", DEG_PER_HRA).value_or(0.0);
+        auto distance = params->getLength<double>("Distance", astro::KM_PER_LY<double>).value_or(1.0);
+        auto RA = params->getAngle<double>("RA", astro::DEG_PER_HRA).value_or(0.0);
         auto dec = params->getAngle<double>("Dec").value_or(0.0);
 
         Eigen::Vector3d p = astro::equatorialToCelestialCart(RA, dec, distance);
@@ -107,7 +109,7 @@ bool DeepSkyObject::load(const AssociativeArray* params, const fs::path& resPath
     setOrientation(Eigen::Quaternionf(Eigen::AngleAxisf(static_cast<float>(celmath::degToRad(angle)),
                                                         axis.cast<float>().normalized())));
 
-    setRadius(params->getLength<float>("Radius", KM_PER_LY<double>).value_or(1.0f));
+    setRadius(params->getLength<float>("Radius", astro::KM_PER_LY<double>).value_or(1.0f));
 
     if (auto absMagValue = params->getNumber<float>("AbsMag"); absMagValue.has_value())
         setAbsoluteMagnitude(*absMagValue);

src/celengine/dateformatter.cpp

@@ -14,6 +14,7 @@
 #include <cmath>
 #include <utility>
 
+#include <celcompat/numbers.h>
 #include <celutil/gettext.h>
 #include <celutil/logger.h>
 #include <celutil/tokenizer.h>
@@ -29,6 +30,8 @@
 
 using celestia::util::GetLogger;
 
+namespace astro = celestia::astro;
+
 constexpr const float DSO_OCTREE_MAGNITUDE   = 8.0f;
 //constexpr const float DSO_EXTRA_ROOM         = 0.01f; // Reserve 1% capacity for extra DSOs
                                                       // (useful as a complement of binary loaded DSOs)
@@ -336,7 +339,7 @@ void DSODatabase::finish()
 void DSODatabase::buildOctree()
 {
     GetLogger()->debug("Sorting DSOs into octree . . .\n");
-    float absMag             = astro::appToAbsMag(DSO_OCTREE_MAGNITUDE, DSO_OCTREE_ROOT_SIZE * (float) sqrt(3.0));
+    float absMag = astro::appToAbsMag(DSO_OCTREE_MAGNITUDE, DSO_OCTREE_ROOT_SIZE * celestia::numbers::sqrt3_v<float>);
 
     // TODO: investigate using a different center--it's possible that more
     // objects end up straddling the base level nodes when the center of the

src/celengine/deepskyobj.cpp

@@ -14,6 +14,7 @@
 
 using namespace Eigen;
 
+namespace astro = celestia::astro;
 
 // The octree node into which a dso is placed is dependent on two properties:
 // its obsPosition and its luminosity--the fainter the dso, the deeper the node
@@ -100,7 +101,7 @@ void DSOOctree::processVisibleObjects(DSOHandler&    processor,
     double minDistance = (obsPosition - cellCenterPos).norm() - scale * DSOOctree::SQRT3;
 
     // Process the objects in this node
-    double dimmest     = minDistance > 0.0 ? astro::appToAbsMag((double) limitingFactor, minDistance) : 1000.0;
+    double dimmest = minDistance > 0.0 ? astro::appToAbsMag((double) limitingFactor, minDistance) : 1000.0;
 
     for (unsigned int i=0; i<nObjects; ++i)
     {
@@ -115,7 +116,7 @@ void DSOOctree::processVisibleObjects(DSOHandler&    processor,
             double distance    = (obsPosition - _obj->getPosition()).norm() - _obj->getBoundingSphereRadius();
             float appMag = (float) ((distance >= 32.6167) ? astro::absToAppMag((double) absMag, distance) : absMag);
 
-            if ( appMag < limitingFactor)
+            if (appMag < limitingFactor)
                 processor.process(_obj, distance, absMag);
         }
     }

src/celengine/dsodb.cpp

@@ -17,6 +17,7 @@
 #include "render.h"
 #include "dsorenderer.h"
 
+namespace astro = celestia::astro;
 
 namespace
 {

src/celengine/dsooctree.cpp

@@ -20,6 +20,7 @@
 using namespace Eigen;
 using namespace std;
 
+namespace astro = celestia::astro;
 
 // Velocity for two-vector frames is computed by differentiation; units
 // are Julian days.