From 198da2c8500eb6113e4a0b9ab4c376f50b0c4eeb Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 16:14:57 +0100
Subject: [PATCH 01/28] Let's try out bevy_xpbd_3d. Added it as dependency.

---
 Cargo.lock  | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml  |   1 +
 src/main.rs |   1 +
 3 files changed, 282 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 48436ee..10bc1ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1059,6 +1059,34 @@ dependencies = [
  "winit",
 ]
 
+[[package]]
+name = "bevy_xpbd_3d"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0425ea7361b9b27c2a382e0663deb42f41147eee60fb2b3d5fa7e42d363ea848"
+dependencies = [
+ "bevy",
+ "bevy_math",
+ "bevy_xpbd_derive",
+ "derive_more",
+ "fxhash",
+ "indexmap",
+ "itertools",
+ "nalgebra",
+ "parry3d",
+ "parry3d-f64",
+]
+
+[[package]]
+name = "bevy_xpbd_derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e1ef1d5e328abe1b76df974245f78e17fd17867583883d5e77444c6a8223a64"
+dependencies = [
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.69.4"
@@ -1397,6 +1425,12 @@ dependencies = [
  "const_soft_float",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1498,6 +1532,25 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.19"
@@ -1539,8 +1592,10 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
+ "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -1774,6 +1829,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "gethostname"
 version = "0.4.3"
@@ -2243,6 +2307,12 @@ dependencies = [
  "windows-targets 0.52.4",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
 [[package]]
 name = "libredox"
 version = "0.0.2"
@@ -2313,6 +2383,16 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
+[[package]]
+name = "matrixmultiply"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
+dependencies = [
+ "autocfg",
+ "rawpointer",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.1"
@@ -2411,6 +2491,34 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "nalgebra"
+version = "0.32.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
+dependencies = [
+ "approx",
+ "glam",
+ "matrixmultiply",
+ "nalgebra-macros",
+ "num-complex",
+ "num-rational",
+ "num-traits",
+ "simba",
+ "typenum",
+]
+
+[[package]]
+name = "nalgebra-macros"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ndk"
 version = "0.8.0"
@@ -2488,6 +2596,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-derive"
 version = "0.3.3"
@@ -2510,6 +2627,26 @@ dependencies = [
  "syn 2.0.52",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.18"
@@ -2517,6 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -2680,6 +2818,7 @@ version = "0.3.0"
 dependencies = [
  "bevy",
  "bevy_embedded_assets",
+ "bevy_xpbd_3d",
  "regex",
 ]
 
@@ -2727,6 +2866,50 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "parry3d"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ccba18a65dba56c08dadfa936e0c9efbc883b3a26dc77d2685f78be10f7667c"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "bitflags 1.3.2",
+ "downcast-rs",
+ "either",
+ "nalgebra",
+ "num-derive 0.4.2",
+ "num-traits",
+ "rayon",
+ "rustc-hash",
+ "simba",
+ "slab",
+ "smallvec",
+ "spade",
+]
+
+[[package]]
+name = "parry3d-f64"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d259245abcc09379798e4d373d9019e0df4dc6f7f128ecd68700a5927dc32034"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "bitflags 1.3.2",
+ "downcast-rs",
+ "either",
+ "nalgebra",
+ "num-derive 0.4.2",
+ "num-traits",
+ "rayon",
+ "rustc-hash",
+ "simba",
+ "slab",
+ "smallvec",
+ "spade",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.14"
@@ -2865,6 +3048,32 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
 
+[[package]]
+name = "rawpointer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rectangle-pack"
 version = "0.4.2"
@@ -2939,6 +3148,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
+[[package]]
+name = "robust"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
+
 [[package]]
 name = "rodio"
 version = "0.17.3"
@@ -2968,6 +3183,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.31"
@@ -2998,6 +3222,15 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
+[[package]]
+name = "safe_arch"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -3013,6 +3246,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "semver"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+
 [[package]]
 name = "serde"
 version = "1.0.197"
@@ -3059,6 +3298,19 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "simba"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "wide",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -3112,6 +3364,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "spade"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00"
+dependencies = [
+ "hashbrown",
+ "num-traits",
+ "robust",
+ "smallvec",
+]
+
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
@@ -3351,6 +3615,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -3612,6 +3882,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wide"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c"
+dependencies = [
+ "bytemuck",
+ "safe_arch",
+]
+
 [[package]]
 name = "widestring"
 version = "1.0.2"
diff --git a/Cargo.toml b/Cargo.toml
index 1b63932..26eb291 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ rust-version = "1.76.0"
 [dependencies]
 regex = "1"
 bevy_embedded_assets = "0.10.2"
+bevy_xpbd_3d = "0.4"
 
 [dependencies."bevy"]
 version = "0.13.0"
diff --git a/src/main.rs b/src/main.rs
index 0a3b8b8..b59b972 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,6 +32,7 @@ fn main() {
             OutFlyPlugin,
         )).run();
     } else {
+        // In release builds, embed assets into the binary
         App::new().add_plugins((
             EmbeddedAssetPlugin { mode: PluginMode::ReplaceDefault },
             OutFlyPlugin,

From 25db91f39e2ea67be6abde461bc8befc650f7389 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 16:33:12 +0100
Subject: [PATCH 02/28] implement controls and basic collisions

---
 src/actor.rs  | 14 --------------
 src/camera.rs | 21 +++++++++++++--------
 src/main.rs   |  4 +---
 src/world.rs  | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index 80e8823..067d7dd 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -11,7 +11,6 @@ impl Plugin for ActorPlugin {
         app.register_type::<ChatBranch>();
         app.add_systems(FixedUpdate, (
             update_physics_lifeforms,
-            update_physics_actors,
         ));
         app.add_systems(Update, (
             handle_new_conversations,
@@ -187,19 +186,6 @@ const SUIT_SIMPLE: Suit = Suit {
     integrity: 1e5,
 };
 
-pub fn update_physics_actors(
-    time: Res<Time>,
-    mut q_actors: Query<(&mut Actor, &mut Transform)>,
-) {
-    let d = time.delta_seconds();
-    for (actor, mut transform) in q_actors.iter_mut() {
-        transform.rotate(actor.angular_momentum);
-        // TODO: animate only a step based on time between update:
-        //transform.rotate(actor.angular_momentum.slerp(Quat::IDENTITY, d)); // not working
-        transform.translation += d * actor.v;
-    }
-}
-
 pub fn update_physics_lifeforms(
     time: Res<Time>,
     mut query: Query<(&mut LifeForm, &mut Suit, &Actor)>,
diff --git a/src/camera.rs b/src/camera.rs
index 0a65f49..623db67 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,6 +1,7 @@
 use bevy::prelude::*;
 use bevy::input::mouse::MouseMotion;
 use bevy::window::PrimaryWindow;
+use bevy_xpbd_3d::prelude::*;
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
 
@@ -55,7 +56,9 @@ fn run_camera_controller(
             &mut Projection,
             &mut actor::Actor,
             &actor::LifeForm,
-            &mut actor::Engine
+            &mut actor::Engine,
+            &mut AngularVelocity,
+            &mut LinearVelocity,
         ), (With<Camera>, Without<actor::PlayerDrivesThis>)>,
 ) {
     let dt = time.delta_seconds();
@@ -67,7 +70,7 @@ fn run_camera_controller(
         focused = window_result.unwrap().focused;
     }
 
-    if let Ok((mut transform, mut controller, mut projection, mut actor, lifeform, player_engine)) = query.get_single_mut() {
+    if let Ok((mut transform, mut controller, mut projection, mut actor, lifeform, player_engine, mut angularvelocity, mut v)) = query.get_single_mut() {
         if !controller.initialized {
             controller.initialized = true;
             transform.rotation =
@@ -78,6 +81,8 @@ fn run_camera_controller(
             return;
         }
 
+        angularvelocity.0 = Vec3::splat(0.0);
+
         // Handle key input
         let mut axis_input = Vec3::ZERO;
         if focused {
@@ -100,7 +105,7 @@ fn run_camera_controller(
                 axis_input.y -= 1.2;
             }
             if key_input.pressed(settings.key_stop) {
-                let stop_direction = -actor.v.normalize();
+                let stop_direction = -v.normalize();
                 if stop_direction.length_squared() > 0.3 {
                     axis_input += 1.0 * (transform.rotation.inverse() * stop_direction);
                 }
@@ -131,17 +136,17 @@ fn run_camera_controller(
             let threshold = 1e-5;
             if key_input.pressed(settings.key_stop) {
                 for i in 0..3 {
-                    if actor.v[i].abs() < threshold {
-                        actor.v[i] = 0.0;
+                    if v[i].abs() < threshold {
+                        v[i] = 0.0;
                     }
-                    else if actor.v[i].signum() != (actor.v[i] + acceleration_total[i]).signum() {
+                    else if v[i].signum() != (v[i] + acceleration_total[i]).signum() {
                         // Overshoot
-                        actor.v[i] = 0.0;
+                        v[i] = 0.0;
                         acceleration_total[i] = 0.0;
                     }
                 }
             }
-            actor.v += acceleration_total;
+            v.0 += acceleration_total;
             engine.current_warmup = (engine.current_warmup + dt / engine.warmup_seconds).clamp(0.0, 1.0);
             play_thruster_sound = !settings.mute_sfx;
         }
diff --git a/src/main.rs b/src/main.rs
index b59b972..a192829 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,9 +28,7 @@ fn main() {
         }
     }
     if cfg!(debug_assertions) {
-        App::new().add_plugins((
-            OutFlyPlugin,
-        )).run();
+        App::new().add_plugins(OutFlyPlugin).run();
     } else {
         // In release builds, embed assets into the binary
         App::new().add_plugins((
diff --git a/src/world.rs b/src/world.rs
index 016db7e..29bc324 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -7,6 +7,7 @@ use bevy::prelude::*;
 //use bevy::render::render_resource::{TextureViewDescriptor, TextureViewDimension};
 use bevy::pbr::CascadeShadowConfigBuilder;
 use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
+use bevy_xpbd_3d::prelude::*;
 use std::f32::consts::PI;
 
 const ASTEROID_SIZE: f32 = 100.0;
@@ -40,6 +41,7 @@ impl Plugin for WorldPlugin {
         app.add_systems(Startup, (setup, load_defs));
         //app.add_systems(Update, asset_loaded.after(load_cubemap_asset));
         //app.add_systems(Update, swap_world_on_ar_toggle);
+        app.add_plugins(PhysicsPlugins::default());
         app.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)));
     }
 }
@@ -81,6 +83,9 @@ pub fn setup(
     // Add player
     commands.spawn((
         actor::Player,
+        RigidBody::Dynamic,
+        AngularVelocity(Vec3::new(0.0, 0.0, 0.0)),
+        Collider::cuboid(1.0, 1.0, 1.0),
         actor::Actor {
             angular_momentum: Quat::IDENTITY,
             ..default()
@@ -391,6 +396,8 @@ impl ParserState {
                     component_suit,
                     component_talker,
                     component_model,
+                    RigidBody::Dynamic,
+                    Collider::cuboid(1.0, 1.0, 1.0),
                 ));
             }
             else {
@@ -399,6 +406,8 @@ impl ParserState {
                     component_lifeform,
                     component_suit,
                     component_model,
+                    RigidBody::Dynamic,
+                    Collider::cuboid(1.0, 1.0, 1.0),
                 ));
             }
         }
@@ -408,6 +417,8 @@ impl ParserState {
                     component_actor,
                     component_talker,
                     component_model,
+                    RigidBody::Dynamic,
+                    Collider::cuboid(1.0, 1.0, 1.0),
                 ));
             }
             else {
@@ -417,12 +428,16 @@ impl ParserState {
                         component_model,
                         component_vehicle,
                         component_engine,
+                        RigidBody::Dynamic,
+                        Collider::cuboid(1.0, 1.0, 1.0),
                     ));
                 }
                 else {
                     commands.spawn((
                         component_actor,
                         component_model,
+                        RigidBody::Dynamic,
+                        Collider::cuboid(1.0, 1.0, 1.0),
                     ));
                 }
             }

From c6b8d21c54b91aed227ba49a84e600d93df33df9 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 16:39:37 +0100
Subject: [PATCH 03/28] disable downward gravity.... =D

---
 src/world.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/world.rs b/src/world.rs
index 29bc324..7946397 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -43,6 +43,7 @@ impl Plugin for WorldPlugin {
         //app.add_systems(Update, swap_world_on_ar_toggle);
         app.add_plugins(PhysicsPlugins::default());
         app.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)));
+        app.insert_resource(Gravity(Vec3::splat(0.0)));
     }
 }
 

From c390a18ae50b9835f2d35b1217be6670fc20e2f5 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 16:58:42 +0100
Subject: [PATCH 04/28] add crash sound on collision

---
 README.md               |   1 +
 assets/sounds/crash.ogg | Bin 0 -> 13008 bytes
 src/actor.rs            |  16 ++++++++++++++++
 src/audio.rs            |   7 +++++++
 src/camera.rs           |   9 ++++++++-
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 assets/sounds/crash.ogg

diff --git a/README.md b/README.md
index e63ec11..fcaaf3d 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ More information here: https://bevy-cheatbook.github.io/setup/cross/linux-window
 - https://pixabay.com/sound-effects/electricity-6353
 - https://pixabay.com/sound-effects/ducati-696-monster-33217
 - https://pixabay.com/sound-effects/high-energy-humming-195612
+- https://pixabay.com/sound-effects/box-crash-106687
 - Music: [Dead Space Style Ambient Music](https://pixabay.com/music/ambient-dead-space-style-ambient-music-184793) by [Sharvarian](https://www.fiverr.com/sharvarian)
 - Star chart based on the [HYG Stellar database](https://github.com/astronexus/HYG-Database)
 - Custom font Yupiter is based on:
diff --git a/assets/sounds/crash.ogg b/assets/sounds/crash.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..378c8afecd2ce38a6c06e8a174a52d7c920ccced
GIT binary patch
literal 13008
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
JSGVEr{{XEx+QR?<

literal 0
HcmV?d00001

diff --git a/src/actor.rs b/src/actor.rs
index 067d7dd..71848ca 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use bevy_xpbd_3d::prelude::*;
 use crate::{nature, settings, actor, audio, hud};
 
 pub const ENGINE_SPEED_FACTOR: f32 = 30.0;
@@ -19,6 +20,7 @@ impl Plugin for ActorPlugin {
             handle_input,
             handle_chat_scripts,
             handle_vehicle_enter_exit,
+            handle_collisions,
         ));
         app.add_event::<StartConversationEvent>();
         app.add_event::<SendMessageEvent>();
@@ -552,3 +554,17 @@ pub fn handle_chat_scripts(
         }
     }
 }
+
+fn handle_collisions(
+    mut collision_event_reader: EventReader<Collision>,
+    mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
+    q_player: Query<Entity, With<Player>>,
+) {
+    if let Ok(player) = q_player.get_single() {
+        for Collision(contacts) in collision_event_reader.read() {
+            if contacts.entity1 == player || contacts.entity2 == player {
+                ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Crash));
+            }
+        }
+    }
+}
diff --git a/src/audio.rs b/src/audio.rs
index d582945..f3bb309 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -13,6 +13,7 @@ const ASSET_ROCKET: &str = "sounds/rocket.ogg";
 const ASSET_ION: &str = "sounds/ion.ogg";
 //const ASSET_WAKEUP: &str = "sounds/wakeup.ogg";
 const ASSET_BIKESTART: &str = "sounds/bikestart.ogg";
+const ASSET_CRASH: &str = "sounds/crash.ogg";
 
 pub struct AudioPlugin;
 impl Plugin for AudioPlugin {
@@ -33,6 +34,7 @@ pub enum Sfx {
     Ping,
     Connect,
     EnterVehicle,
+    Crash,
     None,
 }
 
@@ -49,6 +51,7 @@ pub enum Sfx {
 #[derive(Resource)] pub struct SoundPing(Handle<AudioSource>);
 #[derive(Resource)] pub struct SoundConnect(Handle<AudioSource>);
 #[derive(Resource)] pub struct SoundBikeStart(Handle<AudioSource>);
+#[derive(Resource)] pub struct SoundCrash(Handle<AudioSource>);
 
 pub fn setup(
     mut commands: Commands,
@@ -113,6 +116,7 @@ pub fn setup(
     commands.insert_resource(SoundPing(asset_server.load(ASSET_PING)));
     commands.insert_resource(SoundConnect(asset_server.load(ASSET_CONNECT)));
     commands.insert_resource(SoundBikeStart(asset_server.load(ASSET_BIKESTART)));
+    commands.insert_resource(SoundCrash(asset_server.load(ASSET_CRASH)));
 }
 
 pub fn toggle_bgm(
@@ -143,6 +147,7 @@ pub fn play_sfx(
     sound_ping: Res<SoundPing>,
     sound_connect: Res<SoundConnect>,
     sound_bikestart: Res<SoundBikeStart>,
+    sound_crash: Res<SoundCrash>,
 ) {
     if settings.mute_sfx && !events_sfx.is_empty() {
         events_sfx.clear();
@@ -160,6 +165,7 @@ pub fn play_sfx(
                 Sfx::Ping => sound_ping.0.clone(),
                 Sfx::Connect => sound_connect.0.clone(),
                 Sfx::EnterVehicle => sound_bikestart.0.clone(),
+                Sfx::Crash => sound_crash.0.clone(),
                 Sfx::None => sound_ping.0.clone(),
             },
             settings: PlaybackSettings::DESPAWN,
@@ -175,6 +181,7 @@ pub fn str2sfx(sfx_label: &str) -> Sfx {
         "ping" => Sfx::Ping,
         "connect" => Sfx::Connect,
         "entervehicle" => Sfx::EnterVehicle,
+        "crash" => Sfx::Crash,
         _ => Sfx::None,
     };
 }
diff --git a/src/camera.rs b/src/camera.rs
index 623db67..33fd0f1 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -81,7 +81,14 @@ fn run_camera_controller(
             return;
         }
 
-        angularvelocity.0 = Vec3::splat(0.0);
+        if angularvelocity.length_squared() > 0.0001 {
+            angularvelocity.x *= 0.98;
+            angularvelocity.y *= 0.98;
+            angularvelocity.z *= 0.98;
+        }
+        else {
+            angularvelocity.0 = Vec3::splat(0.0);
+        }
 
         // Handle key input
         let mut axis_input = Vec3::ZERO;

From 9534504b208aa527359ed6a98a1f5918cd5f408f Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 17:18:43 +0100
Subject: [PATCH 05/28] cleanup

---
 src/world.rs | 112 +++++++++++++++------------------------------------
 1 file changed, 33 insertions(+), 79 deletions(-)

diff --git a/src/world.rs b/src/world.rs
index 7946397..8b15c5c 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -351,32 +351,13 @@ impl ParserState {
         self.reset_message();
     }
     fn spawn_actor(&mut self, commands: &mut Commands, asset_server: &Res<AssetServer>) {
-        let component_actor = actor::Actor {
+        let mut actor = commands.spawn_empty();
+        actor.insert(actor::Actor {
             angular_momentum: self.angular_momentum,
             id: self.id.clone(),
             ..default()
-        };
-        let component_lifeform = actor::LifeForm::default();
-        let component_talker = actor::Talker {
-            conv_id: self.chat.clone(),
-            ..default()
-        };
-        let component_vehicle = actor::Vehicle;
-        let component_engine = actor::Engine {
-            thrust_forward: self.thrust_forward,
-            thrust_back: self.thrust_back,
-            thrust_sideways: self.thrust_sideways,
-            reaction_wheels: self.reaction_wheels,
-            warmup_seconds: self.warmup_seconds,
-            engine_type: self.engine_type,
-            ..default()
-        };
-        let component_suit = actor::Suit {
-            oxygen: self.oxygen,
-            oxygen_max: nature::OXY_D,
-            ..default()
-        };
-        let component_model = SceneBundle {
+        });
+        actor.insert(SceneBundle {
             transform: Transform {
                 translation: self.pos,
                 scale: Vec3::splat(self.model_scale),
@@ -384,65 +365,38 @@ impl ParserState {
             },
             scene: asset_server.load(asset_name_to_path(self.model.as_str())),
             ..default()
-        };
+        });
+        if self.is_lifeform {
+            actor.insert(actor::LifeForm::default());
+            actor.insert(actor::Suit {
+                oxygen: self.oxygen,
+                oxygen_max: nature::OXY_D,
+                ..default()
+            });
+        }
+        if !self.chat.is_empty() {
+            actor.insert(actor::Talker {
+                conv_id: self.chat.clone(),
+                ..default()
+            });
+        }
+        if self.is_vehicle {
+            actor.insert(actor::Vehicle);
+            actor.insert(actor::Engine {
+                thrust_forward: self.thrust_forward,
+                thrust_back: self.thrust_back,
+                thrust_sideways: self.thrust_sideways,
+                reaction_wheels: self.reaction_wheels,
+                warmup_seconds: self.warmup_seconds,
+                engine_type: self.engine_type,
+                ..default()
+            });
+        }
+        actor.insert(RigidBody::Dynamic);
+        actor.insert(Collider::cuboid(1.0, 1.0, 1.0));
 
-        // TODO: is there a more dynamic way to construct this...?
         info!("Spawning actor {} with model {} at {}/{}/{}",
               self.name, self.model, self.pos.x, self.pos.y, self.pos.z);
-        if self.is_lifeform {
-            if !self.chat.is_empty() {
-                commands.spawn((
-                    component_actor,
-                    component_lifeform,
-                    component_suit,
-                    component_talker,
-                    component_model,
-                    RigidBody::Dynamic,
-                    Collider::cuboid(1.0, 1.0, 1.0),
-                ));
-            }
-            else {
-                commands.spawn((
-                    component_actor,
-                    component_lifeform,
-                    component_suit,
-                    component_model,
-                    RigidBody::Dynamic,
-                    Collider::cuboid(1.0, 1.0, 1.0),
-                ));
-            }
-        }
-        else {
-            if !self.chat.is_empty() {
-                commands.spawn((
-                    component_actor,
-                    component_talker,
-                    component_model,
-                    RigidBody::Dynamic,
-                    Collider::cuboid(1.0, 1.0, 1.0),
-                ));
-            }
-            else {
-                if self.is_vehicle {
-                    commands.spawn((
-                        component_actor,
-                        component_model,
-                        component_vehicle,
-                        component_engine,
-                        RigidBody::Dynamic,
-                        Collider::cuboid(1.0, 1.0, 1.0),
-                    ));
-                }
-                else {
-                    commands.spawn((
-                        component_actor,
-                        component_model,
-                        RigidBody::Dynamic,
-                        Collider::cuboid(1.0, 1.0, 1.0),
-                    ));
-                }
-            }
-        }
         self.reset();
     }
     fn spawn_entities(&mut self, commands: &mut Commands, asset_server: &Res<AssetServer>) {

From f0739606add6492b58a5c10b89a6254f928b4bd6 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 17:21:46 +0100
Subject: [PATCH 06/28] less debug info

---
 src/world.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world.rs b/src/world.rs
index 8b15c5c..e8bf408 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -395,8 +395,8 @@ impl ParserState {
         actor.insert(RigidBody::Dynamic);
         actor.insert(Collider::cuboid(1.0, 1.0, 1.0));
 
-        info!("Spawning actor {} with model {} at {}/{}/{}",
-              self.name, self.model, self.pos.x, self.pos.y, self.pos.z);
+        //info!("Spawning actor {} with model {} at {}/{}/{}",
+        //      self.name, self.model, self.pos.x, self.pos.y, self.pos.z);
         self.reset();
     }
     fn spawn_entities(&mut self, commands: &mut Commands, asset_server: &Res<AssetServer>) {

From 349e38e84872df20359f2ba87dd30ac7c47d196a Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 17:22:54 +0100
Subject: [PATCH 07/28] cleanup

---
 src/camera.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 33fd0f1..525b6d8 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -54,7 +54,6 @@ fn run_camera_controller(
             &mut Transform,
             &mut CameraController,
             &mut Projection,
-            &mut actor::Actor,
             &actor::LifeForm,
             &mut actor::Engine,
             &mut AngularVelocity,
@@ -70,7 +69,7 @@ fn run_camera_controller(
         focused = window_result.unwrap().focused;
     }
 
-    if let Ok((mut transform, mut controller, mut projection, mut actor, lifeform, player_engine, mut angularvelocity, mut v)) = query.get_single_mut() {
+    if let Ok((mut transform, mut controller, mut projection, lifeform, player_engine, mut angularvelocity, mut v)) = query.get_single_mut() {
         if !controller.initialized {
             controller.initialized = true;
             transform.rotation =

From bb73b1ed1d8d899bc8bceca53c49691377a241f0 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 18:20:12 +0100
Subject: [PATCH 08/28] implement collider/mass commands

---
 src/defs.txt |  7 +++++++
 src/world.rs | 41 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/defs.txt b/src/defs.txt
index afc4451..72096d0 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -12,6 +12,11 @@ actor 1000 20 300 monolith
     rotationx 0.5
     angularmomentum 0.0 0.0 0.01
 
+actor 10 20 30 monolith
+    scale 2
+    rotationx 0.5
+    angularmomentum 0.0 0.0 0.01
+
 actor 10000 2000 -3500 monolith
     scale 2
     rotationx 0.5
@@ -97,6 +102,8 @@ actor 10 -30 20 MeteorAceGT
     vehicle yes
     thrust 70 13.7 9.4 0.5 20
     engine ion
+    collider sphere 2
+    mass 500
 
 actor 10 0 70 suit
     name Icarus
diff --git a/src/world.rs b/src/world.rs
index e8bf408..68e545f 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -87,6 +87,7 @@ pub fn setup(
         RigidBody::Dynamic,
         AngularVelocity(Vec3::new(0.0, 0.0, 0.0)),
         Collider::cuboid(1.0, 1.0, 1.0),
+        ColliderDensity(200.0),
         actor::Actor {
             angular_momentum: Quat::IDENTITY,
             ..default()
@@ -255,6 +256,8 @@ struct ParserState {
     warmup_seconds: f32,
     engine_type: actor::EngineType,
     oxygen: f32,
+    mass: f32,
+    collider: Collider,
 
     // Chat fields
     delay: f64,
@@ -295,6 +298,8 @@ impl Default for ParserState {
             warmup_seconds: default_engine.warmup_seconds,
             engine_type: default_engine.engine_type,
             oxygen: nature::OXY_D,
+            mass: 1.0,
+            collider: Collider::sphere(1.0),
 
             delay: 0.0,
             text: "".to_string(),
@@ -366,6 +371,13 @@ impl ParserState {
             scene: asset_server.load(asset_name_to_path(self.model.as_str())),
             ..default()
         });
+
+        // Physics Parameters
+        let fix_scale = 1.0 / self.model_scale.powf(3.0);
+        actor.insert(RigidBody::Dynamic);
+        actor.insert(self.collider.clone());
+        actor.insert(ColliderDensity(self.mass * fix_scale));
+
         if self.is_lifeform {
             actor.insert(actor::LifeForm::default());
             actor.insert(actor::Suit {
@@ -392,8 +404,6 @@ impl ParserState {
                 ..default()
             });
         }
-        actor.insert(RigidBody::Dynamic);
-        actor.insert(Collider::cuboid(1.0, 1.0, 1.0));
 
         //info!("Spawning actor {} with model {} at {}/{}/{}",
         //      self.name, self.model, self.pos.x, self.pos.y, self.pos.z);
@@ -550,6 +560,33 @@ pub fn load_defs(
             ["engine", "ion"] => {
                 state.engine_type = actor::EngineType::Ion;
             }
+            ["mass", value] => {
+                if let Ok(value_float) = value.parse::<f32>() {
+                    state.mass = value_float;
+                }
+                else {
+                    error!("Can't parse float: {line}");
+                    continue;
+                }
+            }
+            ["collider", "sphere", radius] => {
+                if let Ok(radius_float) = radius.parse::<f32>() {
+                    state.collider = Collider::sphere(radius_float);
+                }
+                else {
+                    error!("Can't parse float: {line}");
+                    continue;
+                }
+            }
+            ["collider", "capsule", height, radius] => {
+                if let (Ok(height_float), Ok(radius_float)) = (height.parse::<f32>(), radius.parse::<f32>()) {
+                    state.collider = Collider::capsule(height_float, radius_float);
+                }
+                else {
+                    error!("Can't parse float: {line}");
+                    continue;
+                }
+            }
 
             // Parsing chats
             ["chat", chat_name] => {

From b78340dd1aea80c62a427d1624022b7dd926a930 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 29 Mar 2024 19:41:46 +0100
Subject: [PATCH 09/28] implement 3rd person view, flexible attachment of
 camera to actors

---
 README.md       |  1 +
 src/actor.rs    | 11 +++++-
 src/camera.rs   | 98 ++++++++++++++++++++++++++++++++++++++-----------
 src/defs.txt    | 11 ++++++
 src/settings.rs |  4 ++
 src/world.rs    | 69 +++++++++++++---------------------
 6 files changed, 127 insertions(+), 67 deletions(-)

diff --git a/README.md b/README.md
index fcaaf3d..b9ba3cf 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ Key features:
 - t: toggle music (NOTE: currently no music is included in the git repo)
 - m: mute sound effects
 - q: enter/exit vehicle
+- f: toggle 3rd person view
 - TAB: toggle augmented reality overlay (HUD, low-light amplifier)
 
 # System Requirements
diff --git a/src/actor.rs b/src/actor.rs
index 71848ca..ce451e3 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -64,6 +64,7 @@ pub struct Actor {
     pub v: Vec3, // velocity
     pub angular_momentum: Quat,
     pub inside_entity: u32,
+    pub camdistance: f32,
 }
 
 impl Default for Actor {
@@ -75,12 +76,14 @@ impl Default for Actor {
             v: Vec3::ZERO,
             inside_entity: NO_RIDE,
             angular_momentum: Quat::from_euler(EulerRot::XYZ, 0.001, 0.01, 0.003),
+            camdistance: 10.0,
         }
     }
 }
 
-#[derive(Component)] pub struct Player;
-#[derive(Component)] pub struct PlayerDrivesThis;
+#[derive(Component)] pub struct Player; // Attached to the suit of the player
+#[derive(Component)] pub struct PlayerDrivesThis; // Attached to the entered vehicle
+#[derive(Component)] pub struct PlayerCamera; // Attached to the actor to use as point of view
 #[derive(Component)] pub struct PlayerInConversation;
 #[derive(Component)] pub struct InConversationWithPlayer;
 #[derive(Component)] pub struct ActorEnteringVehicle;
@@ -310,6 +313,8 @@ pub fn handle_vehicle_enter_exit(
                                 //player_actor.inside_entity = entity.index();
                                 *vehicle_vis = Visibility::Hidden;
                                 driver_actor.v = vehicle_actor.v;
+                                commands.entity(driver).remove::<PlayerCamera>();
+                                commands.entity(vehicle).insert(PlayerCamera);
                                 commands.entity(vehicle).insert(PlayerDrivesThis);
                             }
                         }
@@ -322,6 +327,8 @@ pub fn handle_vehicle_enter_exit(
                                 vehicle_actor.v = driver_actor.v;
                                 vehicle_actor.angular_momentum = driver_actor.angular_momentum;
                                 *vehicle_trans = driver_trans.clone();
+                                commands.entity(vehicle).remove::<PlayerCamera>();
+                                commands.entity(driver).insert(PlayerCamera);
                                 commands.entity(vehicle).remove::<PlayerDrivesThis>();
                             }
                             else {
diff --git a/src/camera.rs b/src/camera.rs
index 525b6d8..56f97aa 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,6 +1,7 @@
 use bevy::prelude::*;
 use bevy::input::mouse::MouseMotion;
 use bevy::window::PrimaryWindow;
+use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
 use bevy_xpbd_3d::prelude::*;
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
@@ -9,6 +10,9 @@ pub struct CameraControllerPlugin;
 
 impl Plugin for CameraControllerPlugin {
     fn build(&self, app: &mut App) {
+        app.add_systems(Startup, setup_camera);
+        app.add_systems(Update, handle_input);
+        app.add_systems(Update, manage_player_actor);
         app.add_systems(Update, run_camera_controller);
     }
 }
@@ -39,6 +43,50 @@ impl Default for CameraController {
     }
 }
 
+fn setup_camera(
+    mut commands: Commands,
+) {
+    // Add player
+    commands.spawn((
+        Camera3dBundle {
+            camera: Camera {
+                hdr: true, // HDR is required for bloom
+                ..default()
+            },
+            transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
+            ..default()
+        },
+        CameraController::default(),
+        BloomSettings {
+            composite_mode: BloomCompositeMode::EnergyConserving,
+            ..default()
+        },
+    ));
+}
+
+pub fn handle_input(
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+    mut settings: ResMut<settings::Settings>,
+) {
+    if keyboard_input.just_pressed(settings.key_camera) {
+        settings.third_person ^= true;
+    }
+}
+
+fn manage_player_actor(
+    settings: Res<settings::Settings>,
+    mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>
+) {
+    for mut vis in &mut q_playercam {
+        if settings.third_person {
+            *vis = Visibility::Inherited;
+        }
+        else {
+            *vis = Visibility::Hidden;
+        }
+    }
+}
+
 #[allow(clippy::too_many_arguments)]
 fn run_camera_controller(
     time: Res<Time>,
@@ -50,15 +98,15 @@ fn run_camera_controller(
     rocket_sound_controller: Query<&AudioSink, With<audio::ComponentRocketSound>>,
     ion_sound_controller: Query<&AudioSink, With<audio::ComponentIonSound>>,
     mut q_engine: Query<&mut actor::Engine, With<actor::PlayerDrivesThis>>,
-    mut query: Query<(
+    mut q_camera: Query<(&mut Transform, &mut CameraController, &mut Projection)>,
+    q_player: Query<&actor::LifeForm, With<actor::Player>>,
+    mut q_playercam: Query<(
+            &actor::Actor,
             &mut Transform,
-            &mut CameraController,
-            &mut Projection,
-            &actor::LifeForm,
             &mut actor::Engine,
             &mut AngularVelocity,
             &mut LinearVelocity,
-        ), (With<Camera>, Without<actor::PlayerDrivesThis>)>,
+        ), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<CameraController>)>,
 ) {
     let dt = time.delta_seconds();
     let mut play_thruster_sound = false;
@@ -69,12 +117,11 @@ fn run_camera_controller(
         focused = window_result.unwrap().focused;
     }
 
-    if let Ok((mut transform, mut controller, mut projection, lifeform, player_engine, mut angularvelocity, mut v)) = query.get_single_mut() {
-        if !controller.initialized {
-            controller.initialized = true;
-            transform.rotation =
-                Quat::from_euler(EulerRot::ZYX, 0.0, controller.yaw, controller.pitch);
-        }
+    if let (
+        Ok((mut camera_transform, mut controller, mut projection)),
+        Ok(lifeform),
+        Ok((actor, mut player_transform, player_engine, mut angularvelocity, mut v)),
+    ) = (q_camera.get_single_mut(), q_player.get_single(), q_playercam.get_single_mut()) {
         if !controller.enabled {
             mouse_events.clear();
             return;
@@ -93,16 +140,16 @@ fn run_camera_controller(
         let mut axis_input = Vec3::ZERO;
         if focused {
             if key_input.pressed(settings.key_forward) {
-                axis_input.z -= 1.2;
-            }
-            if key_input.pressed(settings.key_back) {
                 axis_input.z += 1.2;
             }
+            if key_input.pressed(settings.key_back) {
+                axis_input.z -= 1.2;
+            }
             if key_input.pressed(settings.key_right) {
-                axis_input.x += 1.2;
+                axis_input.x -= 1.2;
             }
             if key_input.pressed(settings.key_left) {
-                axis_input.x -= 1.2;
+                axis_input.x += 1.2;
             }
             if key_input.pressed(settings.key_up) {
                 axis_input.y += 1.2;
@@ -113,7 +160,7 @@ fn run_camera_controller(
             if key_input.pressed(settings.key_stop) {
                 let stop_direction = -v.normalize();
                 if stop_direction.length_squared() > 0.3 {
-                    axis_input += 1.0 * (transform.rotation.inverse() * stop_direction);
+                    axis_input += 1.0 * (player_transform.rotation.inverse() * stop_direction);
                 }
             }
         }
@@ -137,7 +184,7 @@ fn run_camera_controller(
         let factor = Vec3::new(right_factor, up_factor, forward_factor);
 
         if axis_input.length_squared() > 0.003 {
-            let acceleration_global = transform.rotation * (axis_input * factor);
+            let acceleration_global = player_transform.rotation * (axis_input * factor);
             let mut acceleration_total = actor::ENGINE_SPEED_FACTOR * dt * acceleration_global;
             let threshold = 1e-5;
             if key_input.pressed(settings.key_stop) {
@@ -169,11 +216,18 @@ fn run_camera_controller(
         if mouse_delta != Vec2::ZERO {
             // Apply look update
             controller.pitch = (controller.pitch
-                - mouse_delta.y * RADIANS_PER_DOT * controller.sensitivity)
+                + mouse_delta.y * RADIANS_PER_DOT * controller.sensitivity)
                 .clamp(-PI / 2., PI / 2.);
-            controller.yaw -= mouse_delta.x * RADIANS_PER_DOT * controller.sensitivity;
-            transform.rotation =
-                Quat::from_euler(EulerRot::ZYX, 0.0, controller.yaw, controller.pitch);
+            controller.yaw += mouse_delta.x * RADIANS_PER_DOT * controller.sensitivity;
+            player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch);
+            camera_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, PI-controller.yaw, -controller.pitch);
+        }
+
+        if settings.third_person {
+            camera_transform.translation = player_transform.translation + camera_transform.rotation * Vec3::new(0.0, 0.0, actor.camdistance);
+        }
+        else {
+            camera_transform.translation = player_transform.translation;
         }
 
         let fov = (lifeform.adrenaline * lifeform.adrenaline * lifeform.adrenaline * 45.0 + 45.0).to_radians();
diff --git a/src/defs.txt b/src/defs.txt
index 72096d0..39fb507 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -1,3 +1,13 @@
+actor 0 0 0 suit
+    player yes
+    mass 200.0
+    scale 1
+    oxygen 0.008
+    health 0.3
+    collider capsule 2 1
+    thrust 1.2 1 1 1 1.5
+    engine monopropellant
+
 actor 300000 0 500000 jupiter
     scale 200000
     rotationy -1.40
@@ -103,6 +113,7 @@ actor 10 -30 20 MeteorAceGT
     thrust 70 13.7 9.4 0.5 20
     engine ion
     collider sphere 2
+    camdistance 50
     mass 500
 
 actor 10 0 70 suit
diff --git a/src/settings.rs b/src/settings.rs
index cd34aa4..bb18ed8 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -10,6 +10,7 @@ pub struct Settings {
     pub font_size_hud: f32,
     pub font_size_conversations: f32,
     pub hud_active: bool,
+    pub third_person: bool,
     pub key_togglehud: KeyCode,
     pub key_exit: KeyCode,
     pub key_restart: KeyCode,
@@ -24,6 +25,7 @@ pub struct Settings {
     pub key_stop: KeyCode,
     pub key_interact: KeyCode,
     pub key_vehicle: KeyCode,
+    pub key_camera: KeyCode,
     pub key_reply1: KeyCode,
     pub key_reply2: KeyCode,
     pub key_reply3: KeyCode,
@@ -56,6 +58,7 @@ impl Default for Settings {
             font_size_hud: 32.0,
             font_size_conversations: 32.0,
             hud_active: false,
+            third_person: false,
             key_togglehud: KeyCode::Tab,
             key_exit: KeyCode::Escape,
             key_restart: KeyCode::F12,
@@ -70,6 +73,7 @@ impl Default for Settings {
             key_stop: KeyCode::Space,
             key_interact: KeyCode::KeyE,
             key_vehicle: KeyCode::KeyQ,
+            key_camera: KeyCode::KeyF,
             key_reply1: KeyCode::Digit1,
             key_reply2: KeyCode::Digit2,
             key_reply3: KeyCode::Digit3,
diff --git a/src/world.rs b/src/world.rs
index 68e545f..2d18c8f 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -1,12 +1,11 @@
 extern crate regex;
-use crate::{actor, camera, nature};
+use crate::{actor, nature};
 use regex::Regex;
 use bevy::prelude::*;
 //use bevy::core_pipeline::Skybox;
 //use bevy::asset::LoadState;
 //use bevy::render::render_resource::{TextureViewDescriptor, TextureViewDimension};
 use bevy::pbr::CascadeShadowConfigBuilder;
-use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
 use bevy_xpbd_3d::prelude::*;
 use std::f32::consts::PI;
 
@@ -81,47 +80,6 @@ pub fn setup(
 //        cubemap_ar_handle: asset_server.load(ASSET_CUBEMAP_AR),
 //    });
 
-    // Add player
-    commands.spawn((
-        actor::Player,
-        RigidBody::Dynamic,
-        AngularVelocity(Vec3::new(0.0, 0.0, 0.0)),
-        Collider::cuboid(1.0, 1.0, 1.0),
-        ColliderDensity(200.0),
-        actor::Actor {
-            angular_momentum: Quat::IDENTITY,
-            ..default()
-        },
-        actor::LifeForm::default(),
-        actor::Suit {
-            oxygen: nature::OXY_H,
-            integrity: 0.3,
-            ..default()
-        },
-        actor::Engine {
-            thrust_forward: 1.2,
-            ..default()
-        },
-        Visibility::Visible,
-        Camera3dBundle {
-            camera: Camera {
-                hdr: true, // HDR is required for bloom
-                ..default()
-            },
-            transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
-            ..default()
-        },
-        camera::CameraController::default(),
-//        Skybox {
-//            image: cubemap_handle,
-//            brightness: SKYBOX_BRIGHTNESS,
-//        },
-        BloomSettings {
-            composite_mode: BloomCompositeMode::EnergyConserving,
-            ..default()
-        },
-    ));
-
     // Generate a bunch of asteriods
     let maxdist = 10;
     for i in -maxdist..maxdist {
@@ -245,6 +203,7 @@ struct ParserState {
     rotation: Quat,
     angular_momentum: Quat,
     pronoun: String,
+    is_player: bool,
     is_lifeform: bool,
     is_alive: bool,
     is_suited: bool,
@@ -258,6 +217,7 @@ struct ParserState {
     oxygen: f32,
     mass: f32,
     collider: Collider,
+    camdistance: f32,
 
     // Chat fields
     delay: f64,
@@ -287,6 +247,7 @@ impl Default for ParserState {
             rotation: Quat::IDENTITY,
             angular_momentum: default_actor.angular_momentum,
             pronoun: "they/them".to_string(),
+            is_player: false,
             is_lifeform: false,
             is_alive: false,
             is_suited: false,
@@ -300,6 +261,7 @@ impl Default for ParserState {
             oxygen: nature::OXY_D,
             mass: 1.0,
             collider: Collider::sphere(1.0),
+            camdistance: default_actor.camdistance,
 
             delay: 0.0,
             text: "".to_string(),
@@ -360,6 +322,7 @@ impl ParserState {
         actor.insert(actor::Actor {
             angular_momentum: self.angular_momentum,
             id: self.id.clone(),
+            camdistance: self.camdistance,
             ..default()
         });
         actor.insert(SceneBundle {
@@ -378,6 +341,11 @@ impl ParserState {
         actor.insert(self.collider.clone());
         actor.insert(ColliderDensity(self.mass * fix_scale));
 
+        // Optional Components
+        if self.is_player {
+            actor.insert(actor::Player);
+            actor.insert(actor::PlayerCamera);
+        }
         if self.is_lifeform {
             actor.insert(actor::LifeForm::default());
             actor.insert(actor::Suit {
@@ -394,6 +362,8 @@ impl ParserState {
         }
         if self.is_vehicle {
             actor.insert(actor::Vehicle);
+        }
+        if self.is_vehicle || self.is_suited {
             actor.insert(actor::Engine {
                 thrust_forward: self.thrust_forward,
                 thrust_back: self.thrust_back,
@@ -587,6 +557,19 @@ pub fn load_defs(
                     continue;
                 }
             }
+            ["player", "yes"] => {
+                state.is_player = true;
+                state.is_alive = true;
+            }
+            ["camdistance", value] => {
+                if let Ok(value_float) = value.parse::<f32>() {
+                    state.camdistance = value_float;
+                }
+                else {
+                    error!("Can't parse float: {line}");
+                    continue;
+                }
+            }
 
             // Parsing chats
             ["chat", chat_name] => {

From a5c796d491e812dbe945d4645ed35fe0996c3303 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 15:37:51 +0100
Subject: [PATCH 10/28] tinkering on 3rd person mode

---
 Cargo.lock    |  4 ++--
 src/actor.rs  |  8 +++-----
 src/camera.rs | 12 ++++++++----
 src/world.rs  |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ca954d..661c372 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2696,7 +2696,7 @@ dependencies = [
  "downcast-rs",
  "either",
  "nalgebra",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "rayon",
  "rustc-hash",
@@ -2718,7 +2718,7 @@ dependencies = [
  "downcast-rs",
  "either",
  "nalgebra",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "rayon",
  "rustc-hash",
diff --git a/src/actor.rs b/src/actor.rs
index ce451e3..8486dac 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -76,7 +76,7 @@ impl Default for Actor {
             v: Vec3::ZERO,
             inside_entity: NO_RIDE,
             angular_momentum: Quat::from_euler(EulerRot::XYZ, 0.001, 0.01, 0.003),
-            camdistance: 10.0,
+            camdistance: 15.0,
         }
     }
 }
@@ -306,10 +306,9 @@ pub fn handle_vehicle_enter_exit(
                     if vehicle == event.vehicle {
                         if event.is_entering {
                             // Entering Vehicle
-                            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
                             *driver_vis = Visibility::Hidden;
-                            *driver_trans = vehicle_trans.clone();
                             if event.is_player {
+                                ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
                                 //player_actor.inside_entity = entity.index();
                                 *vehicle_vis = Visibility::Hidden;
                                 driver_actor.v = vehicle_actor.v;
@@ -320,9 +319,9 @@ pub fn handle_vehicle_enter_exit(
                         }
                         else {
                             // Exiting Vehicle
-                            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
                             *driver_vis = Visibility::Inherited;
                             if event.is_player {
+                                ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
                                 *vehicle_vis = Visibility::Inherited;
                                 vehicle_actor.v = driver_actor.v;
                                 vehicle_actor.angular_momentum = driver_actor.angular_momentum;
@@ -333,7 +332,6 @@ pub fn handle_vehicle_enter_exit(
                             }
                             else {
                                 *driver_trans = vehicle_trans.clone();
-                                *driver_trans = vehicle_trans.clone();
                             }
                         }
                     }
diff --git a/src/camera.rs b/src/camera.rs
index 56f97aa..15f9e88 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -75,7 +75,8 @@ pub fn handle_input(
 
 fn manage_player_actor(
     settings: Res<settings::Settings>,
-    mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>
+    mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>,
+    mut q_hiddenplayer: Query<&mut Visibility, (With<actor::Player>, Without<actor::PlayerCamera>)>,
 ) {
     for mut vis in &mut q_playercam {
         if settings.third_person {
@@ -85,6 +86,9 @@ fn manage_player_actor(
             *vis = Visibility::Hidden;
         }
     }
+    for mut vis in &mut q_hiddenplayer {
+        *vis = Visibility::Hidden;
+    }
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -219,12 +223,12 @@ fn run_camera_controller(
                 + mouse_delta.y * RADIANS_PER_DOT * controller.sensitivity)
                 .clamp(-PI / 2., PI / 2.);
             controller.yaw += mouse_delta.x * RADIANS_PER_DOT * controller.sensitivity;
-            player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch);
-            camera_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, PI-controller.yaw, -controller.pitch);
+            player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch).normalize();
+            camera_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, PI-controller.yaw, -controller.pitch).normalize();
         }
 
         if settings.third_person {
-            camera_transform.translation = player_transform.translation + camera_transform.rotation * Vec3::new(0.0, 0.0, actor.camdistance);
+            camera_transform.translation = player_transform.translation + camera_transform.rotation * (actor.camdistance * Vec3::new(0.0, 0.2, 1.0));
         }
         else {
             camera_transform.translation = player_transform.translation;
diff --git a/src/world.rs b/src/world.rs
index 2d18c8f..b78fbec 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -41,6 +41,7 @@ impl Plugin for WorldPlugin {
         //app.add_systems(Update, asset_loaded.after(load_cubemap_asset));
         //app.add_systems(Update, swap_world_on_ar_toggle);
         app.add_plugins(PhysicsPlugins::default());
+        //app.add_plugins(PhysicsDebugPlugin::default());
         app.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)));
         app.insert_resource(Gravity(Vec3::splat(0.0)));
     }

From 1d2a7b7848354c06d0b6ac758b21c5fbff59b3b0 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 15:49:17 +0100
Subject: [PATCH 11/28] remove unneeded bevy_xpbd_3d features

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 67ba836..64b18a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ rust-version = "1.76.0"
 [dependencies]
 regex = "1"
 bevy = { version = "0.13.0", default-features = false, features = ["jpeg", "bevy_asset", "bevy_audio", "bevy_scene", "bevy_winit", "bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "bevy_render", "bevy_text", "bevy_ui", "multi-threaded", "png", "vorbis", "x11", "tonemapping_luts"]}
+bevy_xpbd_3d = { version = "0.4", default-features = false, features = ["3d", "f32", "parry-f32", "parallel"] }
 bevy_embedded_assets = "0.10.2"
-bevy_xpbd_3d = "0.4"
 
 [features]
 dev = ["bevy/dynamic_linking"]

From bee0d98ae160ba3554a7d64a6c0825732d948fea Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 15:50:36 +0100
Subject: [PATCH 12/28] explicitly set tonemapping to TonyMcMapface

---
 src/camera.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/camera.rs b/src/camera.rs
index 15f9e88..1462b87 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -2,6 +2,7 @@ use bevy::prelude::*;
 use bevy::input::mouse::MouseMotion;
 use bevy::window::PrimaryWindow;
 use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
+use bevy::core_pipeline::tonemapping::Tonemapping;
 use bevy_xpbd_3d::prelude::*;
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
@@ -53,6 +54,7 @@ fn setup_camera(
                 hdr: true, // HDR is required for bloom
                 ..default()
             },
+            tonemapping: Tonemapping::TonyMcMapface,
             transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
             ..default()
         },

From b945d7bda7c3ea606b5ed9a8cee87b237dfe5963 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 16:18:49 +0100
Subject: [PATCH 13/28] add camera::sync_camera_to_player function, fixing cam
 alignment

---
 src/camera.rs | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 1462b87..43e6640 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -14,6 +14,7 @@ impl Plugin for CameraControllerPlugin {
         app.add_systems(Startup, setup_camera);
         app.add_systems(Update, handle_input);
         app.add_systems(Update, manage_player_actor);
+        app.add_systems(Update, sync_camera_to_player);
         app.add_systems(Update, run_camera_controller);
     }
 }
@@ -66,6 +67,29 @@ fn setup_camera(
     ));
 }
 
+pub fn sync_camera_to_player(
+    settings: Res<settings::Settings>,
+    mut q_camera: Query<&mut Transform, With<CameraController>>,
+    q_playercam: Query<(&actor::Actor, &Transform), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<CameraController>)>,
+) {
+    if q_camera.is_empty() || q_playercam.is_empty() {
+        return;
+    }
+    let mut camera_transform = q_camera.get_single_mut().unwrap();
+    let (actor, player_transform) = q_playercam.get_single().unwrap();
+
+    // Rotation
+    camera_transform.rotation = player_transform.rotation * Quat::from_array([0.0, -1.0, 0.0, 0.0]);
+
+    // Translation
+    if settings.third_person {
+        camera_transform.translation = player_transform.translation + camera_transform.rotation * (actor.camdistance * Vec3::new(0.0, 0.2, 1.0));
+    }
+    else {
+        camera_transform.translation = player_transform.translation;
+    }
+}
+
 pub fn handle_input(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut settings: ResMut<settings::Settings>,
@@ -104,10 +128,9 @@ fn run_camera_controller(
     rocket_sound_controller: Query<&AudioSink, With<audio::ComponentRocketSound>>,
     ion_sound_controller: Query<&AudioSink, With<audio::ComponentIonSound>>,
     mut q_engine: Query<&mut actor::Engine, With<actor::PlayerDrivesThis>>,
-    mut q_camera: Query<(&mut Transform, &mut CameraController, &mut Projection)>,
+    mut q_camera: Query<(&mut CameraController, &mut Projection)>,
     q_player: Query<&actor::LifeForm, With<actor::Player>>,
     mut q_playercam: Query<(
-            &actor::Actor,
             &mut Transform,
             &mut actor::Engine,
             &mut AngularVelocity,
@@ -124,9 +147,9 @@ fn run_camera_controller(
     }
 
     if let (
-        Ok((mut camera_transform, mut controller, mut projection)),
+        Ok((mut controller, mut projection)),
         Ok(lifeform),
-        Ok((actor, mut player_transform, player_engine, mut angularvelocity, mut v)),
+        Ok((mut player_transform, player_engine, mut angularvelocity, mut v)),
     ) = (q_camera.get_single_mut(), q_player.get_single(), q_playercam.get_single_mut()) {
         if !controller.enabled {
             mouse_events.clear();
@@ -226,14 +249,6 @@ fn run_camera_controller(
                 .clamp(-PI / 2., PI / 2.);
             controller.yaw += mouse_delta.x * RADIANS_PER_DOT * controller.sensitivity;
             player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch).normalize();
-            camera_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, PI-controller.yaw, -controller.pitch).normalize();
-        }
-
-        if settings.third_person {
-            camera_transform.translation = player_transform.translation + camera_transform.rotation * (actor.camdistance * Vec3::new(0.0, 0.2, 1.0));
-        }
-        else {
-            camera_transform.translation = player_transform.translation;
         }
 
         let fov = (lifeform.adrenaline * lifeform.adrenaline * lifeform.adrenaline * 45.0 + 45.0).to_radians();

From 0456b8506cb0e3ebaa665ecfa1abfc747f29bafd Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 16:27:56 +0100
Subject: [PATCH 14/28] add settings.mouse_sensitivity

---
 src/camera.rs   | 6 ++----
 src/settings.rs | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 43e6640..f32098b 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -28,7 +28,6 @@ pub const RADIANS_PER_DOT: f32 = 1.0 / 180.0;
 pub struct CameraController {
     pub enabled: bool,
     pub initialized: bool,
-    pub sensitivity: f32,
     pub pitch: f32,
     pub yaw: f32,
 }
@@ -38,7 +37,6 @@ impl Default for CameraController {
         Self {
             enabled: true,
             initialized: false,
-            sensitivity: 0.5,
             pitch: 1.0, // pitch=0/yaw=0 -> face sun
             yaw: 0.3,
         }
@@ -245,9 +243,9 @@ fn run_camera_controller(
         if mouse_delta != Vec2::ZERO {
             // Apply look update
             controller.pitch = (controller.pitch
-                + mouse_delta.y * RADIANS_PER_DOT * controller.sensitivity)
+                + mouse_delta.y * RADIANS_PER_DOT * settings.mouse_sensitivity)
                 .clamp(-PI / 2., PI / 2.);
-            controller.yaw += mouse_delta.x * RADIANS_PER_DOT * controller.sensitivity;
+            controller.yaw += mouse_delta.x * RADIANS_PER_DOT * settings.mouse_sensitivity;
             player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch).normalize();
         }
 
diff --git a/src/settings.rs b/src/settings.rs
index bb18ed8..6a9e6d3 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -7,6 +7,7 @@ pub struct Settings {
     pub mute_music: bool,
     pub volume_sfx: u8,
     pub volume_music: u8,
+    pub mouse_sensitivity: f32,
     pub font_size_hud: f32,
     pub font_size_conversations: f32,
     pub hud_active: bool,
@@ -55,6 +56,7 @@ impl Default for Settings {
             mute_music: default_mute_music,
             volume_sfx: 100,
             volume_music: 100,
+            mouse_sensitivity: 0.5,
             font_size_hud: 32.0,
             font_size_conversations: 32.0,
             hud_active: false,

From 6e3d9586387e2e46720cf33e9a80fb290acbc613 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 16:32:42 +0100
Subject: [PATCH 15/28] mouse movement now changes player orientation
 relatively, not absolutely

---
 src/camera.rs | 42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index f32098b..09aa42a 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -24,25 +24,6 @@ impl Plugin for CameraControllerPlugin {
 // it because it felt nice.
 pub const RADIANS_PER_DOT: f32 = 1.0 / 180.0;
 
-#[derive(Component)]
-pub struct CameraController {
-    pub enabled: bool,
-    pub initialized: bool,
-    pub pitch: f32,
-    pub yaw: f32,
-}
-
-impl Default for CameraController {
-    fn default() -> Self {
-        Self {
-            enabled: true,
-            initialized: false,
-            pitch: 1.0, // pitch=0/yaw=0 -> face sun
-            yaw: 0.3,
-        }
-    }
-}
-
 fn setup_camera(
     mut commands: Commands,
 ) {
@@ -57,7 +38,6 @@ fn setup_camera(
             transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
             ..default()
         },
-        CameraController::default(),
         BloomSettings {
             composite_mode: BloomCompositeMode::EnergyConserving,
             ..default()
@@ -67,8 +47,8 @@ fn setup_camera(
 
 pub fn sync_camera_to_player(
     settings: Res<settings::Settings>,
-    mut q_camera: Query<&mut Transform, With<CameraController>>,
-    q_playercam: Query<(&actor::Actor, &Transform), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<CameraController>)>,
+    mut q_camera: Query<&mut Transform, With<Camera>>,
+    q_playercam: Query<(&actor::Actor, &Transform), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<Camera>)>,
 ) {
     if q_camera.is_empty() || q_playercam.is_empty() {
         return;
@@ -126,14 +106,14 @@ fn run_camera_controller(
     rocket_sound_controller: Query<&AudioSink, With<audio::ComponentRocketSound>>,
     ion_sound_controller: Query<&AudioSink, With<audio::ComponentIonSound>>,
     mut q_engine: Query<&mut actor::Engine, With<actor::PlayerDrivesThis>>,
-    mut q_camera: Query<(&mut CameraController, &mut Projection)>,
+    mut q_camera: Query<&mut Projection, With<Camera>>,
     q_player: Query<&actor::LifeForm, With<actor::Player>>,
     mut q_playercam: Query<(
             &mut Transform,
             &mut actor::Engine,
             &mut AngularVelocity,
             &mut LinearVelocity,
-        ), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<CameraController>)>,
+        ), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<Camera>)>,
 ) {
     let dt = time.delta_seconds();
     let mut play_thruster_sound = false;
@@ -145,14 +125,10 @@ fn run_camera_controller(
     }
 
     if let (
-        Ok((mut controller, mut projection)),
+        Ok(mut projection),
         Ok(lifeform),
         Ok((mut player_transform, player_engine, mut angularvelocity, mut v)),
     ) = (q_camera.get_single_mut(), q_player.get_single(), q_playercam.get_single_mut()) {
-        if !controller.enabled {
-            mouse_events.clear();
-            return;
-        }
 
         if angularvelocity.length_squared() > 0.0001 {
             angularvelocity.x *= 0.98;
@@ -242,11 +218,9 @@ fn run_camera_controller(
 
         if mouse_delta != Vec2::ZERO {
             // Apply look update
-            controller.pitch = (controller.pitch
-                + mouse_delta.y * RADIANS_PER_DOT * settings.mouse_sensitivity)
-                .clamp(-PI / 2., PI / 2.);
-            controller.yaw += mouse_delta.x * RADIANS_PER_DOT * settings.mouse_sensitivity;
-            player_transform.rotation = Quat::from_euler(EulerRot::ZYX, 0.0, -controller.yaw, controller.pitch).normalize();
+            let pitch = (mouse_delta.y * RADIANS_PER_DOT * settings.mouse_sensitivity).clamp(-PI / 2., PI / 2.);
+            let yaw = mouse_delta.x * RADIANS_PER_DOT * settings.mouse_sensitivity;
+            player_transform.rotation *= Quat::from_euler(EulerRot::ZYX, 0.0, -yaw, pitch).normalize();
         }
 
         let fov = (lifeform.adrenaline * lifeform.adrenaline * lifeform.adrenaline * 45.0 + 45.0).to_radians();

From 7431c4f59479e093e8d6de0527e682103dbc8579 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 16:41:22 +0100
Subject: [PATCH 16/28] refactoring camera::run_camera_controller

---
 src/camera.rs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 09aa42a..d36bcd8 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -15,7 +15,8 @@ impl Plugin for CameraControllerPlugin {
         app.add_systems(Update, handle_input);
         app.add_systems(Update, manage_player_actor);
         app.add_systems(Update, sync_camera_to_player);
-        app.add_systems(Update, run_camera_controller);
+        app.add_systems(Update, update_fov);
+        app.add_systems(Update, apply_input_to_player);
     }
 }
 
@@ -68,6 +69,17 @@ pub fn sync_camera_to_player(
     }
 }
 
+pub fn update_fov(
+    q_player: Query<&actor::LifeForm, With<actor::Player>>,
+    mut q_camera: Query<&mut Projection, With<Camera>>,
+) {
+    if let (Ok(lifeform), Ok(mut projection)) = (q_player.get_single(), q_camera.get_single_mut())
+    {
+        let fov = (lifeform.adrenaline.powf(3.0) * 45.0 + 45.0).to_radians();
+        *projection = Projection::Perspective(PerspectiveProjection { fov: fov, ..default() });
+    }
+}
+
 pub fn handle_input(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut settings: ResMut<settings::Settings>,
@@ -96,7 +108,7 @@ fn manage_player_actor(
 }
 
 #[allow(clippy::too_many_arguments)]
-fn run_camera_controller(
+fn apply_input_to_player(
     time: Res<Time>,
     settings: Res<settings::Settings>,
     mut windows: Query<&mut Window, With<PrimaryWindow>>,
@@ -106,8 +118,6 @@ fn run_camera_controller(
     rocket_sound_controller: Query<&AudioSink, With<audio::ComponentRocketSound>>,
     ion_sound_controller: Query<&AudioSink, With<audio::ComponentIonSound>>,
     mut q_engine: Query<&mut actor::Engine, With<actor::PlayerDrivesThis>>,
-    mut q_camera: Query<&mut Projection, With<Camera>>,
-    q_player: Query<&actor::LifeForm, With<actor::Player>>,
     mut q_playercam: Query<(
             &mut Transform,
             &mut actor::Engine,
@@ -124,11 +134,7 @@ fn run_camera_controller(
         focused = window_result.unwrap().focused;
     }
 
-    if let (
-        Ok(mut projection),
-        Ok(lifeform),
-        Ok((mut player_transform, player_engine, mut angularvelocity, mut v)),
-    ) = (q_camera.get_single_mut(), q_player.get_single(), q_playercam.get_single_mut()) {
+    if let Ok((mut player_transform, player_engine, mut angularvelocity, mut v)) = q_playercam.get_single_mut() {
 
         if angularvelocity.length_squared() > 0.0001 {
             angularvelocity.x *= 0.98;
@@ -223,9 +229,6 @@ fn run_camera_controller(
             player_transform.rotation *= Quat::from_euler(EulerRot::ZYX, 0.0, -yaw, pitch).normalize();
         }
 
-        let fov = (lifeform.adrenaline * lifeform.adrenaline * lifeform.adrenaline * 45.0 + 45.0).to_radians();
-        *projection = Projection::Perspective(PerspectiveProjection { fov: fov, ..default() });
-
         if let Ok(sink) = thruster_sound_controller.get_single() {
             if play_thruster_sound && engine.engine_type == actor::EngineType::Monopropellant {
                 sink.play()

From 3f656924e1e4a44afc7c763875bec6966792782d Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 16:52:22 +0100
Subject: [PATCH 17/28] non-shaky camera updates (especially while moving fast)

---
 src/camera.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/camera.rs b/src/camera.rs
index d36bcd8..09ce3b1 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -4,6 +4,8 @@ use bevy::window::PrimaryWindow;
 use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
 use bevy::core_pipeline::tonemapping::Tonemapping;
 use bevy_xpbd_3d::prelude::*;
+use bevy_xpbd_3d::PhysicsSchedule;
+use bevy_xpbd_3d::PhysicsStepSet;
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
 
@@ -14,7 +16,7 @@ impl Plugin for CameraControllerPlugin {
         app.add_systems(Startup, setup_camera);
         app.add_systems(Update, handle_input);
         app.add_systems(Update, manage_player_actor);
-        app.add_systems(Update, sync_camera_to_player);
+        app.add_systems(PhysicsSchedule, sync_camera_to_player.in_set(PhysicsStepSet::BroadPhase));
         app.add_systems(Update, update_fov);
         app.add_systems(Update, apply_input_to_player);
     }

From e15cf6791f175113e32753e9181b26aec421afc8 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 17:05:32 +0100
Subject: [PATCH 18/28] fix new camera control system to work with vehicles

---
 src/camera.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 09ce3b1..5cb3ba7 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -51,7 +51,7 @@ fn setup_camera(
 pub fn sync_camera_to_player(
     settings: Res<settings::Settings>,
     mut q_camera: Query<&mut Transform, With<Camera>>,
-    q_playercam: Query<(&actor::Actor, &Transform), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<Camera>)>,
+    q_playercam: Query<(&actor::Actor, &Transform), (With<actor::PlayerCamera>, Without<Camera>)>,
 ) {
     if q_camera.is_empty() || q_playercam.is_empty() {
         return;
@@ -119,13 +119,12 @@ fn apply_input_to_player(
     thruster_sound_controller: Query<&AudioSink, With<audio::ComponentThrusterSound>>,
     rocket_sound_controller: Query<&AudioSink, With<audio::ComponentRocketSound>>,
     ion_sound_controller: Query<&AudioSink, With<audio::ComponentIonSound>>,
-    mut q_engine: Query<&mut actor::Engine, With<actor::PlayerDrivesThis>>,
     mut q_playercam: Query<(
             &mut Transform,
             &mut actor::Engine,
             &mut AngularVelocity,
             &mut LinearVelocity,
-        ), (With<actor::PlayerCamera>, Without<actor::PlayerDrivesThis>, Without<Camera>)>,
+        ), (With<actor::PlayerCamera>, Without<Camera>)>,
 ) {
     let dt = time.delta_seconds();
     let mut play_thruster_sound = false;
@@ -136,7 +135,7 @@ fn apply_input_to_player(
         focused = window_result.unwrap().focused;
     }
 
-    if let Ok((mut player_transform, player_engine, mut angularvelocity, mut v)) = q_playercam.get_single_mut() {
+    if let Ok((mut player_transform, mut engine, mut angularvelocity, mut v)) = q_playercam.get_single_mut() {
 
         if angularvelocity.length_squared() > 0.0001 {
             angularvelocity.x *= 0.98;
@@ -182,8 +181,6 @@ fn apply_input_to_player(
         // total diagonal acceleration is faster than the forward acceleration alone.
         axis_input = axis_input.clamp(Vec3::splat(-1.0), Vec3::splat(1.0));
 
-        let mut engine = if let Ok(engine) = q_engine.get_single_mut() { engine } else { player_engine };
-
         // Apply movement update
         let forward_factor = engine.current_warmup * (if axis_input.z < 0.0 {
             engine.thrust_forward

From e4a3b929418ba6fd6a3e669343cde9bc78267c46 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 17:09:21 +0100
Subject: [PATCH 19/28] rotate MeteorAceGT model to face front

---
 assets/models/MeteorAceGT.glb | Bin 28724 -> 28652 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/models/MeteorAceGT.glb b/assets/models/MeteorAceGT.glb
index 50575db7c19904a761ff207d3c78ea81fe5c5391..b313f91644a2c87b32211206672b27115f6a03dd 100644
GIT binary patch
delta 3885
zcmc&!ZD^HM96$GE+uh6E?zTJK#<pvdGVJbp-p_gNY**VVBcVXai`$%6oMEjEbb+C^
zQGW1)1nWo%O%T$Ef->$tiERc2qC*S`B%<~y3jC1vDG==cJkQ;__dXYKFxNBoyXXAQ
z`M>?nIscgj-<{ul;nzoYzTig)-5EnDG!;$;NkY=8mw$aKp|B!YYOSfoDUD<MFGosl
zX(c4bmbqL0bO)nKQz5uyu!B&{V8$$qDoa?Ln@pfFfa6`}JKxro^;(V-R5*@_x#5qj
zsPh(|oiH(92A1Qu@8MDm#yiIkWkwH=WX2DUjdmvcyPyJ!;Uh$2qKGA>jGIhZG#CBz
z;Bun(u0V7%RJJA;{Ijyh85}An7JS;iC0Y_CM1JMx%a;@Uxn)*fBKT6_ZRUfD&PTmV
z6IC%&6KXIt)F_3rD7*y86}%T^#o=%rN@LE1kd!bE?}K9jtb%eC(UcK*K~c&mSBfdE
z1?+Gx1jY|9$(YI)&EKK=mt21u3#K^XAmU=!yi9V5C`&U-5Fxc(N<=e3l;l#`PdVC7
zFrh*+h3!O~^MMo6SXp*6Frn%VW-i3d&y^8#u_Blxib)PdXs85Br4<-in!|noi(w|T
z6;}yiVUDGM7Qqx8`f!)iH=^cfsL#Av)n~hcD^O$x;T`WpX`w(-M&dldFjtHS%)zk~
z+}sT|SLJmYQq^s6^=mOIv{uaRM-mE@(5j?lgiA}s$)LGe+c7oKV1BCZDB}`3S@wQ)
zt3Q~4XK3nbHf5i$4f@-a##%{YD@DKs)q=y}x?G-zrijLvCg6mz(86Ni>{4WZ$VW}A
z<p;Ah8Z&{`C(L9tmhEj#2mO+pvmHHA$>W{--WeZ$<-mc%!{ePviitMgv_7*2&Z2mQ
zLklJC8_n)mLqJk&#$t(bjgJo=znZ-e`_MN5&D;Ja=iJ}b9#8yVfpc-)`d2@R2M<!I
z=C4F5JJYG^e8?=QwNIjx*{jdm2XN~9cXP*4kXXuIGZ7uD&p#}eP1E&Zdl|k-mpSQS
zj+L}LSCVaJ#s0Q=m>R28Cb%Sf+hZN##Sx}UT3#v1p7B^;<?BJmb;-3Y`8qmUEM9NZ
zCjN`*XlS;3m}4I1VzSuk7tfv=S-fYnhuP9yyl2|8XWqly_b@j-eg;&r=Tjc$va<Do
zdsd*2qr%diiD-LIn#Ri9JCt_j#~eK8U^81>`@@;nShfXr@b=Q$5obQ_;1vhY@I|{&
zauZl+2SI%pgW`aoG9V}m2x<a?f`FhJASeY0>HvZwfS>{(R1OH$0z!oo?h`0%XHG5d
zg7-bGEMM5pRxxm4J6rw0j*OG3Mg3v=xTP-X-;Q5$VU_r$`rRh%sIr;~Rph#Vc5mu>
zGdziSI_pE(h4d{SOlEfP01Wjz@2`Id#%KDw!|2EG)a;+{y*+0qYZmO)Y-HeTUl>*Y
zb3FCMH0p5{<_BSG0n;|rY~p*~52Ib<N9W#X+v4uKyyto$lRZ7uZ%6-YZ#Q_3XDaLo
z-)D!}zwcHhO!UZ(7Swxf{@ab}P^#n8vpvI?F3jG5u^l*jeq@8s%)NEO%<XD1ua0iR
zfr@*xCqB+NtEB$k?6uSGxc8H$*@2HTDL?(aC!aT$M|VDo(QLkB!^gIpBV%bZa4=$S
zkFDEWg{qMsRl$EP3ZY6A1`MNmRE8>01O-tYYJhCZQ6pd@ilQ3iLrs89D1iP28>7xh

delta 3112
zcmdT^UuauZ7(X}tv!rd-q+8dtbX~|Cwj)c=-+Rw(T~n!yfg2li(Au=N6+1iIwcU&|
zk=m<I1qY@*LzGP{OkZSZ;qF01Qw0UtL@M(^q0BxB1HmE_^l5(grpemeiVxO_C*;R>
ze&;*ipWiv>{`{kMeN_uSGk)rb4<W>-5X#I2+e&eQ^SQ@wAC4cw2?HAh>yk=cn!*q?
zz6B)`j7fnd!xT%&r5HJcrJ5>hRu?LW569IxA5kk>XnO*d;RF><%tyB+9xus7BkD}a
z_Ed-;PEd-SAtWbM2qGoOMyTlyK^f7h<kZ#WIFH3+=O@#{=`)iPv9=W64$*Oqw*vKf
z`5yNm+RC=4&DIvU9+bE}F_U6Ob;{UZH>&>&jkfOIs)qGe8`a(N*gw1@q%^AfcZ81$
z!=%(OB{KyPy40Oh;#dG}7=T2=p+f69N@BqbPPh<2<#tM)8yq62u&-9V7I;kk=I5%*
zzeV7DkPUGQx&A(ImkRoI)e;D`BusdT*Z?pYW<r{A?EDhMU^<6#CDe>{LmK&qs+I#?
z&FjlVXS$(No#c1rf*BBtLbsf(Z`!SX@HZ-4QmU?1bT<(l0uqQ0X>=xtu5-+V#02ui
ziMm~Vq=v!6FcSoWhLjl$bHhGY+2FHZ4>Dha4g$ev#3>SXQz<xHDVKu1$1AuA-yklb
ze4B@!_G?(Z75Nfyus*3_`<?n1N_`xwx~7g=j^nYXUQCaiIDPuLk#ww$VmLGvZ#cLI
zN-SPtrn{uRYpN*`;C81e;V1g^z;rY^Ywz7RugzHSafD$lIpA0i)}HyV60hf-dEg!A
z65qR*Oh!HsNjn}hsx?b>8g&P(S^KNQPCXaDc-c7)7@O2dI)qvv`-7IV29q4KT+GbV
zVi)XThCEEh!+hpp);vs<73VtXVJr``=wVhpOo$gp?&SMHss&!RccWB}2#y$zWY#NJ
zFJ)E6+*gpuW!0*AKUR*pyCHgxX>Kd_Ip$%eJj``byz3*6&q^^f-(I{atrs&#JwD?e
zCgWka;Yb9x32@5A1+uR!=}4oN?^~`Hrumhjf|V&)L(++~R+vXw-uq<1T629C3-i^2
z72<hs%WQ=>i!Q=3fDO_Eg4}>0F(Aka2vP!qe1IUCW`Rs#f;5022OvlQ2yFvGs{sod
zgJCVH&{&=JKg6(m_tv{`kIDYN<7Ncfd$-5dEW5Y&mIjk}UpJuD=StZ(2zDsd9<;s<
z&Smes`h4#G_NHLfo=ttI1+B_IrjzeqK^=}ZYJ4!F`Ul{CZDKDDTn<`2>6ezCZS2hX
z@h5L?X6&lLl#_jQs2%Xi6A|^v&@W(J8+J0S4BraCWO1y!-s-yX^`{4o^U0>GZ+DD*
z{9g7Ou-)8?V|6wg4{7Se*$XPwb3pxm7FUt*uh|=yhI1aB6V6@jojCQ-M!M^AZMOf7
z;iQlLl-<aym5F2O&2gzlCnIWQ)UPs=(MJNP0{Kt?{z0?@`B4>M6{<$1s2uGC+=)U^
VOc@FThEWZwL>k%!xC@n_KLN*|+YA5z


From af2f43b9f9ab2aac3853e77af44d2053d7cb5900 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 17:19:11 +0100
Subject: [PATCH 20/28] fix hud speed display

---
 src/hud.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hud.rs b/src/hud.rs
index 6e77a35..582a0cb 100644
--- a/src/hud.rs
+++ b/src/hud.rs
@@ -1,6 +1,7 @@
 use crate::{settings, actor, audio, nature};
 use bevy::prelude::*;
 use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
+use bevy_xpbd_3d::prelude::*;
 use std::collections::VecDeque;
 use std::time::SystemTime;
 
@@ -370,7 +371,8 @@ fn update(
     diagnostics: Res<DiagnosticsStore>,
     time: Res<Time>,
     mut log: ResMut<Log>,
-    player: Query<(&actor::Suit, &actor::LifeForm, &actor::Actor), With<actor::Player>>,
+    player: Query<(&actor::Suit, &actor::LifeForm), With<actor::Player>>,
+    q_camera: Query<&LinearVelocity, With<actor::PlayerCamera>>,
     mut timer: ResMut<FPSUpdateTimer>,
     mut query: Query<&mut Text, With<GaugesText>>,
     q_choices: Query<&ChoiceAvailable>,
@@ -380,9 +382,11 @@ fn update(
 ) {
     // TODO only when hud is actually on
     if timer.0.tick(time.delta()).just_finished() || log.needs_rerendering {
+        let q_camera_result = q_camera.get_single();
         let player = player.get_single();
-        if player.is_ok() {
-            let (suit, lifeform, actor) = player.unwrap();
+        if player.is_ok() && q_camera_result.is_ok() {
+            let (suit, lifeform) = player.unwrap();
+            let cam_v = q_camera_result.unwrap();
             for mut text in &mut query {
                 if let Some(fps) = diagnostics.get(&FrameTimeDiagnosticsPlugin::FPS) {
                     if let Some(value) = fps.smoothed() {
@@ -409,7 +413,7 @@ fn update(
                 text.sections[10].value = format!("{all_actors:.0}");
                 let integrity = suit.integrity * 100.0;
                 text.sections[12].value = format!("{integrity:.0}%");
-                let speed = actor.v.length();
+                let speed = cam_v.length();
                 let kmh = speed * 60.0 * 60.0 / 1000.0;
                 text.sections[14].value = format!("{speed:.0}m/s | {kmh:.0}km/h");
             }

From b590c4de440c7476de1e194338b73861ec13e759 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:04:57 +0100
Subject: [PATCH 21/28] fix collision sfx while in vehicles

---
 src/actor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actor.rs b/src/actor.rs
index 8486dac..4490f65 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -563,7 +563,7 @@ pub fn handle_chat_scripts(
 fn handle_collisions(
     mut collision_event_reader: EventReader<Collision>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
-    q_player: Query<Entity, With<Player>>,
+    q_player: Query<Entity, With<PlayerCamera>>,
 ) {
     if let Ok(player) = q_player.get_single() {
         for Collision(contacts) in collision_event_reader.read() {

From 962f73f522bc5c7140f9779c850db009b5ccac3a Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:05:22 +0100
Subject: [PATCH 22/28] stop physics simulation of original model when entering
 vehicle

---
 src/actor.rs  | 21 ++++++++++-----------
 src/camera.rs |  4 ----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index 4490f65..af61e59 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -295,37 +295,35 @@ pub fn handle_input(
 pub fn handle_vehicle_enter_exit(
     mut commands: Commands,
     mut er_vehicle: EventReader<VehicleEnterExitEvent>,
-    mut q_drivers: Query<(Entity, &mut Actor, &mut Visibility, &mut Transform), (Without<ActorVehicleBeingEntered>, With<ActorEnteringVehicle>)>,
-    mut q_vehicles: Query<(Entity, &mut Actor, &mut Visibility, &mut Transform), (With<ActorVehicleBeingEntered>, Without<ActorEnteringVehicle>)>,
+    mut q_drivers: Query<(Entity, &mut Visibility, &mut Transform), (Without<ActorVehicleBeingEntered>, With<ActorEnteringVehicle>)>,
+    mut q_vehicles: Query<(Entity, &mut Visibility, &mut Transform), (With<ActorVehicleBeingEntered>, Without<ActorEnteringVehicle>)>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
 ) {
     for event in er_vehicle.read() {
-        for (driver, mut driver_actor, mut driver_vis, mut driver_trans) in q_drivers.iter_mut() {
+        for (driver, mut driver_vis, mut driver_trans) in q_drivers.iter_mut() {
             if driver == event.driver {
-                for (vehicle, mut vehicle_actor, mut vehicle_vis, mut vehicle_trans) in q_vehicles.iter_mut() {
+                for (vehicle, mut vehicle_vis, vehicle_trans) in q_vehicles.iter_mut() {
                     if vehicle == event.vehicle {
                         if event.is_entering {
                             // Entering Vehicle
                             *driver_vis = Visibility::Hidden;
                             if event.is_player {
                                 ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
-                                //player_actor.inside_entity = entity.index();
-                                *vehicle_vis = Visibility::Hidden;
-                                driver_actor.v = vehicle_actor.v;
+                                //*vehicle_vis = Visibility::Hidden;
                                 commands.entity(driver).remove::<PlayerCamera>();
                                 commands.entity(vehicle).insert(PlayerCamera);
                                 commands.entity(vehicle).insert(PlayerDrivesThis);
+                                commands.entity(driver).remove::<RigidBody>();
                             }
                         }
                         else {
                             // Exiting Vehicle
-                            *driver_vis = Visibility::Inherited;
                             if event.is_player {
                                 ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
                                 *vehicle_vis = Visibility::Inherited;
-                                vehicle_actor.v = driver_actor.v;
-                                vehicle_actor.angular_momentum = driver_actor.angular_momentum;
-                                *vehicle_trans = driver_trans.clone();
+                                // TODO: set actor momentum to vehicle momentum (linear/angular)
+                                commands.entity(driver).insert(RigidBody::Dynamic);
+
                                 commands.entity(vehicle).remove::<PlayerCamera>();
                                 commands.entity(driver).insert(PlayerCamera);
                                 commands.entity(vehicle).remove::<PlayerDrivesThis>();
@@ -333,6 +331,7 @@ pub fn handle_vehicle_enter_exit(
                             else {
                                 *driver_trans = vehicle_trans.clone();
                             }
+                            driver_trans.translation = vehicle_trans.translation.clone();
                         }
                     }
                 }
diff --git a/src/camera.rs b/src/camera.rs
index 5cb3ba7..55f5b1f 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -94,7 +94,6 @@ pub fn handle_input(
 fn manage_player_actor(
     settings: Res<settings::Settings>,
     mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>,
-    mut q_hiddenplayer: Query<&mut Visibility, (With<actor::Player>, Without<actor::PlayerCamera>)>,
 ) {
     for mut vis in &mut q_playercam {
         if settings.third_person {
@@ -104,9 +103,6 @@ fn manage_player_actor(
             *vis = Visibility::Hidden;
         }
     }
-    for mut vis in &mut q_hiddenplayer {
-        *vis = Visibility::Hidden;
-    }
 }
 
 #[allow(clippy::too_many_arguments)]

From ce8f4666c533546ddb80955e61543d4f72ed0f64 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:48:19 +0100
Subject: [PATCH 23/28] trying to fix player "teleportation" on vehicle
 exiting...

---
 src/actor.rs  | 31 ++++++++++++++++---------------
 src/camera.rs |  8 ++++++--
 src/defs.txt  |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index af61e59..39eb845 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -285,6 +285,7 @@ pub fn handle_input(
                         is_entering: false,
                         is_player: true,
                     });
+                    commands.entity(player_entity).insert(RigidBody::Dynamic);
                     break;
                 }
             }
@@ -295,43 +296,43 @@ pub fn handle_input(
 pub fn handle_vehicle_enter_exit(
     mut commands: Commands,
     mut er_vehicle: EventReader<VehicleEnterExitEvent>,
-    mut q_drivers: Query<(Entity, &mut Visibility, &mut Transform), (Without<ActorVehicleBeingEntered>, With<ActorEnteringVehicle>)>,
-    mut q_vehicles: Query<(Entity, &mut Visibility, &mut Transform), (With<ActorVehicleBeingEntered>, Without<ActorEnteringVehicle>)>,
+    mut q_drivers: Query<(Entity, &mut Visibility, &mut Transform, &mut LinearVelocity, &mut AngularVelocity), (Without<ActorVehicleBeingEntered>, With<ActorEnteringVehicle>)>,
+    mut q_vehicles: Query<(Entity, &mut Visibility, &mut Transform, &LinearVelocity, &AngularVelocity), (With<ActorVehicleBeingEntered>, Without<ActorEnteringVehicle>)>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
 ) {
     for event in er_vehicle.read() {
-        for (driver, mut driver_vis, mut driver_trans) in q_drivers.iter_mut() {
+        for (driver, mut driver_vis, mut driver_trans, mut driver_linv, mut driver_angv) in q_drivers.iter_mut() {
             if driver == event.driver {
-                for (vehicle, mut vehicle_vis, vehicle_trans) in q_vehicles.iter_mut() {
+                for (vehicle, mut vehicle_vis, vehicle_trans, vehicle_linv, vehicle_angv) in q_vehicles.iter_mut() {
                     if vehicle == event.vehicle {
                         if event.is_entering {
                             // Entering Vehicle
-                            *driver_vis = Visibility::Hidden;
+                            commands.entity(driver).remove::<RigidBody>();
                             if event.is_player {
                                 ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
-                                //*vehicle_vis = Visibility::Hidden;
                                 commands.entity(driver).remove::<PlayerCamera>();
                                 commands.entity(vehicle).insert(PlayerCamera);
                                 commands.entity(vehicle).insert(PlayerDrivesThis);
-                                commands.entity(driver).remove::<RigidBody>();
                             }
                         }
                         else {
                             // Exiting Vehicle
+                            *driver_linv = vehicle_linv.clone();
+                            *driver_angv = vehicle_angv.clone();
+                            driver_trans.translation = vehicle_trans.translation;
+                            driver_trans.rotation = vehicle_trans.rotation;
+                            // NOTE: I would rather have the following line here,
+                            // but then, for some reason, changing driver translation
+                            // does not work. For now, you must manually insert the RigidBody
+                            // component from the place that adds this event.
+                            //commands.entity(driver).insert(RigidBody::Dynamic);
                             if event.is_player {
                                 ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
-                                *vehicle_vis = Visibility::Inherited;
-                                // TODO: set actor momentum to vehicle momentum (linear/angular)
-                                commands.entity(driver).insert(RigidBody::Dynamic);
-
                                 commands.entity(vehicle).remove::<PlayerCamera>();
                                 commands.entity(driver).insert(PlayerCamera);
                                 commands.entity(vehicle).remove::<PlayerDrivesThis>();
+                                *vehicle_vis = Visibility::Inherited;
                             }
-                            else {
-                                *driver_trans = vehicle_trans.clone();
-                            }
-                            driver_trans.translation = vehicle_trans.translation.clone();
                         }
                     }
                 }
diff --git a/src/camera.rs b/src/camera.rs
index 55f5b1f..d92f4dc 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -4,8 +4,7 @@ use bevy::window::PrimaryWindow;
 use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
 use bevy::core_pipeline::tonemapping::Tonemapping;
 use bevy_xpbd_3d::prelude::*;
-use bevy_xpbd_3d::PhysicsSchedule;
-use bevy_xpbd_3d::PhysicsStepSet;
+use bevy_xpbd_3d::{PhysicsSchedule, PhysicsStepSet};
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
 
@@ -92,8 +91,10 @@ pub fn handle_input(
 }
 
 fn manage_player_actor(
+    mut commands: Commands,
     settings: Res<settings::Settings>,
     mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>,
+    mut q_hiddenplayer: Query<&mut Visibility, (With<actor::Player>, Without<actor::PlayerCamera>)>,
 ) {
     for mut vis in &mut q_playercam {
         if settings.third_person {
@@ -103,6 +104,9 @@ fn manage_player_actor(
             *vis = Visibility::Hidden;
         }
     }
+    for mut vis in &mut q_hiddenplayer {
+        *vis = Visibility::Hidden;
+    }
 }
 
 #[allow(clippy::too_many_arguments)]
diff --git a/src/defs.txt b/src/defs.txt
index 39fb507..e27f9ea 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -112,7 +112,7 @@ actor 10 -30 20 MeteorAceGT
     vehicle yes
     thrust 70 13.7 9.4 0.5 20
     engine ion
-    collider sphere 2
+    collider sphere 1.5
     camdistance 50
     mass 500
 

From 26b974ea16aed1e206fc0688b4f6422fab910676 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:50:53 +0100
Subject: [PATCH 24/28] better camera jitter avoidance

as described here: https://docs.rs/bevy_xpbd_3d/latest/bevy_xpbd_3d/index.html#why-does-my-camera-following-jitter
---
 src/camera.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index d92f4dc..0a659b7 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -3,8 +3,8 @@ use bevy::input::mouse::MouseMotion;
 use bevy::window::PrimaryWindow;
 use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
 use bevy::core_pipeline::tonemapping::Tonemapping;
+use bevy::transform::TransformSystem;
 use bevy_xpbd_3d::prelude::*;
-use bevy_xpbd_3d::{PhysicsSchedule, PhysicsStepSet};
 use std::f32::consts::*;
 use crate::{settings, audio, actor};
 
@@ -15,7 +15,9 @@ impl Plugin for CameraControllerPlugin {
         app.add_systems(Startup, setup_camera);
         app.add_systems(Update, handle_input);
         app.add_systems(Update, manage_player_actor);
-        app.add_systems(PhysicsSchedule, sync_camera_to_player.in_set(PhysicsStepSet::BroadPhase));
+        app.add_systems(PostUpdate, sync_camera_to_player
+            .after(PhysicsSet::Sync)
+            .before(TransformSystem::TransformPropagate));
         app.add_systems(Update, update_fov);
         app.add_systems(Update, apply_input_to_player);
     }

From 80aed73264c1f9c2450aa8e7d1536f2408603024 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:51:21 +0100
Subject: [PATCH 25/28] will this help with vehicle exiting? still seems
 random...

---
 src/actor.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/actor.rs b/src/actor.rs
index 39eb845..e24dd7a 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use bevy::transform::TransformSystem;
 use bevy_xpbd_3d::prelude::*;
 use crate::{nature, settings, actor, audio, hud};
 
@@ -19,7 +20,7 @@ impl Plugin for ActorPlugin {
             handle_conversations,
             handle_input,
             handle_chat_scripts,
-            handle_vehicle_enter_exit,
+            handle_vehicle_enter_exit.after(PhysicsSet::Sync).before(TransformSystem::TransformPropagate),
             handle_collisions,
         ));
         app.add_event::<StartConversationEvent>();

From 3472be43b029d1199270aba9d2a442b692183b6a Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:54:29 +0100
Subject: [PATCH 26/28] spawn the player a bit outside the vehicle

---
 src/actor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actor.rs b/src/actor.rs
index e24dd7a..4087c98 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -320,7 +320,7 @@ pub fn handle_vehicle_enter_exit(
                             // Exiting Vehicle
                             *driver_linv = vehicle_linv.clone();
                             *driver_angv = vehicle_angv.clone();
-                            driver_trans.translation = vehicle_trans.translation;
+                            driver_trans.translation = vehicle_trans.translation + Vec3::new(0.0, 0.0, 10.0);
                             driver_trans.rotation = vehicle_trans.rotation;
                             // NOTE: I would rather have the following line here,
                             // but then, for some reason, changing driver translation

From 15781d2175e9cbff98ed65ac2c9a5f108d538870 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:56:24 +0100
Subject: [PATCH 27/28] fix flicker when toggling 3rd person camera

---
 src/actor.rs  | 1 +
 src/camera.rs | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index 4087c98..53cba23 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -309,6 +309,7 @@ pub fn handle_vehicle_enter_exit(
                         if event.is_entering {
                             // Entering Vehicle
                             commands.entity(driver).remove::<RigidBody>();
+                            *driver_vis = Visibility::Hidden; //seems to have no effect...
                             if event.is_player {
                                 ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
                                 commands.entity(driver).remove::<PlayerCamera>();
diff --git a/src/camera.rs b/src/camera.rs
index 0a659b7..8f6963b 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -14,7 +14,7 @@ impl Plugin for CameraControllerPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, setup_camera);
         app.add_systems(Update, handle_input);
-        app.add_systems(Update, manage_player_actor);
+        app.add_systems(Update, manage_player_actor.after(handle_input));
         app.add_systems(PostUpdate, sync_camera_to_player
             .after(PhysicsSet::Sync)
             .before(TransformSystem::TransformPropagate));
@@ -93,7 +93,6 @@ pub fn handle_input(
 }
 
 fn manage_player_actor(
-    mut commands: Commands,
     settings: Res<settings::Settings>,
     mut q_playercam: Query<&mut Visibility, With<actor::PlayerCamera>>,
     mut q_hiddenplayer: Query<&mut Visibility, (With<actor::Player>, Without<actor::PlayerCamera>)>,

From d073eb067c637e5d75012619cddd4a49ef26babb Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Sat, 30 Mar 2024 18:58:45 +0100
Subject: [PATCH 28/28] fix engine thruster direction

---
 src/camera.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/camera.rs b/src/camera.rs
index 8f6963b..561b3ff 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -183,7 +183,7 @@ fn apply_input_to_player(
         axis_input = axis_input.clamp(Vec3::splat(-1.0), Vec3::splat(1.0));
 
         // Apply movement update
-        let forward_factor = engine.current_warmup * (if axis_input.z < 0.0 {
+        let forward_factor = engine.current_warmup * (if axis_input.z > 0.0 {
             engine.thrust_forward
         } else {
             engine.thrust_back