From 6a79816968c6819df48f2cd0770a664d4671e121 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 13 Jan 2022 14:28:44 -0800
Subject: [PATCH] Rename "physics" to "action", the better to go with lights
 and camera.

---
 src/{physics.rs => action.rs} |  4 ++--
 src/camera.rs                 |  2 +-
 src/geometry.rs               |  2 +-
 src/lib.rs                    |  2 +-
 src/main.rs                   |  2 +-
 src/ui.rs                     | 13 ++++++++++---
 6 files changed, 16 insertions(+), 9 deletions(-)
 rename src/{physics.rs => action.rs} (99%)

diff --git a/src/physics.rs b/src/action.rs
similarity index 99%
rename from src/physics.rs
rename to src/action.rs
index 0efd978..bee7228 100644
--- a/src/physics.rs
+++ b/src/action.rs
@@ -90,7 +90,7 @@ fn update_player_vel(
 
     // thrust or brake
     vel += xform.forward() * input.throttle * dt * settings.accel;
-    
+
 
     // brake
     if input.brake {
@@ -106,7 +106,7 @@ fn update_player_vel(
     let v2 = vel.length_squared().min(100_000.0);
     let drag = vel * settings.drag * v2 * dt;
     vel -= drag;
-    
+
     if !vel.is_finite() {
         vel = Vec3::ZERO;
     }
diff --git a/src/camera.rs b/src/camera.rs
index f4a121b..3137601 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{geometry::CyberBike, input::InputState, physics::MovementSettings};
+use crate::{geometry::CyberBike, input::InputState, action::MovementSettings};
 
 pub(crate) const CAM_DIST: f32 = 50.0;
 
diff --git a/src/geometry.rs b/src/geometry.rs
index f97445b..a72ab72 100644
--- a/src/geometry.rs
+++ b/src/geometry.rs
@@ -44,7 +44,7 @@ fn setup_giant_sphere(
 }
 
 fn setup_player(mut commands: Commands, asset_server: Res<AssetServer>) {
-    use crate::physics::PlayerState;
+    use crate::action::PlayerState;
     commands
         .spawn_bundle((
             Transform {
diff --git a/src/lib.rs b/src/lib.rs
index e8ca28c..de2f910 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@ pub mod camera;
 pub mod geometry;
 pub mod input;
 pub mod lights;
-pub mod physics;
+pub mod action;
 pub mod ui;
 
 pub fn disable_mouse_trap(mut windows: ResMut<Windows>) {
diff --git a/src/main.rs b/src/main.rs
index 9c82524..c965760 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ use cyber_rider::{
     geometry::CyberGeomPlugin,
     input::CyberInputPlugin,
     lights::CyberSpaceLightsPlugin,
-    physics::{CyberPhysicsPlugin, MovementSettings},
+    action::{CyberPhysicsPlugin, MovementSettings},
     ui::CyberUIPlugin,
 };
 
diff --git a/src/ui.rs b/src/ui.rs
index 5a998f6..2f38fdf 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::physics::PlayerState;
+use crate::{geometry::PLANET_RADIUS, action::PlayerState};
 
 #[derive(Component)]
 struct UpText;
@@ -32,10 +32,17 @@ fn setup_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
         .insert(UpText);
 }
 
-fn update_ui(pstate_query: Query<&PlayerState>, mut text_query: Query<&mut Text, With<UpText>>) {
+fn update_ui(
+    pstate_query: Query<(&PlayerState, &Transform)>,
+    mut text_query: Query<&mut Text, With<UpText>>,
+) {
     let mut text = text_query.single_mut();
     let pstate = pstate_query.single();
-    text.sections[0].value = format!("{:.2}", pstate.velocity.length());
+    text.sections[0].value = format!(
+        "spd: {:.2}\nalt: {:.2}",
+        pstate.0.velocity.length(),
+        pstate.1.translation.length() - PLANET_RADIUS
+    );
 }
 
 pub struct CyberUIPlugin;