remove pathfinding stuff from bspeater

Author: catornot

bspeater/src/async_pathfinding.rs

@@ -1,26 +1,21 @@
-use bevy::{
-    camera_controller::free_camera::FreeCamera, input::common_conditions::input_just_pressed,
-    prelude::*,
-};
+use bevy::{camera_controller::free_camera::FreeCamera, prelude::*};
 use oktree::prelude::*;
-use std::{ops::BitAnd, sync::Arc};
+use std::ops::BitAnd;
 
 use crate::{
     ATTRIBUTE_PRIMATIVE_TYPE, ATTRIBUTE_UNIQUE_CONTENTS, CELL_SIZE, ChunkCells, EnabledFeatures,
-    OFFSET, PrimitiveType, ProcessingStep, WorldMesh,
-    async_pathfinding::JobMarket,
-    behavior::{self, Behavior, init_pathfinding},
+    OFFSET, PrimitiveType, WorldMesh,
 };
 
+#[allow(unused)]
 pub type Octree32 = Octree<u32, TUVec3u32>;
+#[allow(unused)]
 pub struct Navmesh {
     pub navmesh_tree: Octree32,
     pub cell_size: f32,
 }
 
-#[derive(Resource)]
-pub struct NavmeshRes(Behavior, JobMarket);
-
+#[allow(unused)]
 #[derive(Resource, Default)]
 pub struct PathfindingPoints {
     building: [Option<Vec3>; 2],
@@ -34,21 +29,9 @@ struct PointsText;
 struct MeshInfoText;
 
 pub fn debug_plugin(app: &mut App) {
-    app.add_systems(
-        Update,
-        (
-            debug_world,
-            debug_pathfinding.run_if(resource_exists::<NavmeshRes>),
-            update_pos_text,
-            add_pathfinding_points.run_if(input_just_pressed(KeyCode::Enter)),
-            add_navmesh_resource
-                .run_if(in_state(ProcessingStep::Done))
-                .run_if(|res: Option<Res<NavmeshRes>>| res.is_none()),
-            debug_contents,
-        ),
-    )
-    .add_systems(Startup, setup_debug_ui)
-    .init_resource::<PathfindingPoints>();
+    app.add_systems(Update, (debug_world, update_pos_text, debug_contents))
+        .add_systems(Startup, setup_debug_ui)
+        .init_resource::<PathfindingPoints>();
 }
 
 fn setup_debug_ui(mut commands: Commands) {
@@ -196,52 +179,6 @@ fn debug_world(
     Ok(())
 }
 
-fn debug_pathfinding(
-    points: Res<PathfindingPoints>,
-    mut navmesh: ResMut<NavmeshRes>,
-    time: Res<Time>,
-    gizmos: Gizmos,
-) -> Result<(), BevyError> {
-    if let Some(points) = points.current {
-        let NavmeshRes(bt, job_market) = &mut *navmesh;
-        behavior::run_behavior(bt, time.delta_secs_f64(), points, job_market, gizmos);
-    }
-
-    Ok(())
-}
-
-fn add_pathfinding_points(
-    camera: Query<&Transform, With<FreeCamera>>,
-    mut points: ResMut<PathfindingPoints>,
-) -> Result<(), BevyError> {
-    let origin = camera.single()?.translation.trunc();
-
-    if points.building[0].is_none() {
-        _ = points.building[0].replace(origin);
-        _ = points.building[1].take();
-    } else if points.building[1].is_none() {
-        _ = points.building[1].replace(origin);
-    }
-
-    if matches!(points.building, [Some(_), Some(_)]) {
-        points.current = points.building[0].and_then(|point| Some([point, points.building[1]?]));
-        points.building = default();
-    }
-
-    Ok(())
-}
-
-fn add_navmesh_resource(mut commands: Commands, cells: Res<ChunkCells>) {
-    let navmesh = Arc::new(Navmesh {
-        navmesh_tree: cells.tree.clone(),
-        cell_size: CELL_SIZE,
-    });
-    commands.insert_resource(NavmeshRes(
-        init_pathfinding(Arc::clone(&navmesh)),
-        JobMarket::new(navmesh),
-    ));
-}
-
 fn debug_contents(
     mut ray_cast: MeshRayCast,
     camera: Query<&Transform, (With<FreeCamera>, Without<WorldMesh>)>,

bspeater/src/behavior.rs

@@ -1,4 +1,10 @@
 // sligtly modified version of export.rs from https://github.com/mrclputra/bevy_WeaverGen_V3
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // saves the model as an obj file
 // by iterating through all the meshes
@@ -19,8 +25,7 @@ pub fn export_obj<'a>(
     let mut writer = BufWriter::new(file);
 
     // OBJ header
-    writeln!(writer, "# Exported from Slum Generator")?;
-    writeln!(writer, "Written by Marcel Putra 2025")?;
+    writeln!(writer, "# Exported from BSPEater")?;
 
     // OBJ format indices start at 1, dont ask why :)
     let mut vertex_offset = 1;

bspeater/src/debug.rs

@@ -6,7 +6,7 @@ use avian3d::prelude::*;
 #[cfg(not(feature = "graphics"))]
 use bevy::mesh::MeshPlugin;
 #[cfg(feature = "graphics")]
-use bevy::pbr::wireframe::WireframeConfig;
+use bevy::pbr::wireframe::{WireframeConfig, WireframePlugin};
 use bevy::{
     asset::RenderAssetUsages,
     mesh::{MeshVertexAttribute, VertexFormat},
@@ -31,19 +31,13 @@ use std::{
 
 pub use bindings::*;
 
-#[cfg(feature = "graphics")]
-mod async_pathfinding;
-#[cfg(feature = "graphics")]
-mod behavior;
 mod bindings;
 mod cli;
 #[cfg(feature = "graphics")]
 mod debug;
 mod export;
 mod geoset_loader;
 mod mdl_loader;
-#[cfg(feature = "graphics")]
-mod pathfinding;
 mod saving;
 
 pub const UNPACK: &str = "vpk";
@@ -328,10 +322,10 @@ fn main() -> anyhow::Result<()> {
             ..default()
         }),
         PhysicsPlugins::default(),
-        #[cfg(feature = "graphics")]
-        PhysicsDebugPlugin,
         // #[cfg(feature = "graphics")]
-        // WireframePlugin::default(),
+        // PhysicsDebugPlugin,
+        #[cfg(feature = "graphics")]
+        WireframePlugin::default(),
         #[cfg(feature = "graphics")]
         FreeCameraPlugin,
     ))