fix: remove unused function

Author: invertedEcho

src/enemy/spawn/mod.rs

@@ -1,11 +1,7 @@
 use crate::{
     character_controller::{
         CHARACTER_CAPSULE_LENGTH, CHARACTER_CAPSULE_RADIUS, Grounded,
-<<<<<<< HEAD
         LOCAL_FEET_CHARACTER, RUN_VELOCITY, WALK_VELOCITY,
-=======
-        RUN_VELOCITY, WALK_VELOCITY,
->>>>>>> master
     },
     enemy::{
         animate::ENEMY_MODEL_PATH,
@@ -194,7 +190,7 @@ fn handle_spawn_enemies_at_enemy_spawn_locations_message(
                             settings: AgentSettings {
                                 desired_speed: WALK_VELOCITY,
                                 max_speed: RUN_VELOCITY,
-                                radius: 2.0,
+                                radius: ENEMY_AGENT_RADIUS,
                             },
                         },
                         AgentTarget3d::None,

src/nav_mesh_pathfinding/mod.rs

@@ -1,21 +1,16 @@
 use avian_rerecast::AvianBackendPlugin;
-use avian3d::prelude::*;
 use bevy::prelude::*;
-use bevy_landmass::{Agent3d, debug::Landmass3dDebugPlugin, prelude::*};
+use bevy_landmass::{debug::Landmass3dDebugPlugin, prelude::*};
 use bevy_rerecast::{debug::DetailNavmeshGizmo, prelude::*};
 use landmass_rerecast::{
     Island3dBundle, LandmassRerecastPlugin, NavMeshHandle3d,
 };
 
 use crate::{
-    character_controller::MAX_SLOPE_ANGLE,
-    character_controller::MAX_SLOPE_ANGLE,
-    enemy::{Enemy, spawn::AgentEnemyEntityPointer},
-    game_flow::states::GameLoadingState,
-    game_flow::states::GameLoadingState,
+    character_controller::MAX_SLOPE_ANGLE, game_flow::states::GameLoadingState,
 };
 
-pub const ENEMY_AGENT_RADIUS: f32 = 0.3;
+pub const ENEMY_AGENT_RADIUS: f32 = 0.4;
 
 pub struct NavMeshPathfindingPlugin;
 
@@ -30,7 +25,7 @@ impl Plugin for NavMeshPathfindingPlugin {
             OnEnter(GameLoadingState::CollidersReady),
             generate_navmesh_when_map_colliders_ready,
         );
-        app.add_systems(Update, (update_agent_velocity, snap_agent_to_floor));
+        app.add_systems(Update, update_agent_velocity);
     }
 }
 
@@ -62,7 +57,7 @@ fn generate_navmesh_when_map_colliders_ready(
         commands.insert_resource(ArchipelagoRef(archipelago_id));
 
         let navmesh = generator.generate(NavmeshSettings {
-            agent_radius: ENEMY_AGENT_RADIUS,
+            agent_radius: 0.3,
             // this is pretty important, so the agent doesnt try to climb some very high ledge
             walkable_climb: 0.25,
             walkable_slope_angle: MAX_SLOPE_ANGLE,
@@ -96,51 +91,3 @@ fn update_agent_velocity(
         agent_velocity.velocity = desired_velocity.velocity();
     }
 }
-
-// FIXME: dont need this anymore
-fn snap_agent_to_floor(
-    query: Query<
-        (Entity, &Transform, &mut LinearVelocity, &ShapeHits),
-        With<Enemy>,
-    >,
-    time: Res<Time>,
-    spatial_query: SpatialQuery,
-) {
-    for (enemy_entity, enemy_transform, mut enemy_velocity, shape_hits) in query
-    {
-        let Some(first_hit) = shape_hits.0.get(0) else {
-            info!("snap_agent_to_floor: No hits down found");
-            continue;
-        };
-        info!("first_hit: {:?}", first_hit);
-
-        // let hit_down_point =
-        //     ray_down_origin + ray_down_direction * hit_down.distance;
-        // let hit_down_y = hit_down_point.y;
-        // let enemy_y = enemy_transform.translation.y;
-        // let difference_y = hit_down_y - enemy_y;
-        // if difference_y.abs() < 0.3 {
-        //     info!("Snapping enemy to slope");
-        //     enemy_velocity.y = difference_y / time.delta_secs();
-        // } else {
-        //     info!(
-        //         "Not snapping enemy, difference between hit down and player \
-        //          too large"
-        //     );
-        // }
-        // let ray_down_origin = enemy_transform.translation + Vec3::Y * 0.5;
-        // let ray_down_direction = Dir3::NEG_Y;
-        // let max_down_distance = 1.0;
-        //
-        // if let Some(hit_down) = spatial_query.cast_ray(
-        //     ray_down_origin,
-        //     ray_down_direction,
-        //     max_down_distance,
-        //     true,
-        //     &SpatialQueryFilter::default()
-        //         .with_excluded_entities([enemy_entity]),
-        // ) {
-        // } else {
-        // }
-    }
-}