update according to upstream

celestiamobile · Oct 21, 2023 · 9fae2e9 · 9fae2e9
1 parent 50cc007
commit 9fae2e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/CelestiaComponent/CelestiaAppCore.cpp b/CelestiaComponent/CelestiaAppCore.cpp
@@ -629,7 +629,7 @@ void CelestiaAppCore::Show##flag##Labels(bool value) \
 
     void CelestiaAppCore::DateFormat(int32_t dateFormat)
     {
-        core->setDateFormat(static_cast<astro::Date::Format>(dateFormat));
+        core->setDateFormat(static_cast<celestia::astro::Date::Format>(dateFormat));
     }
 
     float CelestiaAppCore::AmbientLightLevel()

diff --git a/CelestiaComponent/CelestiaDMS.cpp b/CelestiaComponent/CelestiaDMS.cpp
@@ -20,7 +20,7 @@ namespace winrt::CelestiaComponent::implementation
 {
     CelestiaDMS::CelestiaDMS(int32_t degrees, int32_t minutes, double seconds) : CelestiaDMST<CelestiaDMS>()
     {
-        decimal = astro::degMinSecToDecimal(static_cast<int>(degrees), static_cast<int>(minutes), static_cast<double>(seconds));
+        decimal = celestia::astro::degMinSecToDecimal(static_cast<int>(degrees), static_cast<int>(minutes), static_cast<double>(seconds));
     }
 
     CelestiaDMS::CelestiaDMS(double decimal) : CelestiaDMST<CelestiaDMS>(), decimal(decimal)
@@ -32,7 +32,7 @@ namespace winrt::CelestiaComponent::implementation
         int degrees;
         int minutes;
         double seconds;
-        astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
+        celestia::astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
         return static_cast<int32_t>(degrees);
     }
 
@@ -41,7 +41,7 @@ namespace winrt::CelestiaComponent::implementation
         int degrees;
         int minutes;
         double seconds;
-        astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
+        celestia::astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
         return static_cast<int32_t>(minutes);
     }
 
@@ -50,7 +50,7 @@ namespace winrt::CelestiaComponent::implementation
         int degrees;
         int minutes;
         double seconds;
-        astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
+        celestia::astro::decimalToDegMinSec(decimal, degrees, minutes, seconds);
         return seconds;
     }
 
@@ -59,7 +59,7 @@ namespace winrt::CelestiaComponent::implementation
         int hours;
         int minutes;
         double seconds;
-        astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
+        celestia::astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
         return static_cast<int32_t>(hours);
     }
 
@@ -68,7 +68,7 @@ namespace winrt::CelestiaComponent::implementation
         int hours;
         int minutes;
         double seconds;
-        astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
+        celestia::astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
         return static_cast<int32_t>(minutes);
     }
 
@@ -77,7 +77,7 @@ namespace winrt::CelestiaComponent::implementation
         int hours;
         int minutes;
         double seconds;
-        astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
+        celestia::astro::decimalToHourMinSec(decimal, hours, minutes, seconds);
         return seconds;
     }
 

diff --git a/CelestiaComponent/CelestiaHelper.cpp b/CelestiaComponent/CelestiaHelper.cpp
@@ -29,11 +29,11 @@ namespace winrt::CelestiaComponent::implementation
 		int era = c.Era();
 		int year = c.Year();
 		if (era < 1) year = 1 - year;
-		astro::Date astroDate(year, c.Month(), c.Day());
+		celestia::astro::Date astroDate(year, c.Month(), c.Day());
 		astroDate.hour = c.Hour();
 		astroDate.minute = c.Minute();
 		astroDate.seconds = static_cast<double>(c.Second()) + static_cast<double>(c.Nanosecond()) / 1000000000.0;
-		return astro::UTCtoTDB(astroDate);
+		return celestia::astro::UTCtoTDB(astroDate);
 	}
 
 	Windows::Foundation::DateTime CelestiaHelper::DateTimeFromJulianDay(double julianDay)
@@ -42,7 +42,7 @@ namespace winrt::CelestiaComponent::implementation
 		c.ChangeClock(Windows::Globalization::ClockIdentifiers::TwentyFourHour());
 		c.ChangeCalendarSystem(Windows::Globalization::CalendarIdentifiers::Gregorian());
 		c.ChangeTimeZone(L"UTC");
-        astro::Date astroDate = astro::TDBtoUTC(julianDay);
+        celestia::astro::Date astroDate = celestia::astro::TDBtoUTC(julianDay);
 		int year = astroDate.year;
 
 		int era = 1;
@@ -121,15 +121,15 @@ namespace winrt::CelestiaComponent::implementation
     {
         auto obj = get_self<CelestiaVector>(ecliptic);
         auto v = Eigen::Vector3d(obj->X(), obj->Y(), obj->Z());
-        auto transformed = astro::eclipticToEquatorial(v);
+        auto transformed = celestia::astro::eclipticToEquatorial(v);
         return make<CelestiaVector>(transformed.x(), transformed.y(), transformed.z());
     }
 
     CelestiaComponent::CelestiaVector CelestiaHelper::EquatorialToGalactic(CelestiaComponent::CelestiaVector const& equatorial)
     {
         auto obj = get_self<CelestiaVector>(equatorial);
         auto v = Eigen::Vector3d(obj->X(), obj->Y(), obj->Z());
-        auto transformed = astro::equatorialToGalactic(v);
+        auto transformed = celestia::astro::equatorialToGalactic(v);
         return make<CelestiaVector>(transformed.x(), transformed.y(), transformed.z());
     }
 
@@ -147,6 +147,6 @@ namespace winrt::CelestiaComponent::implementation
 
     double CelestiaHelper::AUToKilometers(double au)
     {
-        return astro::AUtoKilometers(au);
+        return celestia::astro::AUtoKilometers(au);
     }
 }
diff --git a/CelestiaComponent/CelestiaSimulation.cpp b/CelestiaComponent/CelestiaSimulation.cpp
@@ -117,7 +117,7 @@ namespace winrt::CelestiaComponent::implementation
             case CelestiaComponent::CelestiaGotoLocationDistanceUnit::KM:
                 distance = distanceValue;
             case CelestiaComponent::CelestiaGotoLocationDistanceUnit::AU:
-                distance = astro::AUtoKilometers(distanceValue);
+                distance = celestia::astro::AUtoKilometers(distanceValue);
             case CelestiaComponent::CelestiaGotoLocationDistanceUnit::Radii:
                 distance = radius * distanceValue;
             }