diff --git a/src/action/components.rs b/src/action/components.rs index 7a6587b..a844fa2 100644 --- a/src/action/components.rs +++ b/src/action/components.rs @@ -36,7 +36,7 @@ impl Default for Tunneling { fn default() -> Self { Tunneling { frames: 15, - dir: Vec3::ZERO, + dir: Vec3::Y, } } } @@ -52,7 +52,7 @@ impl Default for MovementSettings { fn default() -> Self { Self { accel: 20.0, - gravity: 4.8, + gravity: 9.8, } } } diff --git a/src/action/mod.rs b/src/action/mod.rs index 50cb7f4..904e397 100644 --- a/src/action/mod.rs +++ b/src/action/mod.rs @@ -39,8 +39,8 @@ impl Plugin for CyberActionPlugin { falling_cat, input_forces, drag, - tunnel_out, - surface_fix, + //tunnel_out, + //surface_fix, ) .chain(), ); diff --git a/src/action/systems.rs b/src/action/systems.rs index 134757e..7c808ab 100644 --- a/src/action/systems.rs +++ b/src/action/systems.rs @@ -1,7 +1,7 @@ use std::f32::consts::{FRAC_PI_3, FRAC_PI_4}; use bevy::prelude::{ - Commands, Entity, Quat, Query, Res, ResMut, Time, Transform, Vec3, With, Without, + Commands, Entity, Local, Quat, Query, Res, ResMut, Time, Transform, Vec3, With, Without, }; use bevy_rapier3d::prelude::{ CollisionGroups, ExternalForce, Group, MultibodyJoint, QueryFilter, RapierConfiguration, @@ -94,13 +94,19 @@ pub(super) fn cyber_lean( /// PID-based controller for stabilizing attitude; keeps the cyberbike upright. pub(super) fn falling_cat( - mut bike_query: Query<(&Transform, &mut ExternalForce, &mut CatControllerState)>, + mut bike_query: Query<( + &Transform, + &Velocity, + &mut ExternalForce, + &mut CatControllerState, + )>, time: Res