Yet another reorg

.github/workflows/build.yml

@@ -0,0 +1,66 @@
+name: Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_LOG: info
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Populate target directory from cache
+        uses: Leafwing-Studios/cargo-cache@v2
+        with:
+          sweep-cache: true
+
+      - name: Install Bevy dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+
+      - name: Cargo Check
+        run: RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo check
+
+      - name: Cargo Build
+        run: cargo build --release --all-features
+
+  doc:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Install Bevy dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+
+      - name: Populate target directory from cache
+        uses: Leafwing-Studios/cargo-cache@v2
+        with:
+          sweep-cache: true
+
+      - name: Cargo Doc
+        run: cargo doc --no-deps
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: doc
+          path: target/doc

.github/workflows/extras.yml

@@ -0,0 +1,66 @@
+name: Extras
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_LOG: info
+
+jobs:
+
+  book:
+    runs-on: ubuntu-20.04
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v2
+        with:
+          mdbook-version: '0.4.10'
+
+      - run: mdbook build
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        if: ${{ github.ref == 'refs/heads/main' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./book
+
+#   deploy:
+#     if: github.ref == 'refs/heads/main'
+#     needs: doc
+#     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+#     permissions:
+#       pages: write      # to deploy to Pages
+#       id-token: write   # to verify the deployment originates from an appropriate source
+#     # Deploy to the github-pages environment
+#     environment:
+#       name: github-pages
+#       url: ${{ steps.deployment.outputs.page_url }}
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3
+#         with:
+#           fetch-depth: 0
+
+#       - uses: actions/download-artifact@v4
+#         with:
+#           name: doc
+#           path: ${{ github.workspace }}
+
+#       - name: Upload Pages artifact
+#         uses: actions/upload-pages-artifact@v3
+#         with:
+#           path: target/doc
+
+#       - name: Deploy to GitHub Pages
+#         id: deployment
+#         uses: actions/deploy-pages@v4
+#         if: github.event_name != 'pull_request'

Cargo.toml

@@ -1,50 +1,111 @@
 [package]
 name = "yahs"
 description = "Yet Another HAB Simulator"
+version = "0.4.0"
 authors = ["Philip Linden <lindenphilipj@gmail.com>"]
-version = "0.2.0"
-edition = "2021"
 readme = "README.md"
-license-file = "LICENSE"
+license = "MIT or Apache-2.0"
+edition = "2021"
+
+default-run = "yahs"
+
+# When importing this crate as a dependency, use the simulator library as "yahs"
+[lib]
+name = "yahs"
+path = "src/simulator/src/lib.rs"
+
+# When running this project as a CLI, use the CLI binary as "yahs"
+[[bin]]
+name = "yahs"
+path = "src/cli/src/main.rs"
+
+# These are the dependencies when building the CLI from the project root
+[dependencies]
+# Simulator dependencies
+yahs-simulator = { path = "src/simulator" }
+bevy = { workspace = true }
+avian3d = { workspace = true }
+bevy-trait-query = { workspace = true }
+
+# CLI dependencies
+yahs-cli = { path = "src/cli" }
+bevy_ratatui = "0.7.0"
+ratatui = "0.29"
+color-eyre = "0.6.3"
+crossterm = "0.28.1"
 
 [features]
-default = ["gui"]
-gui = [
-    "egui",
-    "egui_extras",
-    "egui_plot",
-    "eframe",
-    "emath",
-    "rfd",
+default = ["dev"]
+dev = ["yahs-cli/dev", "yahs-simulator/dev"]
+
+[workspace.package]
+authors = ["Philip Linden <lindenphilipj@gmail.com>"]
+edition = "2021"
+license = "MIT or Apache-2.0"
+
+[workspace]
+resolver = "2" # Important for Bevy
+members = [
+    "src/simulator",
+    "src/cli",
+    "src/ui"
 ]
 
-[dependencies]
-pretty_env_logger = "0.5.0"
-libm = "0.2.1"
-toml = "0.8.10"
-clap = { version = "4.1", default-features = false, features = [
-    "derive",
-    "std",
-    "help",
-    "usage",
-    "error-context",
-    "suggestions",
+[workspace.dependencies]
+# Shared dependencies with fixed versions
+bevy = { version = "0.15.0", default-features = false, features = [
+    "bevy_state", "multi_threaded"
 ] }
-csv = "1.2.1"
-serde = { version = "1.0.196", features = ["derive"] }
-log = { version = "0.4.20", features = ["release_max_level_debug"] }
-egui = { version = "0.26.2", features = ["log", "serde"], optional = true }
-egui_plot = { version = "0.26.2", features = ["serde"], optional = true }
-eframe = { version = "0.26.2", features = ["persistence"], optional = true }
-emath = { version = "0.26.2", optional = true }
-egui_extras = { version = "0.26.2", features = [
-    "chrono",
-    "datepicker",
-    "file",
-], optional = true }
-rfd = { version = "0.14.0", optional = true }
-ultraviolet = { version = "0.9.2", features = ["serde"] }
+avian3d = { git = "https://github.com/Jondolf/avian.git", branch = "main" }
+bevy-trait-query = "0.7.0"
 
-[[bin]]
-name = "yahs"
-path = "src/main.rs"
+# -----------------------------------------------------------------------------
+# Some Bevy optimizations
+# -----------------------------------------------------------------------------
+
+# Idiomatic Bevy code often triggers these lints, and the CI workflow treats
+# them as errors. In some cases they may still signal poor code quality however,
+# so consider commenting out these lines.
+[lints.clippy]
+# Bevy supplies arguments to systems via dependency injection, so it's
+# natural for systems to request more than 7 arguments -- which triggers
+# this lint.
+too_many_arguments = "allow"
+# Queries that access many components may trigger this lint.
+type_complexity = "allow"
+
+# Compile with Performance Optimizations:
+# https://bevyengine.org/learn/quick-start/getting-started/setup/#compile-with-performance-optimizations
+
+# Enable a small amount of optimization in the dev profile for our code.
+[profile.dev]
+opt-level = 1
+
+# Enable a large amount of optimization in the dev profile for dependencies.
+[profile.dev.package."*"]
+opt-level = 3
+debug = false
+
+# The default profile is optimized for Wasm builds because that's what [Trunk
+# reads](https://github.com/trunk-rs/trunk/issues/605). Optimize for size in the
+# wasm-release profile to reduce load times and bandwidth usage on web.
+[profile.release]
+# Compile the entire crate as one unit. Slows compile times, marginal
+# improvements.
+codegen-units = 1
+# Optimize with size in mind (also try "z", sometimes it is better).
+# Slightly slows compile times, great improvements to file size and runtime
+# performance.
+opt-level = "s"
+# Strip all debugging information from the binary to slightly reduce file
+# size.
+strip = "debuginfo"
+
+# Override some settings for native builds.
+[profile.release-native]
+# Default to release profile values.
+inherits = "release"
+# Optimize with performance in mind.
+opt-level = 3
+# Keep debug information in the binary.
+strip = "none"