Test release 4.0-beta

examples/default-viewer-body/cfg.yaml

@@ -0,0 +1,9 @@
+window:
+  ambient: [0.0, 0.0, 0.0]
+
+scene:
+  sun: [1.0, 0.0, 0.0]
+  camera: [5.0, 0.0, 0.0]
+
+bodies:
+  - id: 0

examples/ground-based-lightcurve-didymos-spice-dart-impact/cfg/cfg.yaml

@@ -0,0 +1,57 @@
+window:
+  export_frames: true
+
+spice:
+  kernel: C:/data/SPICE/dart-520/mk/d520_v01.tm
+  frame: J2000
+
+simulation:
+  start: 2022-09-26 23:14:24.000
+  step: 60
+  duration: 8136
+  export:
+    step: 60
+    duration: 8136
+  pause_after_first_iteration: true
+
+scene:
+  sun:
+    position:
+      !spice
+  camera:
+    position:
+      !spice Earth
+    distance: 5.0
+
+bodies:
+  - id: didymos
+    mesh:
+      shape: sphere
+      factor: [0.4095, 0.4005, 0.3035]
+      smooth: true
+    material:
+      albedo: 0.1
+    state:
+      !spice
+        frame_from: didymos_fixed
+
+  - id: dimorphos
+    mesh:
+      shape: sphere
+      factor: [0.0895165, 0.0825, 0.0575]
+      smooth: true
+    material:
+      albedo: 0.1
+    state:
+      !spice
+        origin: didymos
+        frame_from: dimorphos_fixed
+
+  - id: dart
+    mesh:
+      shape: cube
+      factor: [0.01, 0.01, 0.01]
+    state:
+      !cartesian
+        position: [-0.00831, 0.0832, 0.013]
+        reference: dimorphos

examples/ground-based-lightcurve-didymos-spice/cfg/cfg.yaml

@@ -1,28 +1,47 @@
 window:
   export_frames: true
-
+
+spice:
+  kernel: C:/data/SPICE/dart-520/mk/d520_v01.tm
+  frame: J2000
+
 simulation:
-  start: 2022-09-26
+  start: 2022-09-26 22:30:00
   step: 60
   duration: 8136
   export:
     step: 60
     duration: 8136
-  pause_after_first_iteration: true
 
 scene:
-  spice: /Users/gregoireh/data/spice/dart/mk/d420.tm
+  sun:
+    position:
+      !spice
   camera:
-    from: Earth
-    distance: 2
+    position:
+      !spice Earth
+    distance: 5.0
 
 bodies:
-  - id: Didymos
+  - id: didymos
     mesh:
       shape: sphere
       factor: [0.4095, 0.4005, 0.3035]
       smooth: true
     material:
       albedo: 0.1
-    spin:
-      period: 8136
+    state:
+      !spice
+        frame_from: didymos_fixed
+
+  - id: dimorphos
+    mesh:
+      shape: sphere
+      factor: [0.0895165, 0.0825, 0.0575]
+      smooth: true
+    material:
+      albedo: 0.1
+    state:
+      !spice
+        origin: didymos
+        frame_from: dimorphos_fixed

examples/ground-based-lightcurve-didymos/cfg/cfg.yaml

@@ -1,31 +1,32 @@
 window:
   export_frames: true
-    
+
 simulation:
   step: 60
   duration: 8136
   export:
     step: 60
     duration: 8136
+  pause_after_first_iteration: true
 
 scene:
-  camera:
-    !earth 2.0
   sun:
-    type: equatorial
-    ra: 12h12m22.42s
-    dec: -01°20'20.3"
+    position:
+      !equatorial
+        ra: 12h12m22.42s
+        dec: -01°20'20.3"
+  camera:
+    !reference
 
 bodies:
-  - mesh:
+  - id: didymos
+    mesh:
       shape: sphere
       factor: [0.4095, 0.4005, 0.3035]
       smooth: true
     material:
       albedo: 0.1
-    spin:
-      period: 8136
     state:
-      type: equatorial
-      ra: 03h21m43.477s
-      dec: -33°22'44.57"
+      !equatorial
+        ra: 03h21m43.477s
+        dec: -33°22'44.57"

preferences.yaml

@@ -1 +1,4 @@
-no_check: true
+no_check: true
+
+debug_cfg: true
+debug: false

src/body/orbit.rs

@@ -12,7 +12,8 @@ use uom::{
     str::ParseQuantityError,
 };
 
-pub type OrbitResult<T, E = AstronomicalAngleConversionError> = std::result::Result<T, E>;
+pub type AstronomicalAngleResult<T, E = AstronomicalAngleConversionError> =
+    std::result::Result<T, E>;
 
 #[derive(Debug, Snafu)]
 pub enum AstronomicalAngleConversionError {
@@ -43,6 +44,13 @@ pub enum AstronomicalAngleConversionError {
     },
 }
 
+pub type EquatorialResult<T, E = EquatorialError> = std::result::Result<T, E>;
+
+#[derive(Debug, Snafu)]
+pub enum EquatorialError {
+    DistanceNotDefined {},
+}
+
 #[derive(Debug, Clone)]
 pub enum DMS {
     D,
@@ -74,7 +82,7 @@ impl AstronomicalAngle {
         Self(angle)
     }
 
-    pub fn parse(s: &str) -> OrbitResult<Self> {
+    pub fn parse(s: &str) -> AstronomicalAngleResult<Self> {
         match Self::from_value(s) {
             Ok(angle) => return Ok(angle),
             Err(_) => {}
@@ -95,13 +103,13 @@ impl AstronomicalAngle {
         })
     }
 
-    pub fn from_value(s: &str) -> OrbitResult<Self> {
+    pub fn from_value(s: &str) -> AstronomicalAngleResult<Self> {
         s.parse::<Angle>()
             .context(AngleParsingSnafu {})
             .and_then(|angle| Ok(Self::new(angle)))
     }
 
-    pub fn from_hms(s: &str) -> OrbitResult<Self> {
+    pub fn from_hms(s: &str) -> AstronomicalAngleResult<Self> {
         // To find the int hours: \d{1,2}h
         // To find the int minutes: \d{1,2}m
         // To find the float seconds: [+-]?(\d+([.]\d*)?([eE][+-]?\d+)?|[.]\d+([eE][+-]?\d+)?)s
@@ -136,7 +144,7 @@ impl AstronomicalAngle {
         Ok(Self::new(Angle::new::<radian>(radians)))
     }
 
-    pub fn from_dms(s: &str) -> OrbitResult<Self> {
+    pub fn from_dms(s: &str) -> AstronomicalAngleResult<Self> {
         // To find the int degrees: [+-]?\d{1,2}°
         // To find the int minutes: \d{1,2}'
         // To find the float seconds: [+-]?(\d+([.]\d*)?([eE][+-]?\d+)?|[.]\d+([eE][+-]?\d+)?)"
@@ -175,7 +183,7 @@ impl AstronomicalAngle {
 impl FromStr for AstronomicalAngle {
     type Err = AstronomicalAngleConversionError;
 
-    fn from_str(s: &str) -> OrbitResult<Self> {
+    fn from_str(s: &str) -> AstronomicalAngleResult<Self> {
         Self::parse(s)
     }
 }
@@ -227,16 +235,38 @@ orientation: [
 */
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct Equatorial {
+    #[serde(default)]
     pub ra: AstronomicalAngle,
+
+    #[serde(default)]
     pub dec: AstronomicalAngle,
+
+    #[serde(default)]
+    pub distance: Option<Float>,
 }
 
 impl Equatorial {
     pub fn new(ra: AstronomicalAngle, dec: AstronomicalAngle) -> Self {
-        Self { ra, dec }
+        Self {
+            ra,
+            dec,
+            distance: None,
+        }
+    }
+
+    pub fn with_distance(self, distance: Float) -> Self {
+        Self {
+            ra: self.ra,
+            dec: self.dec,
+            distance: Some(distance),
+        }
+    }
+
+    pub fn xyz(&self) -> EquatorialResult<Vec3> {
+        Ok(self.xyz_with_distance(self.distance.context(DistanceNotDefinedSnafu {})?))
     }
 
-    pub fn xyz(&self, distance: Float) -> Vec3 {
+    pub fn xyz_with_distance(&self, distance: Float) -> Vec3 {
         distance
             * vec3(
                 (self.ra.cos() * self.dec.cos()).value,

src/cfg/body.rs

@@ -3,7 +3,6 @@ use crate::{
     Shapes,
 };
 
-use core::panic;
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 use snafu::{prelude::*, Location};
@@ -518,7 +517,6 @@ e: 0.5
 
 */
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
 pub enum CfgState {
     #[serde(rename = "cartesian")]
     Cartesian(CfgStateCartesian),
@@ -527,7 +525,7 @@ pub enum CfgState {
     Equatorial(Equatorial),
 
     #[serde(rename = "orbit")]
-    Orbit(CfgOrbitKepler),
+    Orbit(CfgStateOrbit),
 
     #[serde(rename = "file")]
     File(PathBuf),
@@ -536,15 +534,6 @@ pub enum CfgState {
     Spice(CfgStateSpice),
 }
 
-impl CfgState {
-    pub fn as_equatorial(&self) -> BodyResult<&Equatorial> {
-        match self {
-            Self::Equatorial(coords) => Ok(coords),
-            _ => panic!("nono"),
-        }
-    }
-}
-
 impl Default for CfgState {
     fn default() -> Self {
         Self::Cartesian(CfgStateCartesian::default())
@@ -577,29 +566,17 @@ pub struct CfgStateCartesian {
     /// Default is: `[1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]`
     #[serde(default = "default_orientation")]
     pub orientation: Mat3,
-}
 
-impl CfgStateCartesian {
-    pub fn position_only(position: Vec3) -> Self {
-        Self {
-            position,
-            orientation: Mat3::identity(),
-        }
-    }
-
-    pub fn orientation_only(orientation: Mat3) -> Self {
-        Self {
-            position: Vec3::zeros(),
-            orientation,
-        }
-    }
+    #[serde(default)]
+    pub reference: Option<String>,
 }
 
 impl Default for CfgStateCartesian {
     fn default() -> Self {
         Self {
             position: Vec3::zeros(),
             orientation: default_orientation(),
+            reference: None,
         }
     }
 }
@@ -633,7 +610,7 @@ In this sense, just [`a`][CfgOrbitKepler::a] and [`e`][CfgOrbitKepler::e] are us
 
 */
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct CfgOrbitKepler {
+pub struct CfgStateOrbit {
     /// Heliocentric distance.
     /// The units are determined automatically depending on the center of the frame:
     ///
@@ -674,7 +651,7 @@ pub struct CfgOrbitKepler {
     pub control: CfgOrbitSpeedControl,
 }
 
-impl Default for CfgOrbitKepler {
+impl Default for CfgStateOrbit {
     fn default() -> Self {
         Self {
             a: default_orbit_a(),
@@ -766,7 +743,7 @@ pub struct CfgStateSpice {
     pub origin: Option<String>,
 
     #[serde(default)]
-    pub frame: Option<String>,
+    pub frame_from: Option<String>,
 
     #[serde(default)]
     pub frame_to: Option<String>,