🤷‍♂️ (#19)

* start replacing nbody with almanac

* more design docs

* checkpoint

* tinker with coordinate frames

* MPL license, anise, and big_space

* arch design

* tidy up

* directly transform from almanac

* i have a habit of renaming things

* checkpoint

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
- "spacetime-core",
  "spacetime-bridge",
+ "spacetime-engine",
+ "spacetime-galley",
 ]
 resolver = "2"

spacetime-bridge/Cargo.toml

@@ -10,16 +10,14 @@ homepage = "https://philiplinden.github.io/clocss-abm/"
 repository = "https://github.com/philiplinden/clocss-abm"
 
 [dependencies]
-spacetime-core = { path = "../spacetime-core" }
-bevy = { version = "0.12.0", features = [
- "dynamic_linking",
- "multi-threaded",
-] }
+spacetime-engine = { path = "../spacetime-engine" }
+spacetime-galley = { path = "../spacetime-galley" }
+big_space = "0.4.0"
+bevy = { version = "0.12.0", features = ["dynamic_linking", "multi-threaded"] }
 bevy_egui = "0.24.0"
 humantime = "2.1.0"
 crossbeam-channel = "0.5.11"
 particular = { version = "0.6.1", features = ["gpu", "parallel"] }
-big_space = "0.4.0"
 
 # Enable a small amount of optimization in debug mode
 [profile.dev]

spacetime-bridge/src/gui/hud.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use spacetime_core::physics::{PhysicsTime, ElapsedPhysicsTime, PhysicsSettings};
+use spacetime_core::{PhysicsTime, ElapsedPhysicsTime, PhysicsSettings};
 use crate::gui::{
  format_duration,
  orbit_prediction::{ComputePredictionEvent, PredictionDraw, PredictionState, ResetPredictionEvent},

spacetime-bridge/src/main.rs

@@ -1,11 +1,12 @@
 use bevy::prelude::*;
 mod gui;
-mod orbit_prediction;
 mod scenario;
 mod scene;
 
 use scene::{body, camera};
-use spacetime_core::{physics, DT};
+use spacetime_core::{kinematics, schedule, PhysicsSettings, G, SCALE};
+
+use gui::select::{Followed, Selected};
 
 fn main() {
  App::new()
@@ -25,8 +26,8 @@ fn main() {
  gui::GuiPlugin,
  camera::CameraPlugin,
  // Physics
- physics::PhysicsSchedulePlugin,
- physics::GravityPlugin,
+ schedule::PhysicsSchedulePlugin,
+ kinematics::GravityPlugin,
  // Scene
  scenario::ScenarioPlugin,
  ))
@@ -36,7 +37,7 @@ fn main() {
  color: Color::WHITE,
  brightness: 0.5,
  })
- .insert_resource(physics::PhysicsSettings::delta_time(DT))
+ .insert_resource(PhysicsSettings::delta_time(DT))
  .add_systems(First, body::add_materials)
  .run();
 }

spacetime-bridge/src/scene/body.rs

@@ -4,10 +4,10 @@ use crate::gui::{
  label::Labelled,
  select::{CanFollow, CanSelect},
 };
-use crate::orbit_prediction::{PredictionBundle, PredictionDraw};
 use spacetime_core::{
- physics::{Acceleration, Interpolated, Mass, Position, Velocity},
- SCALE,
+ kinematics::{Acceleration, Mass, Position, Velocity},
+ Interpolated, SCALE,
+ orbit_prediction::{PredictionBundle, PredictionDraw},
 };
 
 // Planetoids, stars, and other natural bodies are called CELESTIALS

spacetime-core/Cargo.toml → spacetime-engine/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
-name = "spacetime-core"
+name = "spacetime-engine"
 version = "0.1.0"
 edition = "2021"
 license = "MPL-2.0"
 readme = "README.md"
 description = "Run a Simulation of Heterogeneous Networked Lunar Clocks"
 authors = ["Philip Linden <lindenphilipj@gmail.com>"]
-homepage = "https://philiplinden.github.io/clocss-abm/"
-repository = "https://github.com/philiplinden/clocss-abm"
+homepage = "https://philiplinden.github.io/spacetime/"
+repository = "https://github.com/philiplinden/spacetime"
 
 [dependencies]
 anise = "0.3.0"

spacetime-engine/README.md

@@ -0,0 +1,2 @@
+# spacetime_core
+Drive the simulation along with the engine.

spacetime-engine/src/celestials.rs

@@ -0,0 +1,28 @@
+use anise::constants::frames::{EARTH_J2000, MOON_J2000};
+use anise::math::cartesian::CartesianState;
+use anise::prelude::*;
+use bevy::prelude::*;
+
+use crate::sim::SimulationSpace;
+
+trait Lookup {
+ fn true_state(&self, sim: Res<SimulationSpace>, coordinate_frame: Frame) -> CartesianState {
+ sim.almanac
+ .transform(self.own_frame, coordinate_frame, sim.epoch, None)
+ .unwrap()
+ }
+}
+
+struct CelestialBody {
+ own_frame: Frame,
+}
+
+impl Lookup for CelestialBody {}
+
+pub static EARTH: CelestialBody = CelestialBody {
+ own_frame: EARTH_J2000,
+};
+
+pub static LUNA: CelestialBody = CelestialBody {
+ own_frame: MOON_J2000,
+};

spacetime-core/src/physics/spacetime.rs → spacetime-engine/src/kinematics.rs

@@ -1,12 +1,12 @@
 /*!
- * This module handles the warping of spacetime. This includes gravity and time dilation.
+ * This module establishes types and functions for kinematics calculations.
  *
  */
 
 use bevy::prelude::*;
 use particular::prelude::*;
 
-use crate::physics::schedule::{PhysicsSchedule, PhysicsSet};
+use crate::schedule::{PhysicsSchedule, PhysicsSet};
 
 // from particular::prelude
 pub const NBODY_COMPUTE_METHOD: sequential::BruteForcePairs = sequential::BruteForcePairs;