From a4189342e08be19a8012fcc3293e32d164f20cc8 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 22 Feb 2023 13:46:43 -0800
Subject: [PATCH 01/13] flatland it

---
 src/action/systems.rs |  8 ++++++--
 src/bike/body.rs      |  4 ++++
 src/camera.rs         |  2 +-
 src/glamor.rs         | 13 ++++++-------
 src/lights.rs         | 36 ++++++++++++++++++------------------
 src/planet.rs         | 32 ++++++++++++++------------------
 6 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/src/action/systems.rs b/src/action/systems.rs
index 09aea8f..70ab712 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -43,7 +43,9 @@ pub(super) fn gravity(
     mut rapier_config: ResMut<RapierConfiguration>,
 ) {
     let (xform, mut forces) = query.single_mut();
-    rapier_config.gravity = xform.translation.normalize() * -settings.gravity;
+    // flatland
+    //rapier_config.gravity = xform.translation.normalize() * -settings.gravity;
+    rapier_config.gravity = Vec3::Y * -settings.gravity;
     forces.force = Vec3::ZERO;
     forces.torque = Vec3::ZERO;
 }
@@ -83,7 +85,9 @@ pub(super) fn falling_cat(
     #[cfg(feature = "inspector")] mut debug_instant: ResMut<ActionDebugInstant>,
 ) {
     let (xform, mut forces, mut control_vars) = bike_query.single_mut();
-    let world_up = xform.translation.normalize();
+    //let world_up = xform.translation.normalize();
+    // flatland
+    let world_up = Vec3::Y;
     let rot = Quat::from_axis_angle(xform.back(), lean.lean);
     let target_up = rotate_point(&world_up, &rot).normalize();
 
diff --git a/src/bike/body.rs b/src/bike/body.rs
index 572ae6f..7e506c1 100644
--- a/src/bike/body.rs
+++ b/src/bike/body.rs
@@ -24,6 +24,10 @@ pub(super) fn spawn_cyberbike(
     let right = xform.right() * 350.0;
     xform.translation += right;
 
+    // flatland
+    let altitude = 10.0;
+    let xform = Transform::from_translation(Vec3::Y * altitude);
+
     let damping = Damping {
         angular_damping: 2.0,
         linear_damping: 0.1,
diff --git a/src/camera.rs b/src/camera.rs
index e59edf2..7af057e 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -65,7 +65,7 @@ fn follow_cyberbike(
     offset: Res<DebugCamOffset>,
 ) {
     let bike_xform = *query.p0().single();
-    let up = bike_xform.translation.normalize();
+    let up = Vec3::Y;
 
     for (mut cam_xform, cam_type) in query.p1().iter_mut() {
         match *cam_type {
diff --git a/src/glamor.rs b/src/glamor.rs
index 8e51135..7518486 100644
--- a/src/glamor.rs
+++ b/src/glamor.rs
@@ -9,7 +9,7 @@ use crate::{lights::AnimateCyberLightWireframe, planet::CyberPlanet};
 
 pub const BISEXY_COLOR: Color = Color::hsla(292.0, 0.9, 0.60, 1.1);
 
-fn wireframe_planet(
+fn _wireframe_planet(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut polylines: ResMut<Assets<Polyline>>,
@@ -57,7 +57,7 @@ fn wireframe_planet(
     });
 }
 
-fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
+fn _wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
     let chance = 0.005;
 
     let rng = &mut thread_rng();
@@ -74,17 +74,20 @@ fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
 pub struct CyberGlamorPlugin;
 impl Plugin for CyberGlamorPlugin {
     fn build(&self, app: &mut App) {
-        #[cfg(feature = "inspector")]
+        app.insert_resource(ClearColor(Color::rgb(0.408, 0.6236, 0.925)));
+
         {
             use bevy_rapier3d::render::{
                 DebugRenderMode, DebugRenderStyle, RapierDebugRenderPlugin,
             };
             let style = DebugRenderStyle {
                 multibody_joint_anchor_color: Color::GREEN.as_rgba_f32(),
+                multibody_joint_separation_color: Color::GOLD.as_rgba_f32(),
                 ..Default::default()
             };
             let mode = DebugRenderMode::CONTACTS
                 | DebugRenderMode::SOLVER_CONTACTS
+                | DebugRenderMode::COLLIDER_SHAPES
                 | DebugRenderMode::JOINTS
                 | DebugRenderMode::RIGID_BODY_AXES;
 
@@ -97,9 +100,5 @@ impl Plugin for CyberGlamorPlugin {
 
             app.add_plugin(rplugin);
         }
-
-        app.add_startup_system_to_stage(StartupStage::PostStartup, wireframe_planet)
-            .add_system(wireframify_lights)
-            .add_plugin(PolylinePlugin);
     }
 }
diff --git a/src/lights.rs b/src/lights.rs
index 194a8fa..b512587 100644
--- a/src/lights.rs
+++ b/src/lights.rs
@@ -9,8 +9,8 @@ pub const LIGHT_RANGE: f32 = 90.0;
 
 #[derive(Component)]
 struct AnimatedCyberLight {
-    axis: Vec3,
-    rate: f32,
+    _axis: Vec3,
+    _rate: f32,
 }
 
 #[derive(Component, Default)]
@@ -18,7 +18,7 @@ pub(crate) struct AnimateCyberLightWireframe {
     pub wired: bool,
 }
 
-fn spawn_moving_lights(
+fn _spawn_moving_lights(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
@@ -27,13 +27,13 @@ fn spawn_moving_lights(
     // spawn orbiting bisexual lights
     for _ in 0..655 {
         // mechanics
-        let axis = crate::random_unit_vec(rng);
+        let _axis = crate::random_unit_vec(rng);
         let angle = rng.gen_range(0.0..TAU);
-        let rate: f32 = rng.gen_range(7.0..10.0);
-        let rate = rate.to_radians();
-        let rotation = Quat::from_axis_angle(axis, angle);
+        let _rate: f32 = rng.gen_range(7.0..10.0);
+        let _rate = _rate.to_radians();
+        let rotation = Quat::from_axis_angle(_axis, angle);
         let altitude = PLANET_RADIUS + rng.gen_range(8.0..20.0);
-        let perp = axis.any_orthonormal_vector();
+        let perp = _axis.any_orthonormal_vector();
         let translation = perp * altitude;
         let transform = Transform::from_translation(translation);
 
@@ -59,7 +59,7 @@ fn spawn_moving_lights(
         };
         commands
             // first, spawn an entity with a transform we can rotate
-            .spawn((AnimatedCyberLight { axis, rate },))
+            .spawn((AnimatedCyberLight { _axis, _rate },))
             .insert(sbundle)
             .with_children(|parent| {
                 parent
@@ -122,7 +122,7 @@ fn spawn_static_lights(
     // up light
     commands
         .spawn(PointLightBundle {
-            transform: Transform::from_xyz(0.0, PLANET_RADIUS + 30.0, 0.0),
+            transform: Transform::from_xyz(20.0, 100.0, 20.0),
             point_light: pink_light,
             ..Default::default()
         })
@@ -143,7 +143,7 @@ fn spawn_static_lights(
     // down light
     commands
         .spawn(PointLightBundle {
-            transform: Transform::from_xyz(0.0, -PLANET_RADIUS - 30.0, 0.0),
+            transform: Transform::from_xyz(-20.0, 100.0, -20.0),
             point_light: blue_light,
             ..Default::default()
         })
@@ -163,20 +163,20 @@ fn spawn_static_lights(
         });
 }
 
-fn orbit_lights(time: Res<Time>, mut query: Query<(&mut Transform, &AnimatedCyberLight)>) {
+fn _orbit_lights(time: Res<Time>, mut query: Query<(&mut Transform, &AnimatedCyberLight)>) {
     let dt = time.delta_seconds();
     for (mut transform, light) in query.iter_mut() {
-        let AnimatedCyberLight { axis, rate } = *light;
-        let theta = rate * dt;
-        transform.rotation *= Quat::from_axis_angle(axis, theta);
+        let AnimatedCyberLight { _axis, _rate } = *light;
+        let theta = _rate * dt;
+        transform.rotation *= Quat::from_axis_angle(_axis, theta);
     }
 }
 
 pub struct CyberSpaceLightsPlugin;
 impl Plugin for CyberSpaceLightsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_startup_system(spawn_static_lights)
-            .add_startup_system(spawn_moving_lights)
-            .add_system(orbit_lights);
+        app.add_startup_system(spawn_static_lights);
+        //.add_startup_system(spawn_moving_lights)
+        //.add_system(orbit_lights);
     }
 }
diff --git a/src/planet.rs b/src/planet.rs
index 8e6807b..96b374e 100644
--- a/src/planet.rs
+++ b/src/planet.rs
@@ -1,15 +1,9 @@
-use bevy::{
-    prelude::{shape::Icosphere, *},
-    render::mesh::Indices,
-};
+use bevy::prelude::{shape::Plane, *};
 use bevy_rapier3d::prelude::*;
-use hexasphere::shapes::IcoSphere;
-use noise::{HybridMulti, NoiseFn, SuperSimplex};
-use wgpu::PrimitiveTopology;
 
 use crate::Label;
 
-pub const PLANET_RADIUS: f32 = 6000.0;
+pub const PLANET_RADIUS: f32 = 600.0;
 
 #[derive(Component)]
 pub struct CyberPlanet;
@@ -19,23 +13,23 @@ fn spawn_planet(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let color = Color::rgb(0.2, 0.1, 0.2);
-    let isphere = Icosphere {
-        radius: PLANET_RADIUS,
-        subdivisions: 88,
+    let color = Color::rgba(0.7, 0.7, 0.8, 0.3);
+    let plane = Plane {
+        size: PLANET_RADIUS,
     };
-
-    let (mesh, shape) = gen_planet(isphere);
+    //let (mesh, shape) = gen_planet(plane);
+    let mesh = Mesh::from(plane);
+    let shape = Collider::from_bevy_mesh(&mesh, &ComputedColliderShape::TriMesh).unwrap();
 
     let pbody = (RigidBody::Fixed, Ccd { enabled: true });
 
     let pcollide = (
         shape,
         Friction {
-            coefficient: 1.2,
+            coefficient: 0.8,
             ..Default::default()
         },
-        Restitution::new(0.8),
+        Restitution::new(0.0),
     );
 
     commands
@@ -67,7 +61,8 @@ impl Plugin for CyberPlanetPlugin {
 // utils
 //---------------------------------------------------------------------
 
-fn gen_planet(sphere: Icosphere) -> (Mesh, Collider) {
+/*
+fn gen_planet(sphere: Plane) -> (Mesh, Collider) {
     // straight-up stolen from Bevy's impl of Mesh from Icosphere, so I can do the
     // displacement before normals are calculated.
     let generated = IcoSphere::new(sphere.subdivisions, |point| {
@@ -86,7 +81,7 @@ fn gen_planet(sphere: Icosphere) -> (Mesh, Collider) {
         .raw_points()
         .iter()
         .map(|&p| {
-            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.04;
+            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.05;
             let pt = p + (p.normalize() * disp);
             pt.into()
         })
@@ -120,3 +115,4 @@ fn gen_planet(sphere: Icosphere) -> (Mesh, Collider) {
     mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs);
     (mesh, shape)
 }
+*/

From 122bf518797e2d02928d4f394494b158ec9bed63 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 22 Feb 2023 14:02:24 -0800
Subject: [PATCH 02/13] use torus for wheel instead of ball; is not oriented
 correctly

---
 src/bike/components.rs |  4 +++-
 src/bike/wheels.rs     | 23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/bike/components.rs b/src/bike/components.rs
index dda2bd2..d111b10 100644
--- a/src/bike/components.rs
+++ b/src/bike/components.rs
@@ -22,6 +22,7 @@ pub struct WheelConfig {
     pub stiffness: f32,
     pub damping: f32,
     pub radius: f32,
+    pub thickness: f32,
     pub friction: f32,
     pub restitution: f32,
     pub density: f32,
@@ -36,7 +37,8 @@ impl Default for WheelConfig {
             limits: [-0.5, 0.1],
             stiffness: 50.0,
             damping: 8.0,
-            radius: 0.3,
+            radius: 0.35,
+            thickness: 0.10,
             friction: 1.2,
             restitution: 0.8,
             density: 0.6,
diff --git a/src/bike/wheels.rs b/src/bike/wheels.rs
index 3164124..176b10f 100644
--- a/src/bike/wheels.rs
+++ b/src/bike/wheels.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::{shape::UVSphere as Tire, *};
+use bevy::prelude::{shape::Torus as Tire, *};
 use bevy_rapier3d::prelude::{
     Ccd, CoefficientCombineRule, Collider, ColliderMassProperties, CollisionGroups, Damping,
     ExternalForce, Friction, MultibodyJoint, PrismaticJointBuilder, Restitution,
@@ -17,6 +17,7 @@ pub fn spawn_tires(
     let wheels_collision_group = CollisionGroups::new(membership, filter);
     let wheel_y = conf.y;
     let wheel_rad = conf.radius;
+    let tire_thickness = conf.thickness;
     let stiffness = conf.stiffness;
     let not_sleeping = Sleeping::disabled();
     let ccd = Ccd { enabled: true };
@@ -26,6 +27,7 @@ pub fn spawn_tires(
 
     let tire = Tire {
         radius: wheel_rad,
+        ring_radius: tire_thickness,
         ..Default::default()
     };
     let material = StandardMaterial {
@@ -74,7 +76,24 @@ pub fn spawn_tires(
             linear_damping: 0.8,
             ..Default::default()
         };
-        let wheel_collider = Collider::ball(wheel_rad);
+        let mesh = Mesh::from(tire);
+        let mut idxs = Vec::new();
+        let indices = mesh.indices().unwrap().iter().collect::<Vec<_>>();
+        for idx in indices.as_slice().chunks_exact(3) {
+            idxs.push([idx[0] as u32, idx[1] as u32, idx[2] as u32]);
+        }
+        let wheel_collider = Collider::convex_decomposition(
+            &mesh
+                .attribute(Mesh::ATTRIBUTE_POSITION)
+                .unwrap()
+                .as_float3()
+                .unwrap()
+                .iter()
+                .map(|v| Vec3::from_array(*v))
+                .collect::<Vec<_>>(),
+            &idxs,
+        );
+        //let wheel_collider = Collider::from_bevy_mesh(&mesh, computed_shape);
         let mass_props = ColliderMassProperties::Density(conf.density);
         let damping = conf.damping;
 

From 87d9d737d60e0a97212f5bd0a43a7d3a72a0a12a Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 22 Feb 2023 17:07:13 -0800
Subject: [PATCH 03/13] works?

---
 src/bike/body.rs       |  2 +-
 src/bike/components.rs |  4 ++--
 src/bike/wheels.rs     | 26 +++++++++-----------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/bike/body.rs b/src/bike/body.rs
index 7e506c1..4d2b93b 100644
--- a/src/bike/body.rs
+++ b/src/bike/body.rs
@@ -59,7 +59,7 @@ pub(super) fn spawn_cyberbike(
         .spawn(RigidBody::Dynamic)
         .insert(spatialbundle)
         .insert((
-            Collider::capsule(Vec3::new(0.0, 0.0, -0.65), Vec3::new(0.0, 0.0, 0.8), 0.50),
+            Collider::capsule(Vec3::new(0.0, 0.0, -0.65), Vec3::new(0.0, 0.0, 0.8), 0.40),
             bike_collision_group,
             mass_properties,
             damping,
diff --git a/src/bike/components.rs b/src/bike/components.rs
index d111b10..0f8ee1b 100644
--- a/src/bike/components.rs
+++ b/src/bike/components.rs
@@ -37,8 +37,8 @@ impl Default for WheelConfig {
             limits: [-0.5, 0.1],
             stiffness: 50.0,
             damping: 8.0,
-            radius: 0.35,
-            thickness: 0.10,
+            radius: 0.3,
+            thickness: 0.06,
             friction: 1.2,
             restitution: 0.8,
             density: 0.6,
diff --git a/src/bike/wheels.rs b/src/bike/wheels.rs
index 176b10f..555cbb9 100644
--- a/src/bike/wheels.rs
+++ b/src/bike/wheels.rs
@@ -1,4 +1,4 @@
-use bevy::prelude::{shape::Torus as Tire, *};
+use bevy::prelude::{shape::UVSphere as Tire, *};
 use bevy_rapier3d::prelude::{
     Ccd, CoefficientCombineRule, Collider, ColliderMassProperties, CollisionGroups, Damping,
     ExternalForce, Friction, MultibodyJoint, PrismaticJointBuilder, Restitution,
@@ -27,9 +27,9 @@ pub fn spawn_tires(
 
     let tire = Tire {
         radius: wheel_rad,
-        ring_radius: tire_thickness,
         ..Default::default()
     };
+
     let material = StandardMaterial {
         base_color: Color::Rgba {
             red: 0.01,
@@ -82,18 +82,8 @@ pub fn spawn_tires(
         for idx in indices.as_slice().chunks_exact(3) {
             idxs.push([idx[0] as u32, idx[1] as u32, idx[2] as u32]);
         }
-        let wheel_collider = Collider::convex_decomposition(
-            &mesh
-                .attribute(Mesh::ATTRIBUTE_POSITION)
-                .unwrap()
-                .as_float3()
-                .unwrap()
-                .iter()
-                .map(|v| Vec3::from_array(*v))
-                .collect::<Vec<_>>(),
-            &idxs,
-        );
-        //let wheel_collider = Collider::from_bevy_mesh(&mesh, computed_shape);
+
+        let wheel_collider = Collider::round_cylinder(tire_thickness, wheel_rad, tire_thickness);
         let mass_props = ColliderMassProperties::Density(conf.density);
         let damping = conf.damping;
 
@@ -129,8 +119,11 @@ pub fn spawn_tires(
             fork_rb_entity
         };
 
-        let revolute_builder = RevoluteJointBuilder::new(Vec3::X);
-        let axel_joint = MultibodyJoint::new(axel_parent_entity, revolute_builder);
+        let axel_builder = RevoluteJointBuilder::new(Vec3::Y);
+        let mut axel_joint = MultibodyJoint::new(axel_parent_entity, axel_builder);
+        // re-orient the joint so that the wheel is correctly oriented
+        let real_axel = *axel_joint.data.set_local_axis1(Vec3::X);
+        axel_joint.data = real_axel;
 
         commands.spawn(pbr_bundle.clone()).insert((
             wheel_collider,
@@ -144,7 +137,6 @@ pub fn spawn_tires(
             CyberWheel,
             ExternalForce::default(),
             Restitution::new(conf.restitution),
-            SpatialBundle::default(),
             TransformInterpolation::default(),
             RigidBody::Dynamic,
         ));

From 4e6fab5952cb14b48ec896179753da1d245294d4 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 22 Feb 2023 17:10:36 -0800
Subject: [PATCH 04/13] Re-enable the cyberplanet and stuff.

This reverts commit a4189342e08be19a8012fcc3293e32d164f20cc8.
---
 src/action/systems.rs |  8 ++------
 src/bike/body.rs      |  4 ----
 src/camera.rs         |  2 +-
 src/glamor.rs         | 13 +++++++------
 src/lights.rs         | 36 ++++++++++++++++++------------------
 src/planet.rs         | 32 ++++++++++++++++++--------------
 6 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/src/action/systems.rs b/src/action/systems.rs
index 70ab712..09aea8f 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -43,9 +43,7 @@ pub(super) fn gravity(
     mut rapier_config: ResMut<RapierConfiguration>,
 ) {
     let (xform, mut forces) = query.single_mut();
-    // flatland
-    //rapier_config.gravity = xform.translation.normalize() * -settings.gravity;
-    rapier_config.gravity = Vec3::Y * -settings.gravity;
+    rapier_config.gravity = xform.translation.normalize() * -settings.gravity;
     forces.force = Vec3::ZERO;
     forces.torque = Vec3::ZERO;
 }
@@ -85,9 +83,7 @@ pub(super) fn falling_cat(
     #[cfg(feature = "inspector")] mut debug_instant: ResMut<ActionDebugInstant>,
 ) {
     let (xform, mut forces, mut control_vars) = bike_query.single_mut();
-    //let world_up = xform.translation.normalize();
-    // flatland
-    let world_up = Vec3::Y;
+    let world_up = xform.translation.normalize();
     let rot = Quat::from_axis_angle(xform.back(), lean.lean);
     let target_up = rotate_point(&world_up, &rot).normalize();
 
diff --git a/src/bike/body.rs b/src/bike/body.rs
index 4d2b93b..44e4baf 100644
--- a/src/bike/body.rs
+++ b/src/bike/body.rs
@@ -24,10 +24,6 @@ pub(super) fn spawn_cyberbike(
     let right = xform.right() * 350.0;
     xform.translation += right;
 
-    // flatland
-    let altitude = 10.0;
-    let xform = Transform::from_translation(Vec3::Y * altitude);
-
     let damping = Damping {
         angular_damping: 2.0,
         linear_damping: 0.1,
diff --git a/src/camera.rs b/src/camera.rs
index 7af057e..e59edf2 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -65,7 +65,7 @@ fn follow_cyberbike(
     offset: Res<DebugCamOffset>,
 ) {
     let bike_xform = *query.p0().single();
-    let up = Vec3::Y;
+    let up = bike_xform.translation.normalize();
 
     for (mut cam_xform, cam_type) in query.p1().iter_mut() {
         match *cam_type {
diff --git a/src/glamor.rs b/src/glamor.rs
index 7518486..8e51135 100644
--- a/src/glamor.rs
+++ b/src/glamor.rs
@@ -9,7 +9,7 @@ use crate::{lights::AnimateCyberLightWireframe, planet::CyberPlanet};
 
 pub const BISEXY_COLOR: Color = Color::hsla(292.0, 0.9, 0.60, 1.1);
 
-fn _wireframe_planet(
+fn wireframe_planet(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut polylines: ResMut<Assets<Polyline>>,
@@ -57,7 +57,7 @@ fn _wireframe_planet(
     });
 }
 
-fn _wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
+fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
     let chance = 0.005;
 
     let rng = &mut thread_rng();
@@ -74,20 +74,17 @@ fn _wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
 pub struct CyberGlamorPlugin;
 impl Plugin for CyberGlamorPlugin {
     fn build(&self, app: &mut App) {
-        app.insert_resource(ClearColor(Color::rgb(0.408, 0.6236, 0.925)));
-
+        #[cfg(feature = "inspector")]
         {
             use bevy_rapier3d::render::{
                 DebugRenderMode, DebugRenderStyle, RapierDebugRenderPlugin,
             };
             let style = DebugRenderStyle {
                 multibody_joint_anchor_color: Color::GREEN.as_rgba_f32(),
-                multibody_joint_separation_color: Color::GOLD.as_rgba_f32(),
                 ..Default::default()
             };
             let mode = DebugRenderMode::CONTACTS
                 | DebugRenderMode::SOLVER_CONTACTS
-                | DebugRenderMode::COLLIDER_SHAPES
                 | DebugRenderMode::JOINTS
                 | DebugRenderMode::RIGID_BODY_AXES;
 
@@ -100,5 +97,9 @@ impl Plugin for CyberGlamorPlugin {
 
             app.add_plugin(rplugin);
         }
+
+        app.add_startup_system_to_stage(StartupStage::PostStartup, wireframe_planet)
+            .add_system(wireframify_lights)
+            .add_plugin(PolylinePlugin);
     }
 }
diff --git a/src/lights.rs b/src/lights.rs
index b512587..194a8fa 100644
--- a/src/lights.rs
+++ b/src/lights.rs
@@ -9,8 +9,8 @@ pub const LIGHT_RANGE: f32 = 90.0;
 
 #[derive(Component)]
 struct AnimatedCyberLight {
-    _axis: Vec3,
-    _rate: f32,
+    axis: Vec3,
+    rate: f32,
 }
 
 #[derive(Component, Default)]
@@ -18,7 +18,7 @@ pub(crate) struct AnimateCyberLightWireframe {
     pub wired: bool,
 }
 
-fn _spawn_moving_lights(
+fn spawn_moving_lights(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
@@ -27,13 +27,13 @@ fn _spawn_moving_lights(
     // spawn orbiting bisexual lights
     for _ in 0..655 {
         // mechanics
-        let _axis = crate::random_unit_vec(rng);
+        let axis = crate::random_unit_vec(rng);
         let angle = rng.gen_range(0.0..TAU);
-        let _rate: f32 = rng.gen_range(7.0..10.0);
-        let _rate = _rate.to_radians();
-        let rotation = Quat::from_axis_angle(_axis, angle);
+        let rate: f32 = rng.gen_range(7.0..10.0);
+        let rate = rate.to_radians();
+        let rotation = Quat::from_axis_angle(axis, angle);
         let altitude = PLANET_RADIUS + rng.gen_range(8.0..20.0);
-        let perp = _axis.any_orthonormal_vector();
+        let perp = axis.any_orthonormal_vector();
         let translation = perp * altitude;
         let transform = Transform::from_translation(translation);
 
@@ -59,7 +59,7 @@ fn _spawn_moving_lights(
         };
         commands
             // first, spawn an entity with a transform we can rotate
-            .spawn((AnimatedCyberLight { _axis, _rate },))
+            .spawn((AnimatedCyberLight { axis, rate },))
             .insert(sbundle)
             .with_children(|parent| {
                 parent
@@ -122,7 +122,7 @@ fn spawn_static_lights(
     // up light
     commands
         .spawn(PointLightBundle {
-            transform: Transform::from_xyz(20.0, 100.0, 20.0),
+            transform: Transform::from_xyz(0.0, PLANET_RADIUS + 30.0, 0.0),
             point_light: pink_light,
             ..Default::default()
         })
@@ -143,7 +143,7 @@ fn spawn_static_lights(
     // down light
     commands
         .spawn(PointLightBundle {
-            transform: Transform::from_xyz(-20.0, 100.0, -20.0),
+            transform: Transform::from_xyz(0.0, -PLANET_RADIUS - 30.0, 0.0),
             point_light: blue_light,
             ..Default::default()
         })
@@ -163,20 +163,20 @@ fn spawn_static_lights(
         });
 }
 
-fn _orbit_lights(time: Res<Time>, mut query: Query<(&mut Transform, &AnimatedCyberLight)>) {
+fn orbit_lights(time: Res<Time>, mut query: Query<(&mut Transform, &AnimatedCyberLight)>) {
     let dt = time.delta_seconds();
     for (mut transform, light) in query.iter_mut() {
-        let AnimatedCyberLight { _axis, _rate } = *light;
-        let theta = _rate * dt;
-        transform.rotation *= Quat::from_axis_angle(_axis, theta);
+        let AnimatedCyberLight { axis, rate } = *light;
+        let theta = rate * dt;
+        transform.rotation *= Quat::from_axis_angle(axis, theta);
     }
 }
 
 pub struct CyberSpaceLightsPlugin;
 impl Plugin for CyberSpaceLightsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_startup_system(spawn_static_lights);
-        //.add_startup_system(spawn_moving_lights)
-        //.add_system(orbit_lights);
+        app.add_startup_system(spawn_static_lights)
+            .add_startup_system(spawn_moving_lights)
+            .add_system(orbit_lights);
     }
 }
diff --git a/src/planet.rs b/src/planet.rs
index 96b374e..8e6807b 100644
--- a/src/planet.rs
+++ b/src/planet.rs
@@ -1,9 +1,15 @@
-use bevy::prelude::{shape::Plane, *};
+use bevy::{
+    prelude::{shape::Icosphere, *},
+    render::mesh::Indices,
+};
 use bevy_rapier3d::prelude::*;
+use hexasphere::shapes::IcoSphere;
+use noise::{HybridMulti, NoiseFn, SuperSimplex};
+use wgpu::PrimitiveTopology;
 
 use crate::Label;
 
-pub const PLANET_RADIUS: f32 = 600.0;
+pub const PLANET_RADIUS: f32 = 6000.0;
 
 #[derive(Component)]
 pub struct CyberPlanet;
@@ -13,23 +19,23 @@ fn spawn_planet(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let color = Color::rgba(0.7, 0.7, 0.8, 0.3);
-    let plane = Plane {
-        size: PLANET_RADIUS,
+    let color = Color::rgb(0.2, 0.1, 0.2);
+    let isphere = Icosphere {
+        radius: PLANET_RADIUS,
+        subdivisions: 88,
     };
-    //let (mesh, shape) = gen_planet(plane);
-    let mesh = Mesh::from(plane);
-    let shape = Collider::from_bevy_mesh(&mesh, &ComputedColliderShape::TriMesh).unwrap();
+
+    let (mesh, shape) = gen_planet(isphere);
 
     let pbody = (RigidBody::Fixed, Ccd { enabled: true });
 
     let pcollide = (
         shape,
         Friction {
-            coefficient: 0.8,
+            coefficient: 1.2,
             ..Default::default()
         },
-        Restitution::new(0.0),
+        Restitution::new(0.8),
     );
 
     commands
@@ -61,8 +67,7 @@ impl Plugin for CyberPlanetPlugin {
 // utils
 //---------------------------------------------------------------------
 
-/*
-fn gen_planet(sphere: Plane) -> (Mesh, Collider) {
+fn gen_planet(sphere: Icosphere) -> (Mesh, Collider) {
     // straight-up stolen from Bevy's impl of Mesh from Icosphere, so I can do the
     // displacement before normals are calculated.
     let generated = IcoSphere::new(sphere.subdivisions, |point| {
@@ -81,7 +86,7 @@ fn gen_planet(sphere: Plane) -> (Mesh, Collider) {
         .raw_points()
         .iter()
         .map(|&p| {
-            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.05;
+            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.04;
             let pt = p + (p.normalize() * disp);
             pt.into()
         })
@@ -115,4 +120,3 @@ fn gen_planet(sphere: Plane) -> (Mesh, Collider) {
     mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs);
     (mesh, shape)
 }
-*/

From 031d4815e243cf31f59511b20688aee064bb7a06 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 22 Feb 2023 22:39:48 -0800
Subject: [PATCH 05/13] fucked up

---
 src/action/components.rs |  4 +---
 src/action/mod.rs        |  1 +
 src/action/systems.rs    | 11 ++++++++++-
 src/bike/body.rs         |  2 +-
 src/bike/components.rs   |  2 +-
 src/bike/wheels.rs       | 14 ++++----------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/action/components.rs b/src/action/components.rs
index 1652477..efa3cea 100644
--- a/src/action/components.rs
+++ b/src/action/components.rs
@@ -46,14 +46,12 @@ impl Default for Tunneling {
 pub struct MovementSettings {
     pub accel: f32,
     pub gravity: f32,
-    pub sensitivity: f32,
 }
 
 impl Default for MovementSettings {
     fn default() -> Self {
         Self {
-            sensitivity: 6.0,
-            accel: 40.0,
+            accel: 20.0,
             gravity: 9.8,
         }
     }
diff --git a/src/action/mod.rs b/src/action/mod.rs
index af13e47..dabccf2 100644
--- a/src/action/mod.rs
+++ b/src/action/mod.rs
@@ -28,6 +28,7 @@ impl Plugin for CyberActionPlugin {
             .register_type::<CyberLean>()
             .register_type::<CatControllerSettings>()
             .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
+            .add_startup_system(timestep_setup)
             .add_plugin(FrameTimeDiagnosticsPlugin::default())
             .add_system(surface_fix.label("surface_fix"))
             .add_system(gravity.label("gravity").before("cat"))
diff --git a/src/action/systems.rs b/src/action/systems.rs
index 09aea8f..1f29e12 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -5,7 +5,7 @@ use bevy::prelude::{
 };
 use bevy_rapier3d::prelude::{
     CollisionGroups, ExternalForce, Group, MultibodyJoint, QueryFilter, RapierConfiguration,
-    RapierContext, ReadMassProperties, Velocity,
+    RapierContext, ReadMassProperties, TimestepMode, Velocity,
 };
 
 #[cfg(feature = "inspector")]
@@ -36,6 +36,15 @@ fn rotate_point(pt: &Vec3, rot: &Quat) -> Vec3 {
     -Vec3::from_array([rot_qpt.x, rot_qpt.y, rot_qpt.z])
 }
 
+pub(super) fn timestep_setup(mut config: ResMut<RapierConfiguration>) {
+    let ts = TimestepMode::Interpolated {
+        dt: 1.0 / 55.0,
+        time_scale: 1.0,
+        substeps: 16,
+    };
+    config.timestep_mode = ts;
+}
+
 /// The gravity vector points from the cyberbike to the center of the planet.
 pub(super) fn gravity(
     mut query: Query<(&Transform, &mut ExternalForce), With<CyberBikeBody>>,
diff --git a/src/bike/body.rs b/src/bike/body.rs
index 44e4baf..533eb58 100644
--- a/src/bike/body.rs
+++ b/src/bike/body.rs
@@ -55,7 +55,7 @@ pub(super) fn spawn_cyberbike(
         .spawn(RigidBody::Dynamic)
         .insert(spatialbundle)
         .insert((
-            Collider::capsule(Vec3::new(0.0, 0.0, -0.65), Vec3::new(0.0, 0.0, 0.8), 0.40),
+            Collider::capsule(Vec3::new(0.0, 0.0, -0.65), Vec3::new(0.0, 0.0, 0.8), 0.5),
             bike_collision_group,
             mass_properties,
             damping,
diff --git a/src/bike/components.rs b/src/bike/components.rs
index 0f8ee1b..e98f66f 100644
--- a/src/bike/components.rs
+++ b/src/bike/components.rs
@@ -38,7 +38,7 @@ impl Default for WheelConfig {
             stiffness: 50.0,
             damping: 8.0,
             radius: 0.3,
-            thickness: 0.06,
+            thickness: 0.2,
             friction: 1.2,
             restitution: 0.8,
             density: 0.6,
diff --git a/src/bike/wheels.rs b/src/bike/wheels.rs
index 555cbb9..7ee8e4c 100644
--- a/src/bike/wheels.rs
+++ b/src/bike/wheels.rs
@@ -76,14 +76,8 @@ pub fn spawn_tires(
             linear_damping: 0.8,
             ..Default::default()
         };
-        let mesh = Mesh::from(tire);
-        let mut idxs = Vec::new();
-        let indices = mesh.indices().unwrap().iter().collect::<Vec<_>>();
-        for idx in indices.as_slice().chunks_exact(3) {
-            idxs.push([idx[0] as u32, idx[1] as u32, idx[2] as u32]);
-        }
 
-        let wheel_collider = Collider::round_cylinder(tire_thickness, wheel_rad, tire_thickness);
+        let wheel_collider = Collider::ball(wheel_rad);
         let mass_props = ColliderMassProperties::Density(conf.density);
         let damping = conf.damping;
 
@@ -119,11 +113,11 @@ pub fn spawn_tires(
             fork_rb_entity
         };
 
-        let axel_builder = RevoluteJointBuilder::new(Vec3::Y);
+        let axel_builder = RevoluteJointBuilder::new(Vec3::X);
         let mut axel_joint = MultibodyJoint::new(axel_parent_entity, axel_builder);
         // re-orient the joint so that the wheel is correctly oriented
-        let real_axel = *axel_joint.data.set_local_axis1(Vec3::X);
-        axel_joint.data = real_axel;
+        //let real_axel = *axel_joint.data.set_local_axis1(Vec3::X);
+        //axel_joint.data = real_axel;
 
         commands.spawn(pbr_bundle.clone()).insert((
             wheel_collider,

From 0f1c24ed37608fdd764b8a24c7401fef9d095791 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 23 Feb 2023 13:38:39 -0800
Subject: [PATCH 06/13] use fixed timestep

---
 src/action/systems.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/action/systems.rs b/src/action/systems.rs
index 1f29e12..5581cf8 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -37,10 +37,9 @@ fn rotate_point(pt: &Vec3, rot: &Quat) -> Vec3 {
 }
 
 pub(super) fn timestep_setup(mut config: ResMut<RapierConfiguration>) {
-    let ts = TimestepMode::Interpolated {
-        dt: 1.0 / 55.0,
-        time_scale: 1.0,
-        substeps: 16,
+    let ts = TimestepMode::Fixed {
+        dt: 1.0 / 60.0,
+        substeps: 2,
     };
     config.timestep_mode = ts;
 }

From 708b518047bb0326bacf6eb43cd27e382625cd2e Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 23 Feb 2023 14:28:30 -0800
Subject: [PATCH 07/13] normalize pt->quat

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

diff --git a/src/action/systems.rs b/src/action/systems.rs
index 5581cf8..74c1163 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -27,7 +27,7 @@ fn yaw_to_angle(yaw: f32) -> f32 {
 
 fn rotate_point(pt: &Vec3, rot: &Quat) -> Vec3 {
     // thanks to https://danceswithcode.net/engineeringnotes/quaternions/quaternions.html
-    let [x, y, z] = pt.to_array();
+    let [x, y, z] = pt.normalize().to_array();
     let qpt = Quat::from_xyzw(x, y, z, 0.0);
     // p' = rot^-1 * qpt * rot
     let rot_qpt = rot.inverse() * qpt * *rot;

From 2db604177435ef9794c5d53ce0a594fd9bfb2460 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 23 Feb 2023 22:08:08 -0800
Subject: [PATCH 08/13] still gets unstable

---
 src/action/systems.rs  | 18 ++++++++++--------
 src/bike/body.rs       |  2 +-
 src/bike/components.rs |  6 +++---
 src/bike/wheels.rs     | 39 +++++++++++++++++++++------------------
 src/planet.rs          |  2 +-
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/action/systems.rs b/src/action/systems.rs
index 74c1163..30f3f7b 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -49,8 +49,18 @@ pub(super) fn gravity(
     mut query: Query<(&Transform, &mut ExternalForce), With<CyberBikeBody>>,
     settings: Res<MovementSettings>,
     mut rapier_config: ResMut<RapierConfiguration>,
+    #[cfg(feature = "inspector")] mut debug_instant: ResMut<ActionDebugInstant>,
 ) {
     let (xform, mut forces) = query.single_mut();
+
+    #[cfg(feature = "inspector")]
+    {
+        if debug_instant.elapsed().as_millis() > 1000 {
+            dbg!(&forces);
+            debug_instant.reset();
+        }
+    }
+
     rapier_config.gravity = xform.translation.normalize() * -settings.gravity;
     forces.force = Vec3::ZERO;
     forces.torque = Vec3::ZERO;
@@ -88,7 +98,6 @@ pub(super) fn falling_cat(
     time: Res<Time>,
     settings: Res<CatControllerSettings>,
     lean: Res<CyberLean>,
-    #[cfg(feature = "inspector")] mut debug_instant: ResMut<ActionDebugInstant>,
 ) {
     let (xform, mut forces, mut control_vars) = bike_query.single_mut();
     let world_up = xform.translation.normalize();
@@ -108,13 +117,6 @@ pub(super) fn falling_cat(
         if mag.is_finite() {
             forces.torque += xform.back() * mag;
         }
-        #[cfg(feature = "inspector")]
-        {
-            if debug_instant.elapsed().as_millis() > 1000 {
-                dbg!(&control_vars, mag, &target_up);
-                debug_instant.reset();
-            }
-        }
     }
 }
 
diff --git a/src/bike/body.rs b/src/bike/body.rs
index 533eb58..8ef8191 100644
--- a/src/bike/body.rs
+++ b/src/bike/body.rs
@@ -16,7 +16,7 @@ pub(super) fn spawn_cyberbike(
     wheel_conf: Res<WheelConfig>,
     mut meshterials: Meshterial,
 ) {
-    let altitude = PLANET_RADIUS - 180.0;
+    let altitude = PLANET_RADIUS - 10.0;
 
     let mut xform = Transform::from_translation(Vec3::X * altitude)
         .with_rotation(Quat::from_axis_angle(Vec3::Z, -89.0f32.to_radians()));
diff --git a/src/bike/components.rs b/src/bike/components.rs
index e98f66f..8619d07 100644
--- a/src/bike/components.rs
+++ b/src/bike/components.rs
@@ -37,11 +37,11 @@ impl Default for WheelConfig {
             limits: [-0.5, 0.1],
             stiffness: 50.0,
             damping: 8.0,
-            radius: 0.3,
+            radius: 0.38,
             thickness: 0.2,
             friction: 1.2,
-            restitution: 0.8,
-            density: 0.6,
+            restitution: 0.95,
+            density: 0.9,
         }
     }
 }
diff --git a/src/bike/wheels.rs b/src/bike/wheels.rs
index 7ee8e4c..8ce4fc7 100644
--- a/src/bike/wheels.rs
+++ b/src/bike/wheels.rs
@@ -17,7 +17,7 @@ pub fn spawn_tires(
     let wheels_collision_group = CollisionGroups::new(membership, filter);
     let wheel_y = conf.y;
     let wheel_rad = conf.radius;
-    let tire_thickness = conf.thickness;
+    let _tire_thickness = conf.thickness;
     let stiffness = conf.stiffness;
     let not_sleeping = Sleeping::disabled();
     let ccd = Ccd { enabled: true };
@@ -100,7 +100,7 @@ pub fn spawn_tires(
 
         let axel_parent_entity = if let Some(steering) = steering {
             let neck_builder =
-                RevoluteJointBuilder::new(rake_vec).local_anchor1(Vec3::new(0.0, 0.0, 0.1)); // this adds another 0.1m of trail
+                RevoluteJointBuilder::new(rake_vec).local_anchor1(Vec3::new(0.0, -0.08, 0.1)); // this adds another 0.1m of trail
             let neck_joint = MultibodyJoint::new(fork_rb_entity, neck_builder);
             let neck = commands
                 .spawn(RigidBody::Dynamic)
@@ -114,25 +114,28 @@ pub fn spawn_tires(
         };
 
         let axel_builder = RevoluteJointBuilder::new(Vec3::X);
-        let mut axel_joint = MultibodyJoint::new(axel_parent_entity, axel_builder);
+        let axel_joint = MultibodyJoint::new(axel_parent_entity, axel_builder);
         // re-orient the joint so that the wheel is correctly oriented
         //let real_axel = *axel_joint.data.set_local_axis1(Vec3::X);
         //axel_joint.data = real_axel;
 
-        commands.spawn(pbr_bundle.clone()).insert((
-            wheel_collider,
-            mass_props,
-            wheel_damping,
-            ccd,
-            not_sleeping,
-            axel_joint,
-            wheels_collision_group,
-            friction,
-            CyberWheel,
-            ExternalForce::default(),
-            Restitution::new(conf.restitution),
-            TransformInterpolation::default(),
-            RigidBody::Dynamic,
-        ));
+        commands
+            .spawn(pbr_bundle.clone())
+            .insert((
+                wheel_collider,
+                mass_props,
+                wheel_damping,
+                ccd,
+                not_sleeping,
+                axel_joint,
+                wheels_collision_group,
+                friction,
+                CyberWheel,
+                ExternalForce::default(),
+                Restitution::new(conf.restitution),
+                TransformInterpolation::default(),
+                RigidBody::Dynamic,
+            ))
+            .insert(SpatialBundle::default());
     }
 }
diff --git a/src/planet.rs b/src/planet.rs
index 8e6807b..0ea5cbf 100644
--- a/src/planet.rs
+++ b/src/planet.rs
@@ -9,7 +9,7 @@ use wgpu::PrimitiveTopology;
 
 use crate::Label;
 
-pub const PLANET_RADIUS: f32 = 6000.0;
+pub const PLANET_RADIUS: f32 = 3_000.0;
 
 #[derive(Component)]
 pub struct CyberPlanet;

From 81d5144dc6ce2a6ba54ad97a9c82c954e0283e39 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Tue, 7 Mar 2023 11:40:34 -0800
Subject: [PATCH 09/13] checkin

---
 Cargo.lock            | 87 +++++++++++++++++++++----------------------
 src/action/systems.rs | 35 +++++++++++------
 2 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5e1b68..054261b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -159,12 +159,11 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
@@ -911,9 +910,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -1139,9 +1138,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -1149,9 +1148,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -1160,14 +1159,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
  "scopeguard",
 ]
 
@@ -1183,9 +1182,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
 dependencies = [
  "cfg-if",
 ]
@@ -1980,9 +1979,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
@@ -2171,15 +2170,6 @@ dependencies = [
  "rand_xorshift",
 ]
 
-[[package]]
-name = "nom8"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -2243,18 +2233,18 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2359,9 +2349,9 @@ dependencies = [
 
 [[package]]
 name = "parry3d"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2852a4cf8f65177e6f3755a725fdc0a433cca4fa6a97a07ae8c8abd7a4b52ea"
+checksum = "008d029b6e85462d4af7c9fae8728b02bf8ab328c4bf6aa93c1e8fa1e1297723"
 dependencies = [
  "approx",
  "arrayvec",
@@ -2447,9 +2437,9 @@ checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
  "toml_edit",
@@ -2532,9 +2522,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "rapier3d"
-version = "0.17.1"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c3a4adb69feadac44d74be058aaaec4502f9c193ec20c0e629b07387ee61a2"
+checksum = "62a8a0bd9d3135f7b4eb45d0796540e7bab47b6b7c974f90567ccc5a0454f42b"
 dependencies = [
  "approx",
  "arrayvec",
@@ -2819,9 +2809,9 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2917,19 +2907,19 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
 
 [[package]]
 name = "toml_edit"
-version = "0.18.1"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825"
 dependencies = [
  "indexmap",
- "nom8",
  "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -3313,9 +3303,9 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c"
+checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -3514,6 +3504,15 @@ dependencies = [
  "x11-dl",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
diff --git a/src/action/systems.rs b/src/action/systems.rs
index 30f3f7b..e55670d 100644
--- a/src/action/systems.rs
+++ b/src/action/systems.rs
@@ -12,7 +12,7 @@ use bevy_rapier3d::prelude::{
 use super::ActionDebugInstant;
 use super::{CatControllerSettings, CatControllerState, CyberLean, MovementSettings, Tunneling};
 use crate::{
-    bike::{CyberBikeBody, CyberSteering, CyberWheel, BIKE_WHEEL_COLLISION_GROUP},
+    bike::{CyberBikeBody, CyberSteering, CyberWheel, WheelConfig, BIKE_WHEEL_COLLISION_GROUP},
     input::InputState,
 };
 
@@ -53,9 +53,9 @@ pub(super) fn gravity(
 ) {
     let (xform, mut forces) = query.single_mut();
 
-    #[cfg(feature = "inspector")]
+    #[cfg(feature = "inspectorb")]
     {
-        if debug_instant.elapsed().as_millis() > 1000 {
+        if debug_instant.elapsed().as_millis() > 6000 {
             dbg!(&forces);
             debug_instant.reset();
         }
@@ -139,15 +139,20 @@ pub(super) fn input_forces(
     let force = ExternalForce::at_point(thrust, point, xform.translation);
     *forces += force;
 
-    // brake
+    // brake + thrust
     for mut motor in braking_query.iter_mut() {
-        let factor = if input.brake { 500.00 } else { 0.0 };
+        let factor = if input.brake {
+            500.00
+        } else {
+            input.throttle * settings.accel
+        };
+        let speed = if input.brake { 0.0 } else { -70.0 };
         motor.data = (*motor
             .data
             .as_revolute_mut()
             .unwrap()
             .set_motor_max_force(factor)
-            .set_motor_velocity(0.0, factor))
+            .set_motor_velocity(speed, factor))
         .into();
     }
 
@@ -169,23 +174,31 @@ pub(super) fn surface_fix(
         (Entity, &Transform, &mut CollisionGroups),
         (With<CyberWheel>, Without<Tunneling>),
     >,
+    span_query: Query<&Transform, With<CyberWheel>>,
+    config: Res<WheelConfig>,
     context: Res<RapierContext>,
 ) {
-    // assume the body is not below the planet surface
+    let mut wheels = Vec::new();
+    for xform in span_query.iter() {
+        wheels.push(xform);
+    }
+    let span = (wheels[1].translation - wheels[0].translation).normalize();
+
     for (entity, xform, mut cgroups) in wheel_query.iter_mut() {
-        let ray_dir = xform.translation.normalize();
+        //let ray_dir = xform.translation.normalize();
+        let ray_dir = xform.right().cross(span).normalize();
         if let Some(hit) = context.cast_ray_and_get_normal(
             xform.translation,
             ray_dir,
-            10.0,
+            config.radius * 1.1,
             false,
             QueryFilter::only_fixed(),
         ) {
             cgroups.memberships = Group::NONE;
             cgroups.filters = Group::NONE;
             commands.entity(entity).insert(Tunneling {
-                frames: 10,
-                dir: -hit.1.normal,
+                frames: 3,
+                dir: hit.1.normal,
             });
         }
     }

From aa9a89ae9487884ffe604ef65c26c6dd169f2d2c Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 9 Mar 2023 13:09:28 -0800
Subject: [PATCH 10/13] polyline plugin needs to be updated

---
 Cargo.lock        | 1827 +++++++++++++++++++++++++++++++++++----------
 Cargo.toml        |   11 +-
 src/action/mod.rs |   26 +-
 src/bike/mod.rs   |    4 +-
 src/camera.rs     |    8 +-
 src/glamor.rs     |    2 +-
 src/input.rs      |   24 +-
 src/lib.rs        |    8 +-
 8 files changed, 1456 insertions(+), 454 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 054261b..08d1ffc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,6 +18,68 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
+[[package]]
+name = "accesskit"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+dependencies = [
+ "accesskit",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc50af17818440f580a894536c4c5a95ff9e4bad59f19ee68757ca959d001813"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "objc2",
+ "once_cell",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "arrayvec",
+ "once_cell",
+ "paste",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "accesskit_winit"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eb880d83a5502edd311bdb3af1cf7113b250c9c2d92fbdd05342c7b9f38bf51"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "accesskit_windows",
+ "winit",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -55,6 +117,30 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-activity"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
+dependencies = [
+ "android-properties",
+ "bitflags",
+ "cc",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
 [[package]]
 name = "android_log-sys"
 version = "0.2.0"
@@ -184,6 +270,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -196,29 +297,39 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9"
 dependencies = [
- "bevy_internal",
+ "bevy_internal 0.9.1",
+]
+
+[[package]]
+name = "bevy"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc88fece4660d68690585668f1a4e18e6dcbab160b08f337b498a96ccde91cfe"
+dependencies = [
+ "bevy_internal 0.10.0",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be4f9fa859e4840e7cbcc0ddf2c8a1441ff8f663c317769c5ccc70cdf13bcf2"
+checksum = "69bffd8614a60f187983e9f805bba13c298294f4666172ae7ab9c39ad61919fa"
 dependencies = [
  "bevy-inspector-egui-derive",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core 0.10.0",
+ "bevy_core_pipeline 0.10.0",
+ "bevy_ecs 0.10.0",
  "bevy_egui",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
+ "bevy_hierarchy 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_pbr 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
  "egui",
  "image",
  "once_cell",
@@ -228,25 +339,52 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97826e6225a5b56e77683e7b99418171f7531d48682b8531252dc6b8ef3e8113"
+checksum = "fc47dfcdcb52182af97741c1582cc9b3bb4e82f0adacf4c3e78909d438cbfc8b"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "bevy_a11y"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a10b25cf04971b9d68271aa54e4601c673509db6edaf1f5359dd91fb3e84cc27"
+dependencies = [
+ "accesskit",
+ "bevy_app 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+]
+
 [[package]]
 name = "bevy_app"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42"
 dependencies = [
- "bevy_derive",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_utils 0.9.1",
+ "downcast-rs",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "bevy_app"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960c6e444dc6a25dd51a2196f04872ae9e2e876802b66c391104849ec9225e38"
+dependencies = [
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_utils 0.10.0",
  "downcast-rs",
  "wasm-bindgen",
  "web-sys",
@@ -259,13 +397,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4"
 dependencies = [
  "anyhow",
- "bevy_app",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_log",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_diagnostic 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_tasks 0.9.1",
+ "bevy_utils 0.9.1",
  "crossbeam-channel",
  "downcast-rs",
  "fastrand",
@@ -279,18 +417,60 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_asset"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adea538a3d166c8609621994972c31be591c96f931f160f96e74697d8c24ba45"
+dependencies = [
+ "anyhow",
+ "bevy_app 0.10.0",
+ "bevy_diagnostic 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_tasks 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_winit",
+ "crossbeam-channel",
+ "downcast-rs",
+ "fastrand",
+ "js-sys",
+ "parking_lot",
+ "serde",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "bevy_core"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_tasks 0.9.1",
+ "bevy_utils 0.9.1",
+ "bytemuck",
+]
+
+[[package]]
+name = "bevy_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed29797fa386c6969fa1e4ef9e194a27f89ddb2fa78751fe46838495d374f90f"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_tasks 0.10.0",
+ "bevy_utils 0.10.0",
  "bytemuck",
 ]
 
@@ -300,15 +480,35 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bitflags",
+ "radsort",
+ "serde",
+]
+
+[[package]]
+name = "bevy_core_pipeline"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3129d308df70dee3c46b6bb64e54d2552e7106fd3185d75732ad5e739a830fee"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
  "bitflags",
  "radsort",
  "serde",
@@ -320,7 +520,18 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.9.1",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf11701c01bf4dc7a3fac9f4547f3643d3db4cc1682af40c8c86e2f8734b617"
+dependencies = [
+ "bevy_macro_utils 0.10.0",
  "quote",
  "syn",
 ]
@@ -331,12 +542,27 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4"
 dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_log",
- "bevy_time",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_core 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_time 0.9.1",
+ "bevy_utils 0.9.1",
+]
+
+[[package]]
+name = "bevy_diagnostic"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "576508ffe7ad5124781edd352b79bdc79ffbb6e2f26bad6f722774f7c9fd16c9"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_core 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_time 0.10.0",
+ "bevy_utils 0.10.0",
+ "sysinfo",
 ]
 
 [[package]]
@@ -346,11 +572,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74"
 dependencies = [
  "async-channel",
- "bevy_ecs_macros",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_ecs_macros 0.9.1",
+ "bevy_ptr 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_tasks 0.9.1",
+ "bevy_utils 0.9.1",
  "downcast-rs",
  "event-listener",
  "fixedbitset",
@@ -359,13 +585,45 @@ dependencies = [
  "thread_local",
 ]
 
+[[package]]
+name = "bevy_ecs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc5b19451128091e8507c9247888359ca0bfa895e7f6ca749ccc55c5463bef6"
+dependencies = [
+ "async-channel",
+ "bevy_ecs_macros 0.10.0",
+ "bevy_ptr 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_tasks 0.10.0",
+ "bevy_utils 0.10.0",
+ "downcast-rs",
+ "event-listener",
+ "fixedbitset",
+ "rustc-hash",
+ "serde",
+ "thread_local",
+]
+
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.9.1",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_ecs_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e79757319533bde006a4f30c268223ec6426371297182925932075ccfdae30"
+dependencies = [
+ "bevy_macro_utils 0.10.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -373,12 +631,12 @@ dependencies = [
 
 [[package]]
 name = "bevy_egui"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb8036050af170243e803eb68e0b5d34f549828a8de92479619fb6dac842f85"
+checksum = "bf0efb32c83ae6d2cc36bda08a029d74fdeb45870489599d3779a36649802bce"
 dependencies = [
  "arboard",
- "bevy",
+ "bevy 0.10.0",
  "egui",
  "thread_local",
  "webbrowser",
@@ -390,20 +648,30 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24"
 dependencies = [
- "bevy_macro_utils",
- "encase_derive_impl",
+ "bevy_macro_utils 0.9.1",
+ "encase_derive_impl 0.4.1",
+]
+
+[[package]]
+name = "bevy_encase_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "723d4838d1f88955f348294c0a9d067307f2437725400b0776e9677154914f14"
+dependencies = [
+ "bevy_macro_utils 0.10.0",
+ "encase_derive_impl 0.5.0",
 ]
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4af552dad82f854b2fae24f36a389fd8ee99d65fe86ae876e854e70d53ff16d9"
+checksum = "905e547d213e368f997d08f140f4e893923c7dce4760bf0fb63401232262fa79"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_utils",
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_input 0.10.0",
+ "bevy_utils 0.10.0",
  "gilrs",
 ]
 
@@ -415,21 +683,21 @@ checksum = "e853e346ba412354e02292c7aa5b9a9dccdfa748e273b1b7ebf8f6a172f89712"
 dependencies = [
  "anyhow",
  "base64",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_tasks",
- "bevy_transform",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core 0.9.1",
+ "bevy_core_pipeline 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_hierarchy 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_pbr 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_scene 0.9.1",
+ "bevy_tasks 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
  "gltf",
  "percent-encoding",
  "thiserror",
@@ -441,12 +709,27 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a"
 dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_log",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_core 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_utils 0.9.1",
+ "smallvec",
+]
+
+[[package]]
+name = "bevy_hierarchy"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd246c862fcaeef3a769f47c6297139f971db0c8fdd6188fe9419ee8873b7e8"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_core 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_utils 0.10.0",
  "smallvec",
 ]
 
@@ -456,11 +739,25 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_utils 0.9.1",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_input"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c809b3df62e1fcbdc6744233ae6c95a67d2cc7e518db43ab81f417d5875ba3b"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_utils 0.10.0",
  "thiserror",
 ]
 
@@ -470,36 +767,67 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_gilrs",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core 0.9.1",
+ "bevy_core_pipeline 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_diagnostic 0.9.1",
+ "bevy_ecs 0.9.1",
  "bevy_gltf",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_sprite",
- "bevy_tasks",
- "bevy_text",
- "bevy_time",
- "bevy_transform",
- "bevy_ui",
- "bevy_utils",
- "bevy_window",
- "bevy_winit",
+ "bevy_hierarchy 0.9.1",
+ "bevy_input 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_pbr 0.9.1",
+ "bevy_ptr 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_sprite 0.9.1",
+ "bevy_tasks 0.9.1",
+ "bevy_text 0.9.1",
+ "bevy_time 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_ui 0.9.1",
+ "bevy_utils 0.9.1",
+ "bevy_window 0.9.1",
  "ndk-glue",
 ]
 
+[[package]]
+name = "bevy_internal"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a065c7ac81cd7cf3f1b8f15c4a93db5f07274ddaaec145ba7d0393be0c9c413"
+dependencies = [
+ "bevy_a11y",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core 0.10.0",
+ "bevy_core_pipeline 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_diagnostic 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_gilrs",
+ "bevy_hierarchy 0.10.0",
+ "bevy_input 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_pbr 0.10.0",
+ "bevy_ptr 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_scene 0.10.0",
+ "bevy_tasks 0.10.0",
+ "bevy_text 0.10.0",
+ "bevy_time 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_ui 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
+ "bevy_winit",
+]
+
 [[package]]
 name = "bevy_log"
 version = "0.9.1"
@@ -507,9 +835,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b"
 dependencies = [
  "android_log-sys",
- "bevy_app",
- "bevy_ecs",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_utils 0.9.1",
+ "console_error_panic_hook",
+ "tracing-log",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
+[[package]]
+name = "bevy_log"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47dcb09ec71145c80d88a84181cc1449d30f23c571bdd58c59c10eece82dfaa5"
+dependencies = [
+ "android_log-sys",
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_utils 0.10.0",
  "console_error_panic_hook",
  "tracing-log",
  "tracing-subscriber",
@@ -527,6 +871,17 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "bevy_macro_utils"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f24ca3363292f1435641fbafd5c24ce362137dd7d69bee56dcaaa2bc1d512ffe"
+dependencies = [
+ "quote",
+ "syn",
+ "toml_edit",
+]
+
 [[package]]
 name = "bevy_math"
 version = "0.9.1"
@@ -537,6 +892,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bevy_math"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e45e46c2ac0a92db3ae622f2ed690928fe2612e7c9470a46d0ed4c2c77e2e95"
+dependencies = [
+ "glam 0.23.0",
+ "serde",
+]
+
 [[package]]
 name = "bevy_mikktspace"
 version = "0.9.1"
@@ -546,23 +911,54 @@ dependencies = [
  "glam 0.22.0",
 ]
 
+[[package]]
+name = "bevy_mikktspace"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaa0358a79823e6f0069b910d90b615d02dad08279b5856d3d1e401472b6379a"
+dependencies = [
+ "glam 0.23.0",
+]
+
 [[package]]
 name = "bevy_pbr"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core_pipeline 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bevy_window 0.9.1",
+ "bitflags",
+ "bytemuck",
+ "radsort",
+]
+
+[[package]]
+name = "bevy_pbr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90230c526ee7257229c1db0fc4aafaa947ea806bb4b0674785930ea59d0cc7f8"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core_pipeline 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
  "bitflags",
  "bytemuck",
  "radsort",
@@ -574,9 +970,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea592675cbb5ed69add81ebcf0f5dbaf315fa7f2868dfe20e24a1292b66314e6"
 dependencies = [
- "bevy",
+ "bevy 0.9.1",
  "bitflags",
- "naga",
+ "naga 0.10.0",
 ]
 
 [[package]]
@@ -586,12 +982,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4"
 
 [[package]]
-name = "bevy_rapier3d"
-version = "0.20.0"
+name = "bevy_ptr"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77057d7ecde9cff3ad7f36faa362dd540c25a6316e160550e49915f3a765fc53"
+checksum = "a96c24da064370917b92c2a84527e6a73b620c50ac5ef8b1af8c04ccf5256a7c"
+
+[[package]]
+name = "bevy_rapier3d"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4bce8074f19467fd55ab172ae6c11fca3ca28f66804590ab10c930bd5e9cd24"
 dependencies = [
- "bevy",
+ "bevy 0.10.0",
  "bitflags",
  "log",
  "nalgebra",
@@ -604,10 +1006,10 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a"
 dependencies = [
- "bevy_math",
- "bevy_ptr",
- "bevy_reflect_derive",
- "bevy_utils",
+ "bevy_math 0.9.1",
+ "bevy_ptr 0.9.1",
+ "bevy_reflect_derive 0.9.1",
+ "bevy_utils 0.9.1",
  "downcast-rs",
  "erased-serde",
  "glam 0.22.0",
@@ -618,13 +1020,47 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bevy_reflect"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab880e0eed9df5c99ce1a2f89edc11cdef1bc78413719b29e9ad7e3bc27f4c20"
+dependencies = [
+ "bevy_math 0.10.0",
+ "bevy_ptr 0.10.0",
+ "bevy_reflect_derive 0.10.0",
+ "bevy_utils 0.10.0",
+ "downcast-rs",
+ "erased-serde",
+ "glam 0.23.0",
+ "once_cell",
+ "parking_lot",
+ "serde",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.9.1",
+ "bit-set",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_reflect_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b361b8671bdffe93978270dd770b03b48560c3127fdf9003f98111fb806bb11"
+dependencies = [
+ "bevy_macro_utils 0.10.0",
  "bit-set",
  "proc-macro2",
  "quote",
@@ -639,31 +1075,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5"
 dependencies = [
  "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_derive",
- "bevy_ecs",
- "bevy_encase_derive",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_mikktspace",
- "bevy_reflect",
- "bevy_render_macros",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_encase_derive 0.9.1",
+ "bevy_hierarchy 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_mikktspace 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render_macros 0.9.1",
+ "bevy_time 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bevy_window 0.9.1",
  "bitflags",
  "codespan-reporting",
  "downcast-rs",
- "encase",
+ "encase 0.4.1",
  "futures-lite",
  "hex",
- "hexasphere 8.0.0",
+ "hexasphere 8.1.0",
  "image",
- "naga",
+ "naga 0.10.0",
  "once_cell",
  "parking_lot",
  "regex",
@@ -671,7 +1107,51 @@ dependencies = [
  "smallvec",
  "thiserror",
  "thread_local",
- "wgpu",
+ "wgpu 0.14.2",
+]
+
+[[package]]
+name = "bevy_render"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e352868ab1a9ad9fbaa6ff025505e685781ad1790377b2d038afeb9df18214"
+dependencies = [
+ "anyhow",
+ "async-channel",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_encase_derive 0.10.0",
+ "bevy_hierarchy 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_mikktspace 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render_macros 0.10.0",
+ "bevy_tasks 0.10.0",
+ "bevy_time 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
+ "bitflags",
+ "codespan-reporting",
+ "downcast-rs",
+ "encase 0.5.0",
+ "futures-lite",
+ "hexasphere 8.1.0",
+ "image",
+ "naga 0.11.0",
+ "once_cell",
+ "parking_lot",
+ "regex",
+ "serde",
+ "smallvec",
+ "thiserror",
+ "thread_local",
+ "wgpu 0.15.1",
+ "wgpu-hal 0.15.3",
 ]
 
 [[package]]
@@ -680,7 +1160,19 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.9.1",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_render_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "570b1d0f38439c5ac8ab75572804c9979b9caa372c49bd00803f60a22a3e1328"
+dependencies = [
+ "bevy_macro_utils 0.10.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -693,15 +1185,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea9c66a628c833d53bae54fe94cbc0d3f12c29e9d2e6c3f2356d45ad57db0c8c"
 dependencies = [
  "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_hierarchy 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "ron",
+ "serde",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_scene"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3995f756e482e964e0244a5d388e757f272d1dcdc02136730b1c45f4d5eeb516"
+dependencies = [
+ "anyhow",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_hierarchy 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
  "ron",
  "serde",
  "thiserror",
@@ -714,17 +1228,42 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core_pipeline 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bitflags",
+ "bytemuck",
+ "fixedbitset",
+ "guillotiere",
+ "rectangle-pack",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_sprite"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14aa41c9480b76d7b3c3f1ed89f95c9d6e2a39d3c3367ca82c122d853ac0463e"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core_pipeline 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
  "bitflags",
  "bytemuck",
  "fixedbitset",
@@ -748,6 +1287,21 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "bevy_tasks"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e368e4177fe70d695d5cb67fb7480fa262de79948d9b883a21788b9abf5a85a"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-task",
+ "concurrent-queue 2.1.0",
+ "futures-lite",
+ "once_cell",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "bevy_text"
 version = "0.9.1"
@@ -756,16 +1310,39 @@ checksum = "60c74c1bdaabde7db28f6728aa13bc7b1d744a2201b2bbfd83d2224404c57f5c"
 dependencies = [
  "ab_glyph",
  "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_sprite 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bevy_window 0.9.1",
+ "glyph_brush_layout",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_text"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fc934d7cbadbb6dac11547dfb805d3e6b3f0b40f6e66e437fe4b3c7581cc5c"
+dependencies = [
+ "ab_glyph",
+ "anyhow",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_sprite 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
  "glyph_brush_layout",
  "serde",
  "thiserror",
@@ -777,24 +1354,51 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_utils 0.9.1",
  "crossbeam-channel",
 ]
 
+[[package]]
+name = "bevy_time"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2f2863cfc08fa38909e047a1bbc2dd71d0836057ed0840c69ace9dff3e0c298"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_utils 0.10.0",
+ "crossbeam-channel",
+ "thiserror",
+]
+
 [[package]]
 name = "bevy_transform"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_math",
- "bevy_reflect",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_hierarchy 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+]
+
+[[package]]
+name = "bevy_transform"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de9cda3df545ac889b4f6b702109e51d29d7b4b6f402f2bb9b4d1d9f9c382b63"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_hierarchy 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
 ]
 
 [[package]]
@@ -803,26 +1407,56 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60e82ace6156f11fcdf2319102ff8fb8367b82d1e32b7d05d387a1963602f965"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_text",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.9.1",
+ "bevy_asset 0.9.1",
+ "bevy_core_pipeline 0.9.1",
+ "bevy_derive 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_hierarchy 0.9.1",
+ "bevy_input 0.9.1",
+ "bevy_log 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_render 0.9.1",
+ "bevy_sprite 0.9.1",
+ "bevy_text 0.9.1",
+ "bevy_transform 0.9.1",
+ "bevy_utils 0.9.1",
+ "bevy_window 0.9.1",
  "bytemuck",
  "serde",
  "smallvec",
- "taffy",
+ "taffy 0.1.0",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_ui"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc341d652ba20fac0170a46eff8310829a862f4e52db06164dc6200706768934"
+dependencies = [
+ "bevy_a11y",
+ "bevy_app 0.10.0",
+ "bevy_asset 0.10.0",
+ "bevy_core_pipeline 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_hierarchy 0.10.0",
+ "bevy_input 0.10.0",
+ "bevy_log 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_render 0.10.0",
+ "bevy_sprite 0.10.0",
+ "bevy_text 0.10.0",
+ "bevy_transform 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
+ "bytemuck",
+ "serde",
+ "smallvec",
+ "taffy 0.3.6",
  "thiserror",
 ]
 
@@ -840,36 +1474,84 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "bevy_utils"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04d90ce493910ad9af3b4220ea6864c7d1472761086a98230ecac59c8d547e95"
+dependencies = [
+ "ahash 0.7.6",
+ "bevy_utils_proc_macros",
+ "getrandom",
+ "hashbrown",
+ "instant",
+ "petgraph",
+ "thiserror",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_utils_proc_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62a42e465c446800c57a5bf65b64f4fa1c1f3a74efc2a64a2a001e4a4f548a2e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "bevy_window"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_math",
- "bevy_reflect",
- "bevy_utils",
- "raw-window-handle 0.5.0",
+ "bevy_app 0.9.1",
+ "bevy_ecs 0.9.1",
+ "bevy_input 0.9.1",
+ "bevy_math 0.9.1",
+ "bevy_reflect 0.9.1",
+ "bevy_utils 0.9.1",
+ "raw-window-handle",
+]
+
+[[package]]
+name = "bevy_window"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da8a2c523302ad64768991a7474c6010c76b9eb78323309ef3911521887fd108"
+dependencies = [
+ "bevy_app 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_input 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_reflect 0.10.0",
+ "bevy_utils 0.10.0",
+ "raw-window-handle",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7b7e647ecd0b3577468da37767dcdd7c26ca9f80da0060b2ec4c77336b6d2e1"
+checksum = "8eb6eb9b9790c1ad925d900a3f315abf15b11fb56c6464747a96560e559e1a9c"
 dependencies = [
+ "accesskit_winit",
  "approx",
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_math",
- "bevy_utils",
- "bevy_window",
+ "bevy_a11y",
+ "bevy_app 0.10.0",
+ "bevy_derive 0.10.0",
+ "bevy_ecs 0.10.0",
+ "bevy_hierarchy 0.10.0",
+ "bevy_input 0.10.0",
+ "bevy_math 0.10.0",
+ "bevy_utils 0.10.0",
+ "bevy_window 0.10.0",
  "crossbeam-channel",
- "raw-window-handle 0.5.0",
+ "once_cell",
+ "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit",
@@ -902,6 +1584,25 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.12.0"
@@ -951,6 +1652,9 @@ name = "cc"
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cesu8"
@@ -981,37 +1685,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1028,6 +1701,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -1189,24 +1868,18 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
 [[package]]
 name = "cyber_rider"
 version = "0.1.0"
 dependencies = [
- "bevy",
+ "bevy 0.10.0",
  "bevy-inspector-egui",
  "bevy_polyline",
  "bevy_rapier3d",
  "hexasphere 7.2.1",
  "noise",
  "rand",
- "wgpu",
+ "wgpu 0.15.1",
 ]
 
 [[package]]
@@ -1220,6 +1893,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "d3d12"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+dependencies = [
+ "bitflags",
+ "libloading",
+ "winapi",
+]
+
 [[package]]
 name = "darling"
 version = "0.13.4"
@@ -1289,18 +1973,18 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "ecolor"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691"
+checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "egui"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9"
+checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
 dependencies = [
  "ahash 0.8.3",
  "epaint",
@@ -1315,9 +1999,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "emath"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0"
+checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
 dependencies = [
  "bytemuck",
 ]
@@ -1329,18 +2013,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6"
 dependencies = [
  "const_panic",
- "encase_derive",
+ "encase_derive 0.4.1",
  "glam 0.22.0",
  "thiserror",
 ]
 
+[[package]]
+name = "encase"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
+dependencies = [
+ "const_panic",
+ "encase_derive 0.5.0",
+ "glam 0.23.0",
+ "thiserror",
+]
+
 [[package]]
 name = "encase_derive"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92"
 dependencies = [
- "encase_derive_impl",
+ "encase_derive_impl 0.4.1",
+]
+
+[[package]]
+name = "encase_derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
+dependencies = [
+ "encase_derive_impl 0.5.0",
 ]
 
 [[package]]
@@ -1354,6 +2059,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "encase_derive_impl"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.10.0"
@@ -1366,9 +2082,9 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a"
+checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.3",
@@ -1382,9 +2098,9 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d"
+checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
 dependencies = [
  "serde",
 ]
@@ -1558,9 +2274,15 @@ dependencies = [
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows",
+ "windows 0.43.0",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+
 [[package]]
 name = "glam"
 version = "0.21.3"
@@ -1577,6 +2299,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "glam"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+dependencies = [
+ "bytemuck",
+ "serde",
+]
+
 [[package]]
 name = "glow"
 version = "0.11.2"
@@ -1589,6 +2321,18 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "glow"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "gltf"
 version = "1.1.0"
@@ -1655,6 +2399,19 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows 0.44.0",
+]
+
 [[package]]
 name = "gpu-descriptor"
 version = "0.2.3"
@@ -1715,6 +2472,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hassle-rs"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+dependencies = [
+ "bitflags",
+ "com-rs",
+ "libc",
+ "libloading",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1733,11 +2505,11 @@ dependencies = [
 
 [[package]]
 name = "hexasphere"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619ce654558681d7d0a7809e1b20249c7032ff13ee6baa7bb7ff64f7f28a906a"
+checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
 dependencies = [
- "glam 0.22.0",
+ "glam 0.23.0",
  "once_cell",
 ]
 
@@ -1819,9 +2591,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "jni"
@@ -1843,6 +2615,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -1877,9 +2658,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
 [[package]]
 name = "libloading"
@@ -2018,7 +2799,7 @@ dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2044,13 +2825,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "nalgebra"
-version = "0.32.1"
+name = "naga"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a"
+checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap",
+ "log",
+ "num-traits",
+ "petgraph",
+ "pp-rs",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid",
+]
+
+[[package]]
+name = "nalgebra"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
 dependencies = [
  "approx",
- "glam 0.22.0",
+ "glam 0.23.0",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -2081,7 +2884,7 @@ dependencies = [
  "jni-sys",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -2170,6 +2973,15 @@ dependencies = [
  "rand_xorshift",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -2273,6 +3085,32 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649"
+dependencies = [
+ "block2",
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+dependencies = [
+ "objc-sys",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -2291,6 +3129,15 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "object"
+version = "0.30.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@@ -2303,6 +3150,18 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc"
 
+[[package]]
+name = "orbclient"
+version = "0.3.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "974465c5e83cf9df05c1e4137b271d29035c902e39e5ad4c1939837e22160af8"
+dependencies = [
+ "cfg-if",
+ "redox_syscall 0.2.16",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2342,16 +3201,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "parry3d"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008d029b6e85462d4af7c9fae8728b02bf8ab328c4bf6aa93c1e8fa1e1297723"
+checksum = "c73a9ea58699f422dcd322c134ab02dad2871ba02ee871c9ae1f277c302eb092"
 dependencies = [
  "approx",
  "arrayvec",
@@ -2370,9 +3229,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 
 [[package]]
 name = "percent-encoding"
@@ -2542,21 +3401,9 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559"
 
 [[package]]
 name = "rawpointer"
@@ -2579,6 +3426,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb02a9aee8e8c7ad8d86890f1e16b49e0bbbffc9961ff3788c31d57c98bcbf03"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2586,7 +3442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
@@ -2639,6 +3495,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2647,9 +3509,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "safe_arch"
@@ -2683,18 +3545,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2703,9 +3565,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
 dependencies = [
  "itoa",
  "ryu",
@@ -2818,6 +3680,20 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e847e2de7a137c8c2cede5095872dbb00f4f9bf34d061347e36b43322acd56"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi",
+]
+
 [[package]]
 name = "taffy"
 version = "0.1.0"
@@ -2831,6 +3707,17 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "taffy"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e38edd8e57ffadcbdaf4c60c8738a8938318b4c4d3d281ae369033b80e5efa75"
+dependencies = [
+ "arrayvec",
+ "num-traits",
+ "slotmap",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -2842,18 +3729,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3009,15 +3896,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
 name = "unicode-normalization"
@@ -3174,6 +4061,17 @@ version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
+[[package]]
+name = "wayland-scanner"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.61"
@@ -3196,7 +4094,7 @@ dependencies = [
  "log",
  "ndk-context",
  "objc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "url",
  "web-sys",
 ]
@@ -3216,17 +4114,41 @@ dependencies = [
  "arrayvec",
  "js-sys",
  "log",
- "naga",
+ "naga 0.10.0",
  "parking_lot",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-core 0.14.2",
+ "wgpu-hal 0.14.1",
+ "wgpu-types 0.14.1",
+]
+
+[[package]]
+name = "wgpu"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
+dependencies = [
+ "arrayvec",
+ "cfg-if",
+ "js-sys",
+ "log",
+ "naga 0.11.0",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core 0.15.1",
+ "wgpu-hal 0.15.3",
+ "wgpu-types 0.15.2",
 ]
 
 [[package]]
@@ -3242,15 +4164,38 @@ dependencies = [
  "codespan-reporting",
  "fxhash",
  "log",
- "naga",
+ "naga 0.10.0",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "smallvec",
  "thiserror",
  "web-sys",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-hal 0.14.1",
+ "wgpu-types 0.14.1",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
+dependencies = [
+ "arrayvec",
+ "bit-vec",
+ "bitflags",
+ "codespan-reporting",
+ "fxhash",
+ "log",
+ "naga 0.11.0",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal 0.15.3",
+ "wgpu-types 0.15.2",
 ]
 
 [[package]]
@@ -3266,10 +4211,10 @@ dependencies = [
  "bitflags",
  "block",
  "core-graphics-types",
- "d3d12",
+ "d3d12 0.5.0",
  "foreign-types",
  "fxhash",
- "glow",
+ "glow 0.11.2",
  "gpu-alloc",
  "gpu-descriptor",
  "js-sys",
@@ -3277,18 +4222,60 @@ dependencies = [
  "libloading",
  "log",
  "metal",
- "naga",
+ "naga 0.10.0",
  "objc",
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types",
+ "wgpu-types 0.14.1",
+ "winapi",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags",
+ "block",
+ "core-graphics-types",
+ "d3d12 0.6.0",
+ "foreign-types",
+ "fxhash",
+ "glow 0.12.1",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading",
+ "log",
+ "metal",
+ "naga 0.11.0",
+ "objc",
+ "parking_lot",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "smallvec",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types 0.15.2",
  "winapi",
 ]
 
@@ -3301,6 +4288,17 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "wgpu-types"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
+dependencies = [
+ "bitflags",
+ "js-sys",
+ "web-sys",
+]
+
 [[package]]
 name = "wide"
 version = "0.7.8"
@@ -3311,6 +4309,12 @@ dependencies = [
  "safe_arch",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3358,25 +4362,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -3395,12 +4419,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
@@ -3409,48 +4433,24 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.1"
@@ -3463,12 +4463,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.1"
@@ -3477,12 +4471,13 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
 [[package]]
 name = "winit"
-version = "0.27.5"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "9d38e7dc904dda347b54dbec3b2d4bf534794f4fb4e6df0be91a264f4f2ed1cf"
 dependencies = [
+ "android-activity",
  "bitflags",
- "cocoa",
+ "cfg_aliases",
  "core-foundation",
  "core-graphics",
  "dispatch",
@@ -3491,24 +4486,24 @@ dependencies = [
  "log",
  "mio",
  "ndk",
- "ndk-glue",
- "objc",
+ "objc2",
  "once_cell",
- "parking_lot",
+ "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+ "redox_syscall 0.3.4",
  "wasm-bindgen",
+ "wayland-scanner",
  "web-sys",
- "windows-sys 0.36.1",
+ "windows-sys",
  "x11-dl",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658"
+checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f"
 dependencies = [
  "memchr",
 ]
@@ -3551,3 +4546,9 @@ name = "xi-unicode"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
diff --git a/Cargo.toml b/Cargo.toml
index 21e1997..74a31ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,28 +8,29 @@ rand = "0.8"
 bevy_polyline = "0.4"
 noise = { git = "https://github.com/Razaekel/noise-rs" }
 hexasphere = "7"
-wgpu = "0.14"
-bevy-inspector-egui = "0.17.0"
+wgpu = "0.15"
+bevy-inspector-egui = "0.18"
 # wgpu = "0.12"
 
 [features]
 inspector = []
 
 [dependencies.bevy]
-version = "0.9"
+version = "0.10"
 default-features = false
 features = [
   "bevy_gilrs",
   "bevy_winit",
-  "render",
   "png",
   "hdr",
   "x11",
+  "bevy_ui",
+  "bevy_text"
 ]
 
 [dependencies.bevy_rapier3d]
 features = ["debug-render-3d"]
-version = "0.20"
+version = "0.21"
 
 # Maybe also enable only a small amount of optimization for our code:
 [profile.dev]
diff --git a/src/action/mod.rs b/src/action/mod.rs
index dabccf2..02cb159 100644
--- a/src/action/mod.rs
+++ b/src/action/mod.rs
@@ -1,6 +1,7 @@
 use bevy::{
     diagnostic::FrameTimeDiagnosticsPlugin,
-    prelude::{App, IntoSystemDescriptor, Plugin, ReflectResource, Resource},
+    ecs::reflect::ReflectResource,
+    prelude::{App, Plugin, Resource},
     reflect::Reflect,
 };
 use bevy_rapier3d::prelude::{NoUserData, RapierPhysicsPlugin};
@@ -30,18 +31,17 @@ impl Plugin for CyberActionPlugin {
             .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
             .add_startup_system(timestep_setup)
             .add_plugin(FrameTimeDiagnosticsPlugin::default())
-            .add_system(surface_fix.label("surface_fix"))
-            .add_system(gravity.label("gravity").before("cat"))
-            .add_system(cyber_lean.before("cat").after("gravity"))
-            .add_system(falling_cat.label("cat"))
-            .add_system(input_forces.label("iforces").after("cat"))
-            .add_system(
-                tunnel_out
-                    .label("tunnel")
-                    .before("surface_fix")
-                    .after("drag"),
+            .add_systems(
+                (
+                    gravity,
+                    cyber_lean,
+                    falling_cat,
+                    input_forces,
+                    drag,
+                    tunnel_out,
+                    surface_fix,
+                )
+                    .chain(),
             )
-            .add_system(surface_fix.label("surface_fix").after("cat"))
-            .add_system(drag.label("drag").after("iforces"));
     }
 }
diff --git a/src/bike/mod.rs b/src/bike/mod.rs
index 9765aa2..eec5292 100644
--- a/src/bike/mod.rs
+++ b/src/bike/mod.rs
@@ -2,7 +2,7 @@ mod body;
 mod components;
 mod wheels;
 
-use bevy::prelude::{App, Assets, Mesh, Plugin, ResMut, StandardMaterial, StartupStage};
+use bevy::prelude::{App, Assets, Mesh, Plugin, ResMut, StandardMaterial, StartupSet};
 use bevy_rapier3d::prelude::Group;
 
 pub(crate) use self::components::*;
@@ -21,6 +21,6 @@ impl Plugin for CyberBikePlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(WheelConfig::default())
             .register_type::<WheelConfig>()
-            .add_startup_system_to_stage(StartupStage::PostStartup, spawn_cyberbike);
+            .add_startup_system(StartupSet::PostStartup, spawn_cyberbike);
     }
 }
diff --git a/src/camera.rs b/src/camera.rs
index e59edf2..4c7473b 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -5,12 +5,18 @@ use crate::{bike::CyberBikeBody, input::InputState};
 // 85 degrees in radians
 const MAX_PITCH: f32 = 1.48353;
 
-#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component)]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component, States)]
 enum CyberCameras {
     Hero,
     Debug,
 }
 
+impl Default for CyberCameras {
+    fn default() -> Self {
+        Self::Hero
+    }
+}
+
 #[derive(Debug, Resource)]
 pub struct DebugCamOffset {
     pub rot: f32,
diff --git a/src/glamor.rs b/src/glamor.rs
index 8e51135..8800163 100644
--- a/src/glamor.rs
+++ b/src/glamor.rs
@@ -98,7 +98,7 @@ impl Plugin for CyberGlamorPlugin {
             app.add_plugin(rplugin);
         }
 
-        app.add_startup_system_to_stage(StartupStage::PostStartup, wireframe_planet)
+        app.add_startup_system(StartupSet::PostStartup, wireframe_planet)
             .add_system(wireframify_lights)
             .add_plugin(PolylinePlugin);
     }
diff --git a/src/input.rs b/src/input.rs
index c949eb9..7407fa3 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, utils::HashSet};
+use bevy::{input::gamepad::GamepadEvent, prelude::*, utils::HashSet};
 
 use crate::camera::DebugCamOffset;
 
@@ -46,39 +46,33 @@ fn update_debug_cam(mut offset: ResMut<DebugCamOffset>, mut keys: ResMut<Input<K
 }
 
 fn update_input(mut events: EventReader<GamepadEvent>, mut istate: ResMut<InputState>) {
-    for GamepadEvent {
-        gamepad: _,
-        event_type: ev,
-    } in events.iter()
-    {
-        match *ev {
-            GamepadEventType::ButtonChanged(GamepadButtonType::RightTrigger2, val) => {
+    for pad_event in events.iter() {
+        match pad_event {
+            GamepadEvent::Button(GamepadButtonType::RightTrigger2, val) => {
                 istate.throttle = val;
             }
-            GamepadEventType::ButtonChanged(GamepadButtonType::LeftTrigger2, val) => {
+            GamepadEvent::Button(GamepadButtonType::LeftTrigger2, val) => {
                 istate.throttle = -val;
             }
-            GamepadEventType::ButtonChanged(GamepadButtonType::East, val) => {
+            GamepadEvent::Button(GamepadButtonType::East, val) => {
                 if val > 0.5 {
                     istate.brake = true;
                 } else {
                     istate.brake = false;
                 }
             }
-            GamepadEventType::AxisChanged(GamepadAxisType::LeftStickX, val) => {
+            GamepadEvent::Axis(GamepadAxisType::LeftStickX, val) => {
                 istate.yaw = val;
             }
             // ignore spurious vertical movement for now
-            GamepadEventType::AxisChanged(GamepadAxisType::LeftStickY, val) => {
+            GamepadEvent::Axis(GamepadAxisType::LeftStickY, val) => {
                 istate.pitch = val;
             }
             _ => {
-                info!("unhandled gamepad event: {:?}", ev);
+                info!("unhandled gamepad event: {:?}", pad_event);
             }
         }
     }
-
-    //dbg!(&istate);
 }
 
 pub struct CyberInputPlugin;
diff --git a/src/lib.rs b/src/lib.rs
index 046d92a..0612a02 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,6 @@
 use bevy::{
-    ecs::schedule::StageLabel,
-    prelude::{ResMut, SystemLabel, Vec3, Windows},
+    ecs::schedule::SystemSet,
+    prelude::{Query, Vec3, Window},
 };
 
 pub mod action;
@@ -12,7 +12,7 @@ pub mod lights;
 pub mod planet;
 pub mod ui;
 
-#[derive(Clone, Debug, Hash, PartialEq, Eq, SystemLabel, StageLabel)]
+#[derive(Clone, Debug, Hash, PartialEq, Eq, SystemSet)]
 pub enum Label {
     Geometry,
     Glamor,
@@ -20,7 +20,7 @@ pub enum Label {
     Action,
 }
 
-pub fn disable_mouse_trap(mut windows: ResMut<Windows>) {
+pub fn disable_mouse_trap(mut windows: Query<&Window>) {
     let window = windows.get_primary_mut().unwrap();
     window.set_cursor_grab_mode(bevy::window::CursorGrabMode::None);
     window.set_cursor_visibility(true);

From 63d3bb87d4137a05dd4c317baebd93147c29ec6b Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 9 Mar 2023 17:50:14 -0800
Subject: [PATCH 11/13] ok, works

---
 Cargo.lock        | 1391 ++++++++-------------------------------------
 Cargo.toml        |    7 +-
 src/action/mod.rs |    4 +-
 src/bike/mod.rs   |    6 +-
 src/camera.rs     |   23 +-
 src/glamor.rs     |   90 ++-
 src/input.rs      |   49 +-
 src/lib.rs        |   11 +-
 src/lights.rs     |   33 +-
 src/main.rs       |    9 +-
 src/planet.rs     |    2 +-
 11 files changed, 371 insertions(+), 1254 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 08d1ffc..f46db24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,18 +147,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
 
-[[package]]
-name = "android_logger"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a"
-dependencies = [
- "android_log-sys",
- "env_logger",
- "log",
- "once_cell",
-]
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -224,7 +212,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "event-listener",
  "futures-core",
 ]
@@ -237,7 +225,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
 dependencies = [
  "async-lock",
  "async-task",
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "fastrand",
  "futures-lite",
  "slab",
@@ -291,22 +279,13 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "bevy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9"
-dependencies = [
- "bevy_internal 0.9.1",
-]
-
 [[package]]
 name = "bevy"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc88fece4660d68690585668f1a4e18e6dcbab160b08f337b498a96ccde91cfe"
 dependencies = [
- "bevy_internal 0.10.0",
+ "bevy_internal",
 ]
 
 [[package]]
@@ -316,20 +295,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69bffd8614a60f187983e9f805bba13c298294f4666172ae7ab9c39ad61919fa"
 dependencies = [
  "bevy-inspector-egui-derive",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core 0.10.0",
- "bevy_core_pipeline 0.10.0",
- "bevy_ecs 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
  "bevy_egui",
- "bevy_hierarchy 0.10.0",
- "bevy_log 0.10.0",
- "bevy_math 0.10.0",
- "bevy_pbr 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_utils",
+ "bevy_window",
  "egui",
  "image",
  "once_cell",
@@ -355,24 +334,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a10b25cf04971b9d68271aa54e4601c673509db6edaf1f5359dd91fb3e84cc27"
 dependencies = [
  "accesskit",
- "bevy_app 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
-]
-
-[[package]]
-name = "bevy_app"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42"
-dependencies = [
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_utils 0.9.1",
- "downcast-rs",
- "wasm-bindgen",
- "web-sys",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
 ]
 
 [[package]]
@@ -381,42 +345,15 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "960c6e444dc6a25dd51a2196f04872ae9e2e876802b66c391104849ec9225e38"
 dependencies = [
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "downcast-rs",
  "wasm-bindgen",
  "web-sys",
 ]
 
-[[package]]
-name = "bevy_asset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4"
-dependencies = [
- "anyhow",
- "bevy_app 0.9.1",
- "bevy_diagnostic 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_log 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_tasks 0.9.1",
- "bevy_utils 0.9.1",
- "crossbeam-channel",
- "downcast-rs",
- "fastrand",
- "js-sys",
- "ndk-glue",
- "parking_lot",
- "serde",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "bevy_asset"
 version = "0.10.0"
@@ -424,13 +361,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adea538a3d166c8609621994972c31be591c96f931f160f96e74697d8c24ba45"
 dependencies = [
  "anyhow",
- "bevy_app 0.10.0",
- "bevy_diagnostic 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_log 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_tasks 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
@@ -444,147 +381,67 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "bevy_core"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_tasks 0.9.1",
- "bevy_utils 0.9.1",
- "bytemuck",
-]
-
 [[package]]
 name = "bevy_core"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed29797fa386c6969fa1e4ef9e194a27f89ddb2fa78751fe46838495d374f90f"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_tasks 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bytemuck",
 ]
 
-[[package]]
-name = "bevy_core_pipeline"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bitflags",
- "radsort",
- "serde",
-]
-
 [[package]]
 name = "bevy_core_pipeline"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3129d308df70dee3c46b6bb64e54d2552e7106fd3185d75732ad5e739a830fee"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "bitflags",
  "radsort",
  "serde",
 ]
 
-[[package]]
-name = "bevy_derive"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6"
-dependencies = [
- "bevy_macro_utils 0.9.1",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "bevy_derive"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdf11701c01bf4dc7a3fac9f4547f3643d3db4cc1682af40c8c86e2f8734b617"
 dependencies = [
- "bevy_macro_utils 0.10.0",
+ "bevy_macro_utils",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "bevy_diagnostic"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_core 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_log 0.9.1",
- "bevy_time 0.9.1",
- "bevy_utils 0.9.1",
-]
-
 [[package]]
 name = "bevy_diagnostic"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "576508ffe7ad5124781edd352b79bdc79ffbb6e2f26bad6f722774f7c9fd16c9"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_core 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_log 0.10.0",
- "bevy_time 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_time",
+ "bevy_utils",
  "sysinfo",
 ]
 
-[[package]]
-name = "bevy_ecs"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74"
-dependencies = [
- "async-channel",
- "bevy_ecs_macros 0.9.1",
- "bevy_ptr 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_tasks 0.9.1",
- "bevy_utils 0.9.1",
- "downcast-rs",
- "event-listener",
- "fixedbitset",
- "fxhash",
- "serde",
- "thread_local",
-]
-
 [[package]]
 name = "bevy_ecs"
 version = "0.10.0"
@@ -592,11 +449,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdc5b19451128091e8507c9247888359ca0bfa895e7f6ca749ccc55c5463bef6"
 dependencies = [
  "async-channel",
- "bevy_ecs_macros 0.10.0",
- "bevy_ptr 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_tasks 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_ecs_macros",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "downcast-rs",
  "event-listener",
  "fixedbitset",
@@ -605,25 +462,13 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "bevy_ecs_macros"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce"
-dependencies = [
- "bevy_macro_utils 0.9.1",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1e79757319533bde006a4f30c268223ec6426371297182925932075ccfdae30"
 dependencies = [
- "bevy_macro_utils 0.10.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn",
@@ -636,30 +481,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf0efb32c83ae6d2cc36bda08a029d74fdeb45870489599d3779a36649802bce"
 dependencies = [
  "arboard",
- "bevy 0.10.0",
+ "bevy",
  "egui",
  "thread_local",
  "webbrowser",
 ]
 
-[[package]]
-name = "bevy_encase_derive"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24"
-dependencies = [
- "bevy_macro_utils 0.9.1",
- "encase_derive_impl 0.4.1",
-]
-
 [[package]]
 name = "bevy_encase_derive"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "723d4838d1f88955f348294c0a9d067307f2437725400b0776e9677154914f14"
 dependencies = [
- "bevy_macro_utils 0.10.0",
- "encase_derive_impl 0.5.0",
+ "bevy_macro_utils",
+ "encase_derive_impl",
 ]
 
 [[package]]
@@ -668,132 +503,70 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "905e547d213e368f997d08f140f4e893923c7dce4760bf0fb63401232262fa79"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_input 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_utils",
  "gilrs",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e853e346ba412354e02292c7aa5b9a9dccdfa748e273b1b7ebf8f6a172f89712"
+checksum = "bb2994d7e47c36bfe36710c4a26d3f36dd8641bfaa2c5d4d0581e001942aab6f"
 dependencies = [
  "anyhow",
  "base64",
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core 0.9.1",
- "bevy_core_pipeline 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_hierarchy 0.9.1",
- "bevy_log 0.9.1",
- "bevy_math 0.9.1",
- "bevy_pbr 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_scene 0.9.1",
- "bevy_tasks 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_scene",
+ "bevy_tasks",
+ "bevy_transform",
+ "bevy_utils",
  "gltf",
  "percent-encoding",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_hierarchy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_core 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_log 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_utils 0.9.1",
- "smallvec",
-]
-
 [[package]]
 name = "bevy_hierarchy"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccd246c862fcaeef3a769f47c6297139f971db0c8fdd6188fe9419ee8873b7e8"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_core 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_log 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_utils",
  "smallvec",
 ]
 
-[[package]]
-name = "bevy_input"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_utils 0.9.1",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_input"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c809b3df62e1fcbdc6744233ae6c95a67d2cc7e518db43ab81f417d5875ba3b"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_utils",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_internal"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core 0.9.1",
- "bevy_core_pipeline 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_diagnostic 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_gltf",
- "bevy_hierarchy 0.9.1",
- "bevy_input 0.9.1",
- "bevy_log 0.9.1",
- "bevy_math 0.9.1",
- "bevy_pbr 0.9.1",
- "bevy_ptr 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_sprite 0.9.1",
- "bevy_tasks 0.9.1",
- "bevy_text 0.9.1",
- "bevy_time 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_ui 0.9.1",
- "bevy_utils 0.9.1",
- "bevy_window 0.9.1",
- "ndk-glue",
-]
-
 [[package]]
 name = "bevy_internal"
 version = "0.10.0"
@@ -801,49 +574,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a065c7ac81cd7cf3f1b8f15c4a93db5f07274ddaaec145ba7d0393be0c9c413"
 dependencies = [
  "bevy_a11y",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core 0.10.0",
- "bevy_core_pipeline 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_diagnostic 0.10.0",
- "bevy_ecs 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
  "bevy_gilrs",
- "bevy_hierarchy 0.10.0",
- "bevy_input 0.10.0",
- "bevy_log 0.10.0",
- "bevy_math 0.10.0",
- "bevy_pbr 0.10.0",
- "bevy_ptr 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_scene 0.10.0",
- "bevy_tasks 0.10.0",
- "bevy_text 0.10.0",
- "bevy_time 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_ui 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_gltf",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_scene",
+ "bevy_sprite",
+ "bevy_tasks",
+ "bevy_text",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_ui",
+ "bevy_utils",
+ "bevy_window",
  "bevy_winit",
 ]
 
-[[package]]
-name = "bevy_log"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b"
-dependencies = [
- "android_log-sys",
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_utils 0.9.1",
- "console_error_panic_hook",
- "tracing-log",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
 [[package]]
 name = "bevy_log"
 version = "0.10.0"
@@ -851,26 +610,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47dcb09ec71145c80d88a84181cc1449d30f23c571bdd58c59c10eece82dfaa5"
 dependencies = [
  "android_log-sys",
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_utils",
  "console_error_panic_hook",
  "tracing-log",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
-[[package]]
-name = "bevy_macro_utils"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677"
-dependencies = [
- "quote",
- "syn",
- "toml",
-]
-
 [[package]]
 name = "bevy_macro_utils"
 version = "0.10.0"
@@ -882,16 +630,6 @@ dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "bevy_math"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf"
-dependencies = [
- "glam 0.22.0",
- "serde",
-]
-
 [[package]]
 name = "bevy_math"
 version = "0.10.0"
@@ -902,15 +640,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bevy_mikktspace"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13"
-dependencies = [
- "glam 0.22.0",
-]
-
 [[package]]
 name = "bevy_mikktspace"
 version = "0.10.0"
@@ -920,67 +649,28 @@ dependencies = [
  "glam 0.23.0",
 ]
 
-[[package]]
-name = "bevy_pbr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core_pipeline 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bevy_window 0.9.1",
- "bitflags",
- "bytemuck",
- "radsort",
-]
-
 [[package]]
 name = "bevy_pbr"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90230c526ee7257229c1db0fc4aafaa947ea806bb4b0674785930ea59d0cc7f8"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core_pipeline 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bitflags",
  "bytemuck",
  "radsort",
 ]
 
-[[package]]
-name = "bevy_polyline"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea592675cbb5ed69add81ebcf0f5dbaf315fa7f2868dfe20e24a1292b66314e6"
-dependencies = [
- "bevy 0.9.1",
- "bitflags",
- "naga 0.10.0",
-]
-
-[[package]]
-name = "bevy_ptr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4"
-
 [[package]]
 name = "bevy_ptr"
 version = "0.10.0"
@@ -993,43 +683,23 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4bce8074f19467fd55ab172ae6c11fca3ca28f66804590ab10c930bd5e9cd24"
 dependencies = [
- "bevy 0.10.0",
+ "bevy",
  "bitflags",
  "log",
  "nalgebra",
  "rapier3d",
 ]
 
-[[package]]
-name = "bevy_reflect"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a"
-dependencies = [
- "bevy_math 0.9.1",
- "bevy_ptr 0.9.1",
- "bevy_reflect_derive 0.9.1",
- "bevy_utils 0.9.1",
- "downcast-rs",
- "erased-serde",
- "glam 0.22.0",
- "once_cell",
- "parking_lot",
- "serde",
- "smallvec",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_reflect"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab880e0eed9df5c99ce1a2f89edc11cdef1bc78413719b29e9ad7e3bc27f4c20"
 dependencies = [
- "bevy_math 0.10.0",
- "bevy_ptr 0.10.0",
- "bevy_reflect_derive 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_math",
+ "bevy_ptr",
+ "bevy_reflect_derive",
+ "bevy_utils",
  "downcast-rs",
  "erased-serde",
  "glam 0.23.0",
@@ -1040,27 +710,13 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_reflect_derive"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018"
-dependencies = [
- "bevy_macro_utils 0.9.1",
- "bit-set",
- "proc-macro2",
- "quote",
- "syn",
- "uuid",
-]
-
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b361b8671bdffe93978270dd770b03b48560c3127fdf9003f98111fb806bb11"
 dependencies = [
- "bevy_macro_utils 0.10.0",
+ "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
@@ -1068,48 +724,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "bevy_render"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5"
-dependencies = [
- "anyhow",
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_encase_derive 0.9.1",
- "bevy_hierarchy 0.9.1",
- "bevy_log 0.9.1",
- "bevy_math 0.9.1",
- "bevy_mikktspace 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render_macros 0.9.1",
- "bevy_time 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bevy_window 0.9.1",
- "bitflags",
- "codespan-reporting",
- "downcast-rs",
- "encase 0.4.1",
- "futures-lite",
- "hex",
- "hexasphere 8.1.0",
- "image",
- "naga 0.10.0",
- "once_cell",
- "parking_lot",
- "regex",
- "serde",
- "smallvec",
- "thiserror",
- "thread_local",
- "wgpu 0.14.2",
-]
-
 [[package]]
 name = "bevy_render"
 version = "0.10.0"
@@ -1118,31 +732,31 @@ checksum = "52e352868ab1a9ad9fbaa6ff025505e685781ad1790377b2d038afeb9df18214"
 dependencies = [
  "anyhow",
  "async-channel",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_encase_derive 0.10.0",
- "bevy_hierarchy 0.10.0",
- "bevy_log 0.10.0",
- "bevy_math 0.10.0",
- "bevy_mikktspace 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render_macros 0.10.0",
- "bevy_tasks 0.10.0",
- "bevy_time 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_reflect",
+ "bevy_render_macros",
+ "bevy_tasks",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bitflags",
  "codespan-reporting",
  "downcast-rs",
- "encase 0.5.0",
+ "encase",
  "futures-lite",
  "hexasphere 8.1.0",
  "image",
- "naga 0.11.0",
+ "naga",
  "once_cell",
  "parking_lot",
  "regex",
@@ -1150,20 +764,8 @@ dependencies = [
  "smallvec",
  "thiserror",
  "thread_local",
- "wgpu 0.15.1",
- "wgpu-hal 0.15.3",
-]
-
-[[package]]
-name = "bevy_render_macros"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572"
-dependencies = [
- "bevy_macro_utils 0.9.1",
- "proc-macro2",
- "quote",
- "syn",
+ "wgpu",
+ "wgpu-hal",
 ]
 
 [[package]]
@@ -1172,34 +774,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "570b1d0f38439c5ac8ab75572804c9979b9caa372c49bd00803f60a22a3e1328"
 dependencies = [
- "bevy_macro_utils 0.10.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "bevy_scene"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9c66a628c833d53bae54fe94cbc0d3f12c29e9d2e6c3f2356d45ad57db0c8c"
-dependencies = [
- "anyhow",
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_hierarchy 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "ron",
- "serde",
- "thiserror",
- "uuid",
-]
-
 [[package]]
 name = "bevy_scene"
 version = "0.10.0"
@@ -1207,63 +787,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3995f756e482e964e0244a5d388e757f272d1dcdc02136730b1c45f4d5eeb516"
 dependencies = [
  "anyhow",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_hierarchy 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "ron",
  "serde",
  "thiserror",
  "uuid",
 ]
 
-[[package]]
-name = "bevy_sprite"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core_pipeline 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_log 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bitflags",
- "bytemuck",
- "fixedbitset",
- "guillotiere",
- "rectangle-pack",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_sprite"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14aa41c9480b76d7b3c3f1ed89f95c9d6e2a39d3c3367ca82c122d853ac0463e"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core_pipeline 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_log 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "bitflags",
  "bytemuck",
  "fixedbitset",
@@ -1272,21 +827,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_tasks"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-task",
- "concurrent-queue 1.2.4",
- "futures-lite",
- "once_cell",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "bevy_tasks"
 version = "0.10.0"
@@ -1296,35 +836,12 @@ dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "futures-lite",
  "once_cell",
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "bevy_text"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60c74c1bdaabde7db28f6728aa13bc7b1d744a2201b2bbfd83d2224404c57f5c"
-dependencies = [
- "ab_glyph",
- "anyhow",
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_sprite 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bevy_window 0.9.1",
- "glyph_brush_layout",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_text"
 version = "0.10.0"
@@ -1333,101 +850,46 @@ checksum = "33fc934d7cbadbb6dac11547dfb805d3e6b3f0b40f6e66e437fe4b3c7581cc5c"
 dependencies = [
  "ab_glyph",
  "anyhow",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_sprite 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "glyph_brush_layout",
  "serde",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_time"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_utils 0.9.1",
- "crossbeam-channel",
-]
-
 [[package]]
 name = "bevy_time"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2f2863cfc08fa38909e047a1bbc2dd71d0836057ed0840c69ace9dff3e0c298"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "crossbeam-channel",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_transform"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_hierarchy 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
-]
-
 [[package]]
 name = "bevy_transform"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de9cda3df545ac889b4f6b702109e51d29d7b4b6f402f2bb9b4d1d9f9c382b63"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_hierarchy 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
-]
-
-[[package]]
-name = "bevy_ui"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e82ace6156f11fcdf2319102ff8fb8367b82d1e32b7d05d387a1963602f965"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_asset 0.9.1",
- "bevy_core_pipeline 0.9.1",
- "bevy_derive 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_hierarchy 0.9.1",
- "bevy_input 0.9.1",
- "bevy_log 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_render 0.9.1",
- "bevy_sprite 0.9.1",
- "bevy_text 0.9.1",
- "bevy_transform 0.9.1",
- "bevy_utils 0.9.1",
- "bevy_window 0.9.1",
- "bytemuck",
- "serde",
- "smallvec",
- "taffy 0.1.0",
- "thiserror",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_reflect",
 ]
 
 [[package]]
@@ -1437,43 +899,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc341d652ba20fac0170a46eff8310829a862f4e52db06164dc6200706768934"
 dependencies = [
  "bevy_a11y",
- "bevy_app 0.10.0",
- "bevy_asset 0.10.0",
- "bevy_core_pipeline 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_hierarchy 0.10.0",
- "bevy_input 0.10.0",
- "bevy_log 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_render 0.10.0",
- "bevy_sprite 0.10.0",
- "bevy_text 0.10.0",
- "bevy_transform 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bytemuck",
  "serde",
  "smallvec",
- "taffy 0.3.6",
+ "taffy",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_utils"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739"
-dependencies = [
- "ahash 0.7.6",
- "getrandom",
- "hashbrown",
- "instant",
- "tracing",
- "uuid",
-]
-
 [[package]]
 name = "bevy_utils"
 version = "0.10.0"
@@ -1502,33 +950,18 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "bevy_window"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e"
-dependencies = [
- "bevy_app 0.9.1",
- "bevy_ecs 0.9.1",
- "bevy_input 0.9.1",
- "bevy_math 0.9.1",
- "bevy_reflect 0.9.1",
- "bevy_utils 0.9.1",
- "raw-window-handle",
-]
-
 [[package]]
 name = "bevy_window"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da8a2c523302ad64768991a7474c6010c76b9eb78323309ef3911521887fd108"
 dependencies = [
- "bevy_app 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_input 0.10.0",
- "bevy_math 0.10.0",
- "bevy_reflect 0.10.0",
- "bevy_utils 0.10.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_utils",
  "raw-window-handle",
 ]
 
@@ -1541,14 +974,14 @@ dependencies = [
  "accesskit_winit",
  "approx",
  "bevy_a11y",
- "bevy_app 0.10.0",
- "bevy_derive 0.10.0",
- "bevy_ecs 0.10.0",
- "bevy_hierarchy 0.10.0",
- "bevy_input 0.10.0",
- "bevy_math 0.10.0",
- "bevy_utils 0.10.0",
- "bevy_window 0.10.0",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_math",
+ "bevy_utils",
+ "bevy_window",
  "crossbeam-channel",
  "once_cell",
  "raw-window-handle",
@@ -1641,12 +1074,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -1717,15 +1144,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.1.0"
@@ -1872,25 +1290,13 @@ dependencies = [
 name = "cyber_rider"
 version = "0.1.0"
 dependencies = [
- "bevy 0.10.0",
+ "bevy",
  "bevy-inspector-egui",
- "bevy_polyline",
  "bevy_rapier3d",
  "hexasphere 7.2.1",
  "noise",
  "rand",
- "wgpu 0.15.1",
-]
-
-[[package]]
-name = "d3d12"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
-dependencies = [
- "bitflags",
- "libloading",
- "winapi",
+ "wgpu",
 ]
 
 [[package]]
@@ -1904,41 +1310,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -2006,18 +1377,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "encase"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6"
-dependencies = [
- "const_panic",
- "encase_derive 0.4.1",
- "glam 0.22.0",
- "thiserror",
-]
-
 [[package]]
 name = "encase"
 version = "0.5.0"
@@ -2025,38 +1384,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
 dependencies = [
  "const_panic",
- "encase_derive 0.5.0",
+ "encase_derive",
  "glam 0.23.0",
  "thiserror",
 ]
 
-[[package]]
-name = "encase_derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92"
-dependencies = [
- "encase_derive_impl 0.4.1",
-]
-
 [[package]]
 name = "encase_derive"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
 dependencies = [
- "encase_derive_impl 0.5.0",
-]
-
-[[package]]
-name = "encase_derive_impl"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "encase_derive_impl",
 ]
 
 [[package]]
@@ -2070,16 +1409,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "log",
- "regex",
-]
-
 [[package]]
 name = "epaint"
 version = "0.21.0"
@@ -2289,16 +1618,6 @@ version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
 
-[[package]]
-name = "glam"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"
-dependencies = [
- "bytemuck",
- "serde",
-]
-
 [[package]]
 name = "glam"
 version = "0.23.0"
@@ -2309,18 +1628,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "glow"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "glow"
 version = "0.12.1"
@@ -2442,26 +1749,6 @@ dependencies = [
  "svg_fmt",
 ]
 
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hash32-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -2487,12 +1774,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "hexasphere"
 version = "7.2.1"
@@ -2519,12 +1800,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -2802,28 +2077,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "naga"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707"
-dependencies = [
- "bit-set",
- "bitflags",
- "codespan-reporting",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "petgraph",
- "pp-rs",
- "rustc-hash",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid",
-]
-
 [[package]]
 name = "naga"
 version = "0.11.0"
@@ -2894,36 +2147,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "android_logger",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-macro",
- "ndk-sys",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.4.1+23.1.7779620"
@@ -3657,12 +2880,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "svg_fmt"
 version = "0.4.1"
@@ -3694,19 +2911,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "taffy"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3"
-dependencies = [
- "arrayvec",
- "hash32",
- "hash32-derive",
- "num-traits",
- "typenum",
-]
-
 [[package]]
 name = "taffy"
 version = "0.3.6"
@@ -3783,15 +2987,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.1"
@@ -4105,28 +3300,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
-[[package]]
-name = "wgpu"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
-dependencies = [
- "arrayvec",
- "js-sys",
- "log",
- "naga 0.10.0",
- "parking_lot",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 0.14.2",
- "wgpu-hal 0.14.1",
- "wgpu-types 0.14.1",
-]
-
 [[package]]
 name = "wgpu"
 version = "0.15.1"
@@ -4137,7 +3310,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "log",
- "naga 0.11.0",
+ "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -4146,33 +3319,9 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core 0.15.1",
- "wgpu-hal 0.15.3",
- "wgpu-types 0.15.2",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags",
- "cfg_aliases",
- "codespan-reporting",
- "fxhash",
- "log",
- "naga 0.10.0",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal 0.14.1",
- "wgpu-types 0.14.1",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -4187,54 +3336,15 @@ dependencies = [
  "codespan-reporting",
  "fxhash",
  "log",
- "naga 0.11.0",
+ "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle",
  "smallvec",
  "thiserror",
  "web-sys",
- "wgpu-hal 0.15.3",
- "wgpu-types 0.15.2",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags",
- "block",
- "core-graphics-types",
- "d3d12 0.5.0",
- "foreign-types",
- "fxhash",
- "glow 0.11.2",
- "gpu-alloc",
- "gpu-descriptor",
- "js-sys",
- "khronos-egl",
- "libloading",
- "log",
- "metal",
- "naga 0.10.0",
- "objc",
- "parking_lot",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "renderdoc-sys",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types 0.14.1",
- "winapi",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -4250,10 +3360,10 @@ dependencies = [
  "bitflags",
  "block",
  "core-graphics-types",
- "d3d12 0.6.0",
+ "d3d12",
  "foreign-types",
  "fxhash",
- "glow 0.12.1",
+ "glow",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -4264,7 +3374,7 @@ dependencies = [
  "libloading",
  "log",
  "metal",
- "naga 0.11.0",
+ "naga",
  "objc",
  "parking_lot",
  "profiling",
@@ -4275,19 +3385,10 @@ dependencies = [
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types 0.15.2",
+ "wgpu-types",
  "winapi",
 ]
 
-[[package]]
-name = "wgpu-types"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "wgpu-types"
 version = "0.15.2"
diff --git a/Cargo.toml b/Cargo.toml
index 74a31ca..60fd637 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,12 +5,11 @@ edition = "2021"
 
 [dependencies]
 rand = "0.8"
-bevy_polyline = "0.4"
+# bevy_polyline = "0.4"
 noise = { git = "https://github.com/Razaekel/noise-rs" }
 hexasphere = "7"
 wgpu = "0.15"
 bevy-inspector-egui = "0.18"
-# wgpu = "0.12"
 
 [features]
 inspector = []
@@ -25,7 +24,9 @@ features = [
   "hdr",
   "x11",
   "bevy_ui",
-  "bevy_text"
+  "bevy_text",
+  "bevy_gltf",
+  "bevy_sprite"
 ]
 
 [dependencies.bevy_rapier3d]
diff --git a/src/action/mod.rs b/src/action/mod.rs
index 02cb159..8937120 100644
--- a/src/action/mod.rs
+++ b/src/action/mod.rs
@@ -1,7 +1,7 @@
 use bevy::{
     diagnostic::FrameTimeDiagnosticsPlugin,
     ecs::reflect::ReflectResource,
-    prelude::{App, Plugin, Resource},
+    prelude::{App, IntoSystemConfigs, Plugin, Resource},
     reflect::Reflect,
 };
 use bevy_rapier3d::prelude::{NoUserData, RapierPhysicsPlugin};
@@ -42,6 +42,6 @@ impl Plugin for CyberActionPlugin {
                     surface_fix,
                 )
                     .chain(),
-            )
+            );
     }
 }
diff --git a/src/bike/mod.rs b/src/bike/mod.rs
index eec5292..68f6121 100644
--- a/src/bike/mod.rs
+++ b/src/bike/mod.rs
@@ -2,7 +2,9 @@ mod body;
 mod components;
 mod wheels;
 
-use bevy::prelude::{App, Assets, Mesh, Plugin, ResMut, StandardMaterial, StartupSet};
+use bevy::prelude::{
+    App, Assets, IntoSystemConfig, Mesh, Plugin, ResMut, StandardMaterial, StartupSet,
+};
 use bevy_rapier3d::prelude::Group;
 
 pub(crate) use self::components::*;
@@ -21,6 +23,6 @@ impl Plugin for CyberBikePlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(WheelConfig::default())
             .register_type::<WheelConfig>()
-            .add_startup_system(StartupSet::PostStartup, spawn_cyberbike);
+            .add_startup_system(spawn_cyberbike.in_base_set(StartupSet::PostStartup));
     }
 }
diff --git a/src/camera.rs b/src/camera.rs
index 4c7473b..7ac4da6 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -5,18 +5,13 @@ use crate::{bike::CyberBikeBody, input::InputState};
 // 85 degrees in radians
 const MAX_PITCH: f32 = 1.48353;
 
-#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component, States)]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component, States, Default)]
 enum CyberCameras {
+    #[default]
     Hero,
     Debug,
 }
 
-impl Default for CyberCameras {
-    fn default() -> Self {
-        Self::Hero
-    }
-}
-
 #[derive(Debug, Resource)]
 pub struct DebugCamOffset {
     pub rot: f32,
@@ -105,7 +100,7 @@ fn update_active_camera(
 ) {
     // find the camera with the current state, set it as the ActiveCamera
     query.iter_mut().for_each(|(mut cam, cyber)| {
-        if cyber.eq(state.current()) {
+        if cyber.eq(&state.0) {
             cam.is_active = true;
         } else {
             cam.is_active = false;
@@ -113,11 +108,15 @@ fn update_active_camera(
     });
 }
 
-fn cycle_cam_state(mut state: ResMut<State<CyberCameras>>, mut keys: ResMut<Input<KeyCode>>) {
+fn cycle_cam_state(
+    state: Res<State<CyberCameras>>,
+    mut next: ResMut<NextState<CyberCameras>>,
+    mut keys: ResMut<Input<KeyCode>>,
+) {
     if keys.just_pressed(KeyCode::D) {
-        let new_state = state.current().next();
+        let new_state = state.0.next();
         info!("{:?}", new_state);
-        state.set(new_state).unwrap();
+        next.set(new_state);
         keys.reset(KeyCode::D);
     }
 }
@@ -133,7 +132,7 @@ impl Plugin for CyberCamPlugin {
 fn common(app: &mut bevy::prelude::App) {
     app.insert_resource(DebugCamOffset::default())
         .add_startup_system(setup_cybercams)
-        .add_state(CyberCameras::Hero)
+        .add_state::<CyberCameras>()
         .add_system(cycle_cam_state)
         .add_system(update_active_camera)
         .add_system(follow_cyberbike);
diff --git a/src/glamor.rs b/src/glamor.rs
index 8800163..48acb25 100644
--- a/src/glamor.rs
+++ b/src/glamor.rs
@@ -2,60 +2,60 @@ use bevy::{
     prelude::*,
     render::mesh::{Indices, VertexAttributeValues},
 };
-use bevy_polyline::prelude::{Polyline, PolylineBundle, PolylineMaterial, PolylinePlugin};
+// use bevy_polyline::prelude::{Polyline, PolylineBundle, PolylineMaterial, PolylinePlugin};
 use rand::{thread_rng, Rng};
 
 use crate::{lights::AnimateCyberLightWireframe, planet::CyberPlanet};
 
 pub const BISEXY_COLOR: Color = Color::hsla(292.0, 0.9, 0.60, 1.1);
 
-fn wireframe_planet(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut polylines: ResMut<Assets<Polyline>>,
-    mut polymats: ResMut<Assets<PolylineMaterial>>,
-    query: Query<&Handle<Mesh>, With<CyberPlanet>>,
-) {
-    let handle = query.single();
-    let mesh = meshes.get_mut(handle).unwrap();
-    let vertices = mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap();
+// fn wireframe_planet(
+//     mut commands: Commands,
+//     mut meshes: ResMut<Assets<Mesh>>,
+//     mut polylines: ResMut<Assets<Polyline>>,
+//     mut polymats: ResMut<Assets<PolylineMaterial>>,
+//     query: Query<&Handle<Mesh>, With<CyberPlanet>>,
+// ) {
+//     let handle = query.single();
+//     let mesh = meshes.get_mut(handle).unwrap();
+//     let vertices = mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap();
 
-    let mut pts = Vec::with_capacity(vertices.len());
+//     let mut pts = Vec::with_capacity(vertices.len());
 
-    if let VertexAttributeValues::Float32x3(verts) = vertices {
-        let indices = mesh.indices().unwrap();
-        if let Indices::U32(indices) = indices {
-            for i in indices.iter() {
-                let v = verts[*i as usize];
-                let v = Vec3::from_slice(&v);
-                pts.push(v);
-            }
-        }
-    }
+//     if let VertexAttributeValues::Float32x3(verts) = vertices {
+//         let indices = mesh.indices().unwrap();
+//         if let Indices::U32(indices) = indices {
+//             for i in indices.iter() {
+//                 let v = verts[*i as usize];
+//                 let v = Vec3::from_slice(&v);
+//                 pts.push(v);
+//             }
+//         }
+//     }
 
-    let mut verts = Vec::with_capacity((pts.len() as f32 * 1.4) as usize);
-    for pts in pts.chunks(3) {
-        if pts.len() > 1 {
-            verts.extend_from_slice(pts);
-            verts.push(Vec3::NAN);
-        }
-    }
+//     let mut verts = Vec::with_capacity((pts.len() as f32 * 1.4) as usize);
+//     for pts in pts.chunks(3) {
+//         if pts.len() > 1 {
+//             verts.extend_from_slice(pts);
+//             verts.push(Vec3::NAN);
+//         }
+//     }
 
-    // don't need the indices anymore
-    mesh.duplicate_vertices();
-    mesh.compute_flat_normals();
+//     // don't need the indices anymore
+//     mesh.duplicate_vertices();
+//     mesh.compute_flat_normals();
 
-    commands.spawn(PolylineBundle {
-        polyline: polylines.add(Polyline { vertices: verts }),
-        material: polymats.add(PolylineMaterial {
-            width: 101.0,
-            color: BISEXY_COLOR,
-            perspective: true,
-            depth_bias: -0.001,
-        }),
-        ..Default::default()
-    });
-}
+//     commands.spawn(PolylineBundle {
+//         polyline: polylines.add(Polyline { vertices: verts }),
+//         material: polymats.add(PolylineMaterial {
+//             width: 101.0,
+//             color: BISEXY_COLOR,
+//             perspective: true,
+//             depth_bias: -0.001,
+//         }),
+//         ..Default::default()
+//     });
+// }
 
 fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
     let chance = 0.005;
@@ -98,8 +98,6 @@ impl Plugin for CyberGlamorPlugin {
             app.add_plugin(rplugin);
         }
 
-        app.add_startup_system(StartupSet::PostStartup, wireframe_planet)
-            .add_system(wireframify_lights)
-            .add_plugin(PolylinePlugin);
+        app.add_system(wireframify_lights);
     }
 }
diff --git a/src/input.rs b/src/input.rs
index 7407fa3..6d92d1a 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -1,4 +1,8 @@
-use bevy::{input::gamepad::GamepadEvent, prelude::*, utils::HashSet};
+use bevy::{
+    input::gamepad::{GamepadAxisChangedEvent, GamepadButtonChangedEvent, GamepadEvent},
+    prelude::*,
+    utils::HashSet,
+};
 
 use crate::camera::DebugCamOffset;
 
@@ -48,29 +52,32 @@ fn update_debug_cam(mut offset: ResMut<DebugCamOffset>, mut keys: ResMut<Input<K
 fn update_input(mut events: EventReader<GamepadEvent>, mut istate: ResMut<InputState>) {
     for pad_event in events.iter() {
         match pad_event {
-            GamepadEvent::Button(GamepadButtonType::RightTrigger2, val) => {
-                istate.throttle = val;
-            }
-            GamepadEvent::Button(GamepadButtonType::LeftTrigger2, val) => {
-                istate.throttle = -val;
-            }
-            GamepadEvent::Button(GamepadButtonType::East, val) => {
-                if val > 0.5 {
-                    istate.brake = true;
-                } else {
-                    istate.brake = false;
+            GamepadEvent::Button(button_event) => {
+                let GamepadButtonChangedEvent {
+                    button_type, value, ..
+                } = button_event;
+                match button_type {
+                    GamepadButtonType::RightTrigger => istate.throttle = *value,
+                    GamepadButtonType::LeftTrigger => istate.throttle = -value,
+                    GamepadButtonType::East => {
+                        if value > &0.5 {
+                            istate.brake = true;
+                        } else {
+                            istate.brake = false;
+                        }
+                    }
+                    _ => info!("unhandled button press: {button_event:?}"),
                 }
             }
-            GamepadEvent::Axis(GamepadAxisType::LeftStickX, val) => {
-                istate.yaw = val;
-            }
-            // ignore spurious vertical movement for now
-            GamepadEvent::Axis(GamepadAxisType::LeftStickY, val) => {
-                istate.pitch = val;
-            }
-            _ => {
-                info!("unhandled gamepad event: {:?}", pad_event);
+            GamepadEvent::Axis(axis_event) => {
+                let GamepadAxisChangedEvent {
+                    axis_type, value, ..
+                } = axis_event;
+                match axis_type {
+                    _ => info!("unhandled axis event: {axis_event:?}"),
+                }
             }
+            GamepadEvent::Connection(_) => {}
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 0612a02..dd94e9f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 use bevy::{
     ecs::schedule::SystemSet,
-    prelude::{Query, Vec3, Window},
+    prelude::{Query, Vec3, Window, With},
+    window::PrimaryWindow,
 };
 
 pub mod action;
@@ -20,10 +21,10 @@ pub enum Label {
     Action,
 }
 
-pub fn disable_mouse_trap(mut windows: Query<&Window>) {
-    let window = windows.get_primary_mut().unwrap();
-    window.set_cursor_grab_mode(bevy::window::CursorGrabMode::None);
-    window.set_cursor_visibility(true);
+pub fn disable_mouse_trap(mut window: Query<&mut Window, With<PrimaryWindow>>) {
+    let mut window = window.get_single_mut().unwrap();
+    window.cursor.grab_mode = bevy::window::CursorGrabMode::None;
+    window.cursor.visible = true;
 }
 
 pub fn random_unit_vec(r: &mut impl rand::prelude::Rng) -> Vec3 {
diff --git a/src/lights.rs b/src/lights.rs
index 194a8fa..fe29d44 100644
--- a/src/lights.rs
+++ b/src/lights.rs
@@ -74,10 +74,13 @@ fn spawn_moving_lights(
                         builder
                             // now a simple mesh to show a wireframe.
                             .spawn(PbrBundle {
-                                mesh: meshes.add(Mesh::from(shape::Icosphere {
-                                    radius,
-                                    subdivisions: 1,
-                                })),
+                                mesh: meshes.add(
+                                    Mesh::try_from(shape::Icosphere {
+                                        radius,
+                                        subdivisions: 1,
+                                    })
+                                    .unwrap(),
+                                ),
                                 material: materials.add(StandardMaterial {
                                     base_color: Color::hsla(272.0, 0.7, 0.56, 0.7),
                                     emissive: color,
@@ -128,10 +131,13 @@ fn spawn_static_lights(
         })
         .with_children(|builder| {
             builder.spawn(PbrBundle {
-                mesh: meshes.add(Mesh::from(shape::Icosphere {
-                    radius: 10.0,
-                    subdivisions: 2,
-                })),
+                mesh: meshes.add(
+                    Mesh::try_from(shape::Icosphere {
+                        radius: 10.0,
+                        subdivisions: 2,
+                    })
+                    .unwrap(),
+                ),
                 material: materials.add(StandardMaterial {
                     base_color: Color::BLUE,
                     emissive: Color::PINK,
@@ -149,10 +155,13 @@ fn spawn_static_lights(
         })
         .with_children(|builder| {
             builder.spawn(PbrBundle {
-                mesh: meshes.add(Mesh::from(shape::Icosphere {
-                    radius: 10.0,
-                    subdivisions: 2,
-                })),
+                mesh: meshes.add(
+                    Mesh::try_from(shape::Icosphere {
+                        radius: 10.0,
+                        subdivisions: 2,
+                    })
+                    .unwrap(),
+                ),
                 material: materials.add(StandardMaterial {
                     base_color: Color::PINK,
                     emissive: Color::BLUE,
diff --git a/src/main.rs b/src/main.rs
index 3bb5906..fc1be03 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,14 +10,13 @@ const CYBER_SKY: Color = Color::rgb(0.07, 0.001, 0.02);
 
 fn main() {
     let mut app = App::new();
-    app.insert_resource(Msaa { samples: 4 })
+    app.insert_resource(Msaa::Sample4)
         .insert_resource(ClearColor(CYBER_SKY))
         .add_plugins(DefaultPlugins.set(WindowPlugin {
-            window: WindowDescriptor {
-                width: 2560.0,
-                height: 1440.0,
+            primary_window: Some(Window {
+                resolution: (2560.0, 1440.0).into(),
                 ..Default::default()
-            },
+            }),
             ..Default::default()
         }))
         .add_plugin(CyberPlanetPlugin)
diff --git a/src/planet.rs b/src/planet.rs
index 0ea5cbf..34cc535 100644
--- a/src/planet.rs
+++ b/src/planet.rs
@@ -59,7 +59,7 @@ fn spawn_planet(
 pub struct CyberPlanetPlugin;
 impl Plugin for CyberPlanetPlugin {
     fn build(&self, app: &mut App) {
-        app.add_startup_system(spawn_planet.label(Label::Geometry));
+        app.add_startup_system(spawn_planet);
     }
 }
 

From b8751a73749d7c91feb296cf8b9516097ffc8db7 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Fri, 10 Mar 2023 11:45:01 -0800
Subject: [PATCH 12/13] neuter glamor

---
 Cargo.toml    |   2 +-
 src/camera.rs |  17 ++++++++
 src/glamor.rs |  73 +-------------------------------
 src/lights.rs | 112 ++++----------------------------------------------
 src/main.rs   |  14 ++++---
 src/planet.rs |   8 ++--
 6 files changed, 42 insertions(+), 184 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 60fd637..430899b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ features = [
   "bevy_ui",
   "bevy_text",
   "bevy_gltf",
-  "bevy_sprite"
+  "bevy_sprite",
 ]
 
 [dependencies.bevy_rapier3d]
diff --git a/src/camera.rs b/src/camera.rs
index 7ac4da6..1e23e2d 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -43,15 +43,32 @@ fn setup_cybercams(mut commands: Commands) {
         fov: std::f32::consts::FRAC_PI_3,
         ..Default::default()
     };
+
+    let fog_settings = FogSettings {
+        color: Color::rgba(0.1, 0.2, 0.4, 1.0),
+        directional_light_color: Color::rgba(1.0, 0.95, 0.75, 0.5),
+        directional_light_exponent: 30.0,
+        falloff: FogFalloff::from_visibility_colors(
+            350.0, /* distance in world units up to which objects retain visibility (>= 5%
+                    * contrast) */
+            Color::rgb(0.35, 0.5, 0.66), /* atmospheric extinction color (after light is lost
+                                          * due to absorption by atmospheric particles) */
+            Color::rgb(0.8, 0.844, 1.0), /* atmospheric inscattering color (light gained due to
+                                          * scattering from the sun) */
+        ),
+    };
+
     commands
         .spawn(Camera3dBundle {
             projection: bevy::render::camera::Projection::Perspective(hero_projection),
             ..Default::default()
         })
+        .insert(fog_settings.clone())
         .insert(CyberCameras::Hero);
 
     commands
         .spawn(Camera3dBundle::default())
+        .insert(fog_settings)
         .insert(CyberCameras::Debug);
 }
 
diff --git a/src/glamor.rs b/src/glamor.rs
index 48acb25..fef9d57 100644
--- a/src/glamor.rs
+++ b/src/glamor.rs
@@ -1,80 +1,13 @@
-use bevy::{
-    prelude::*,
-    render::mesh::{Indices, VertexAttributeValues},
-};
-// use bevy_polyline::prelude::{Polyline, PolylineBundle, PolylineMaterial, PolylinePlugin};
-use rand::{thread_rng, Rng};
+use bevy::prelude::{App, Color, Plugin};
 
-use crate::{lights::AnimateCyberLightWireframe, planet::CyberPlanet};
+// use crate::planet::CyberPlanet;
 
 pub const BISEXY_COLOR: Color = Color::hsla(292.0, 0.9, 0.60, 1.1);
 
-// fn wireframe_planet(
-//     mut commands: Commands,
-//     mut meshes: ResMut<Assets<Mesh>>,
-//     mut polylines: ResMut<Assets<Polyline>>,
-//     mut polymats: ResMut<Assets<PolylineMaterial>>,
-//     query: Query<&Handle<Mesh>, With<CyberPlanet>>,
-// ) {
-//     let handle = query.single();
-//     let mesh = meshes.get_mut(handle).unwrap();
-//     let vertices = mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap();
-
-//     let mut pts = Vec::with_capacity(vertices.len());
-
-//     if let VertexAttributeValues::Float32x3(verts) = vertices {
-//         let indices = mesh.indices().unwrap();
-//         if let Indices::U32(indices) = indices {
-//             for i in indices.iter() {
-//                 let v = verts[*i as usize];
-//                 let v = Vec3::from_slice(&v);
-//                 pts.push(v);
-//             }
-//         }
-//     }
-
-//     let mut verts = Vec::with_capacity((pts.len() as f32 * 1.4) as usize);
-//     for pts in pts.chunks(3) {
-//         if pts.len() > 1 {
-//             verts.extend_from_slice(pts);
-//             verts.push(Vec3::NAN);
-//         }
-//     }
-
-//     // don't need the indices anymore
-//     mesh.duplicate_vertices();
-//     mesh.compute_flat_normals();
-
-//     commands.spawn(PolylineBundle {
-//         polyline: polylines.add(Polyline { vertices: verts }),
-//         material: polymats.add(PolylineMaterial {
-//             width: 101.0,
-//             color: BISEXY_COLOR,
-//             perspective: true,
-//             depth_bias: -0.001,
-//         }),
-//         ..Default::default()
-//     });
-// }
-
-fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) {
-    let chance = 0.005;
-
-    let rng = &mut thread_rng();
-
-    for mut light in lights.iter_mut() {
-        if rng.gen::<f32>() < chance {
-            let new = !light.wired;
-            light.wired = new;
-        }
-    }
-}
-
 // public plugin
 pub struct CyberGlamorPlugin;
 impl Plugin for CyberGlamorPlugin {
     fn build(&self, app: &mut App) {
-        #[cfg(feature = "inspector")]
         {
             use bevy_rapier3d::render::{
                 DebugRenderMode, DebugRenderStyle, RapierDebugRenderPlugin,
@@ -97,7 +30,5 @@ impl Plugin for CyberGlamorPlugin {
 
             app.add_plugin(rplugin);
         }
-
-        app.add_system(wireframify_lights);
     }
 }
diff --git a/src/lights.rs b/src/lights.rs
index fe29d44..031514c 100644
--- a/src/lights.rs
+++ b/src/lights.rs
@@ -1,99 +1,9 @@
-use std::f32::consts::TAU;
-
-use bevy::prelude::*;
-use rand::prelude::*;
+use bevy::{pbr::CascadeShadowConfigBuilder, prelude::*};
 
 use crate::planet::PLANET_RADIUS;
 
 pub const LIGHT_RANGE: f32 = 90.0;
 
-#[derive(Component)]
-struct AnimatedCyberLight {
-    axis: Vec3,
-    rate: f32,
-}
-
-#[derive(Component, Default)]
-pub(crate) struct AnimateCyberLightWireframe {
-    pub wired: bool,
-}
-
-fn spawn_moving_lights(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-) {
-    let rng = &mut thread_rng();
-    // spawn orbiting bisexual lights
-    for _ in 0..655 {
-        // mechanics
-        let axis = crate::random_unit_vec(rng);
-        let angle = rng.gen_range(0.0..TAU);
-        let rate: f32 = rng.gen_range(7.0..10.0);
-        let rate = rate.to_radians();
-        let rotation = Quat::from_axis_angle(axis, angle);
-        let altitude = PLANET_RADIUS + rng.gen_range(8.0..20.0);
-        let perp = axis.any_orthonormal_vector();
-        let translation = perp * altitude;
-        let transform = Transform::from_translation(translation);
-
-        // optics
-        let hue = rng.gen_range(240.0..300.0);
-        let saturation = rng.gen_range(0.85..0.99);
-        let lightness = rng.gen_range(0.3..0.7);
-        let color = Color::hsl(hue, saturation, lightness);
-        let intensity = rng.gen_range(900.0..1300.0);
-        let radius = rng.gen::<f32>() * 2.2; // why can't this infer the gen type?
-        let point_light = PointLight {
-            intensity,
-            range: LIGHT_RANGE,
-            color,
-            radius: radius - 0.1,
-            shadows_enabled: true,
-            ..Default::default()
-        };
-
-        let sbundle = SpatialBundle {
-            transform: Transform::from_rotation(rotation),
-            ..Default::default()
-        };
-        commands
-            // first, spawn an entity with a transform we can rotate
-            .spawn((AnimatedCyberLight { axis, rate },))
-            .insert(sbundle)
-            .with_children(|parent| {
-                parent
-                    // now spawn a child entity with a pointlight, and a relative transform that's
-                    // just translation from the parent
-                    .spawn(PointLightBundle {
-                        transform,
-                        point_light,
-                        ..Default::default()
-                    })
-                    .with_children(|builder| {
-                        builder
-                            // now a simple mesh to show a wireframe.
-                            .spawn(PbrBundle {
-                                mesh: meshes.add(
-                                    Mesh::try_from(shape::Icosphere {
-                                        radius,
-                                        subdivisions: 1,
-                                    })
-                                    .unwrap(),
-                                ),
-                                material: materials.add(StandardMaterial {
-                                    base_color: Color::hsla(272.0, 0.7, 0.56, 0.7),
-                                    emissive: color,
-                                    ..Default::default()
-                                }),
-                                ..Default::default()
-                            })
-                            .insert(AnimateCyberLightWireframe::default());
-                    }); // mesh child
-            }); // light child
-    }
-}
-
 fn spawn_static_lights(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
@@ -122,6 +32,13 @@ fn spawn_static_lights(
         brightness: 0.2,
     });
 
+    let _cascade_shadow_config = CascadeShadowConfigBuilder {
+        first_cascade_far_bound: 0.3,
+        maximum_distance: 3.0,
+        ..default()
+    }
+    .build();
+
     // up light
     commands
         .spawn(PointLightBundle {
@@ -172,20 +89,9 @@ fn spawn_static_lights(
         });
 }
 
-fn orbit_lights(time: Res<Time>, mut query: Query<(&mut Transform, &AnimatedCyberLight)>) {
-    let dt = time.delta_seconds();
-    for (mut transform, light) in query.iter_mut() {
-        let AnimatedCyberLight { axis, rate } = *light;
-        let theta = rate * dt;
-        transform.rotation *= Quat::from_axis_angle(axis, theta);
-    }
-}
-
 pub struct CyberSpaceLightsPlugin;
 impl Plugin for CyberSpaceLightsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_startup_system(spawn_static_lights)
-            .add_startup_system(spawn_moving_lights)
-            .add_system(orbit_lights);
+        app.add_startup_system(spawn_static_lights);
     }
 }
diff --git a/src/main.rs b/src/main.rs
index fc1be03..51ed902 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,14 @@
 use bevy::prelude::*;
+#[cfg(feature = "inspector")]
+use cyber_rider::glamor::CyberGlamorPlugin;
 use cyber_rider::{
     action::CyberActionPlugin, bike::CyberBikePlugin, camera::CyberCamPlugin, disable_mouse_trap,
-    glamor::CyberGlamorPlugin, input::CyberInputPlugin, lights::CyberSpaceLightsPlugin,
-    planet::CyberPlanetPlugin, ui::CyberUIPlugin,
+    input::CyberInputPlugin, lights::CyberSpaceLightsPlugin, planet::CyberPlanetPlugin,
+    ui::CyberUIPlugin,
 };
 
-const CYBER_SKY: Color = Color::rgb(0.07, 0.001, 0.02);
-// const CYBER_SKY: Color = Color::rgb(0.64, 0.745, 0.937); // a light blue sky
+//const CYBER_SKY: Color = Color::rgb(0.07, 0.001, 0.02);
+const CYBER_SKY: Color = Color::rgb(0.64, 0.745, 0.937); // a light blue sky
 
 fn main() {
     let mut app = App::new();
@@ -20,7 +22,6 @@ fn main() {
             ..Default::default()
         }))
         .add_plugin(CyberPlanetPlugin)
-        .add_plugin(CyberGlamorPlugin)
         .add_plugin(CyberInputPlugin)
         .add_plugin(CyberActionPlugin)
         .add_plugin(CyberCamPlugin)
@@ -30,5 +31,8 @@ fn main() {
         .add_startup_system(disable_mouse_trap)
         .add_system(bevy::window::close_on_esc);
 
+    #[cfg(feature = "inspector")]
+    app.add_plugin(CyberGlamorPlugin);
+
     app.run();
 }
diff --git a/src/planet.rs b/src/planet.rs
index 34cc535..ddc133f 100644
--- a/src/planet.rs
+++ b/src/planet.rs
@@ -19,7 +19,7 @@ fn spawn_planet(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let color = Color::rgb(0.2, 0.1, 0.2);
+    let color = Color::rgb(0.74, 0.5334, 0.176);
     let isphere = Icosphere {
         radius: PLANET_RADIUS,
         subdivisions: 88,
@@ -43,9 +43,9 @@ fn spawn_planet(
             mesh: meshes.add(mesh),
             material: materials.add(StandardMaterial {
                 base_color: color,
-                metallic: 0.1,
+                metallic: 0.3,
                 perceptual_roughness: 0.3,
-                alpha_mode: AlphaMode::Opaque,
+                //alpha_mode: AlphaMode::Opaque,
                 ..Default::default()
             }),
 
@@ -86,7 +86,7 @@ fn gen_planet(sphere: Icosphere) -> (Mesh, Collider) {
         .raw_points()
         .iter()
         .map(|&p| {
-            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.04;
+            let disp = noise.get(p.as_dvec3().into()) as f32 * 0.01;
             let pt = p + (p.normalize() * disp);
             pt.into()
         })

From 9fb93e5f7d77b49c7c8701dd7e54ef1c854749ab Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Tue, 21 Mar 2023 17:50:51 -0700
Subject: [PATCH 13/13] add input handling

---
 src/input.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/input.rs b/src/input.rs
index 6d92d1a..c2965f3 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -57,8 +57,8 @@ fn update_input(mut events: EventReader<GamepadEvent>, mut istate: ResMut<InputS
                     button_type, value, ..
                 } = button_event;
                 match button_type {
-                    GamepadButtonType::RightTrigger => istate.throttle = *value,
-                    GamepadButtonType::LeftTrigger => istate.throttle = -value,
+                    GamepadButtonType::RightTrigger2 => istate.throttle = *value,
+                    GamepadButtonType::LeftTrigger2 => istate.throttle = -value,
                     GamepadButtonType::East => {
                         if value > &0.5 {
                             istate.brake = true;
@@ -74,6 +74,12 @@ fn update_input(mut events: EventReader<GamepadEvent>, mut istate: ResMut<InputS
                     axis_type, value, ..
                 } = axis_event;
                 match axis_type {
+                    GamepadAxisType::LeftStickX => {
+                        istate.yaw = *value;
+                    }
+                    GamepadAxisType::RightStickY => {
+                        istate.pitch = *value;
+                    }
                     _ => info!("unhandled axis event: {axis_event:?}"),
                 }
             }