Cleanup feature flags

Author: CuddlyBunion341

Cargo.toml

@@ -42,7 +42,7 @@ name = "server"
 path = "src/server/main.rs"
 
 [features]
-default = ["chat", "player_controller"]
+default = ["chat"]
 dynamic_linking = ["bevy/dynamic_linking"]
 
 # both
@@ -58,7 +58,7 @@ skip_chunk_padding = []
 wireframe = []
 debug_ui = []
 ortho_camera = []
-player_controller = []
+lock_player = []
 physics_debug = []
 raycast_debug = []
 visual_debug = ["wireframe", "physics_debug", "raycast_debug"]

src/client/player/systems/controller.rs

@@ -1,6 +1,8 @@
 use crate::prelude::*;
 
-// const SPAWN_POINT: Vec3 = Vec3::new(0.0, 32.0, 0.0);
+#[cfg(not(feature = "lock_player"))]
+const SPAWN_POINT: Vec3 = Vec3::new(0.0, 32.0, 0.0);
+#[cfg(feature = "lock_player")]
 const SPAWN_POINT: Vec3 = Vec3::new(128.0, 96.0, -128.0);
 
 pub fn setup_player_camera(mut commands: Commands) {
@@ -48,17 +50,25 @@ pub fn setup_controller_on_area_ready_system(
             },
             ActiveEvents::COLLISION_EVENTS,
             Velocity::zero(),
+            #[cfg(feature = "lock_player")]
             RigidBody::Fixed,
+            #[cfg(not(feature = "lock_player"))]
+            RigidBody::Dynamic,
             Sleeping::disabled(),
             LockedAxes::ROTATION_LOCKED,
             AdditionalMassProperties::Mass(1.0),
             GravityScale(0.0),
             Ccd { enabled: true }, // Prevent clipping when going fast
             Transform::from_translation(SPAWN_POINT),
             LogicalPlayer,
+            #[cfg(not(feature = "lock_player"))]
+            FpsControllerInput {
+                pitch: -TAU / 20.0,
+                yaw: TAU * 5.0 / 12.0,
+                ..default()
+            },
+            #[cfg(feature = "lock_player")]
             FpsControllerInput {
-                // pitch: -TAU / 20.0,
-                // yaw: TAU * 5.0 / 12.0,
                 pitch: 0.0,
                 yaw: 0.0,
                 ..default()