update rust version, and some minor bspeater improvements

Author: catornot

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "bp_ort"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 
 [dependencies]

bp_ort/Cargo.toml

@@ -5,11 +5,8 @@ edition = "2024"
 license = "Apache-2.0"
 
 [dependencies]
-# sourcepak = { version = "0.3.0", features = ["revpk"] }
-avian3d = { version = "0.3.*", features = ["simd", "debug-plugin"] }
-bevy = { version = "0.16.*", features = ["wayland", "x11"] }
-bevy_fly_camera = "0.16.*"
-bevy_gltf_export = { git = "https://github.com/luca-della-vedova/bevy_gltf_export.git", version = "0.1.0" }
+avian3d = { version = "0.5.*", features = ["simd", "parry-f32", "bevy_picking", "parallel", "f32", "3d", "collider-from-mesh"], default-features = false }
+bevy = { version = "0.18.*", features = ["wayland", "x11", "3d"], default-features = false }
 clap = { version = "4.5.39", features = ["derive"] }
 itertools = { workspace = true }
 modular-bitfield = "0.12.0"
@@ -24,3 +21,7 @@ bonsai-bt = "0.10.0"
 indexmap = "2.11.4"
 rustc-hash = "2.1.1"
 hexasphere = "16.0.0"
+
+[features]
+default = ["graphics"]
+graphics = ["oktree/bevy", "bevy/wayland", "bevy/wayland", "bevy/free_camera", "avian3d/debug-plugin"]

bspeater/Cargo.toml

@@ -22,6 +22,9 @@ pub struct BspeaterCli {
     #[arg(long, short = 't', default_value_t = false, action = clap::ArgAction::SetTrue)]
     pub show_octtree: bool,
 
+    #[arg(long, short = 'g', default_value_t = false, action = clap::ArgAction::SetTrue)]
+    pub show_grid_octtree: bool,
+
     #[arg(long, short = 'o', default_value = "output")]
     pub output: PathBuf,
 }

bspeater/src/cli.rs

@@ -1,5 +1,7 @@
-use bevy::{input::common_conditions::input_just_pressed, prelude::*};
-use bevy_fly_camera::FlyCamera;
+use bevy::{
+    camera_controller::free_camera::FreeCamera, input::common_conditions::input_just_pressed,
+    prelude::*,
+};
 use oktree::prelude::*;
 use std::{ops::BitAnd, sync::Arc};
 
@@ -141,13 +143,17 @@ fn update_pos_text(
 }
 
 fn debug_world(
-    camera: Query<&Transform, (With<FlyCamera>, Without<WireMe>)>,
+    camera: Query<&Transform, (With<FreeCamera>, Without<WireMe>)>,
     debug_amount: Res<DebugAmount>,
     cells: Res<ChunkCells>,
     mut gizmos: Gizmos,
 ) -> Result<(), BevyError> {
     let origin = camera.single()?.translation;
 
+    if !debug_amount.grid {
+        return Ok(());
+    }
+
     for pos in cells
         .collied_vec
         .iter()
@@ -157,7 +163,7 @@ fn debug_world(
         })
         .filter(|pos| pos.distance(origin) < 500.)
     {
-        gizmos.cuboid(
+        gizmos.cube(
             Transform::from_translation(pos).with_scale(Vec3::splat(CELL_SIZE)),
             Color::srgba_u8(255, 0, 0, 255),
         );
@@ -181,7 +187,7 @@ fn debug_world(
         })
         .filter(|(center, _)| center.distance(origin) < 500.)
     {
-        gizmos.cuboid(
+        gizmos.cube(
             Transform::from_translation(center).with_scale(scale),
             Color::srgba_u8(255, 255, 0, 255),
         );
@@ -206,7 +212,7 @@ fn debug_pathfinding(
 }
 
 fn add_pathfinding_points(
-    camera: Query<&Transform, (With<FlyCamera>, Without<WireMe>)>,
+    camera: Query<&Transform, (With<FreeCamera>, Without<WireMe>)>,
     mut points: ResMut<PathfindingPoints>,
 ) -> Result<(), BevyError> {
     let origin = camera.single()?.translation.trunc();
@@ -239,8 +245,8 @@ fn add_navmesh_resource(mut commands: Commands, cells: Res<ChunkCells>) {
 
 fn debug_contents(
     mut ray_cast: MeshRayCast,
-    camera: Query<&Transform, (With<FlyCamera>, Without<WorldMesh>)>,
-    world_meshes: Query<&Mesh3d, (With<WorldMesh>, Without<FlyCamera>)>,
+    camera: Query<&Transform, (With<FreeCamera>, Without<WorldMesh>)>,
+    world_meshes: Query<&Mesh3d, (With<WorldMesh>, Without<FreeCamera>)>,
     meshes: Res<Assets<Mesh>>,
     mut text: Query<Entity, With<MeshInfoText>>,
     mut writer: TextUiWriter,

bspeater/src/debug.rs

@@ -0,0 +1,110 @@
+// sligtly modified version of export.rs from https://github.com/mrclputra/bevy_WeaverGen_V3
+
+// saves the model as an obj file
+// by iterating through all the meshes
+
+use bevy::prelude::*;
+use std::fs::File;
+use std::io::{BufWriter, Write};
+use std::path::Path;
+
+use crate::{ProcessingStep, WorldName};
+
+// export all meshes in scene
+pub fn export_obj<'a>(
+    mesh_entities: impl Iterator<Item = &'a Mesh>,
+    filename: &Path,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let file = File::create(filename)?;
+    let mut writer = BufWriter::new(file);
+
+    // OBJ header
+    writeln!(writer, "# Exported from Slum Generator")?;
+    writeln!(writer, "Written by Marcel Putra 2025")?;
+
+    // OBJ format indices start at 1, dont ask why :)
+    let mut vertex_offset = 1;
+    let mut mesh_count = 0;
+
+    // export all mesh entities
+    for mesh in mesh_entities {
+        writeln!(writer, "# Mesh {}", mesh_count)?;
+        writeln!(writer, "o Mesh_{}", mesh_count)?;
+
+        // extract vertices from the mesh
+        if let Some(positions) = mesh.attribute(Mesh::ATTRIBUTE_POSITION)
+            && let bevy::mesh::VertexAttributeValues::Float32x3(vertices) = positions
+        {
+            // write vertices
+            for vertex in vertices {
+                writeln!(writer, "v {} {} {}", vertex[0], vertex[1], vertex[2])?;
+            }
+
+            // write faces using the mesh indices
+            if let Some(indices) = mesh.indices() {
+                match indices {
+                    bevy::mesh::Indices::U16(indices) => {
+                        for chunk in indices.chunks(3) {
+                            if chunk.len() == 3 {
+                                writeln!(
+                                    writer,
+                                    "f {} {} {}",
+                                    vertex_offset + chunk[0] as u32,
+                                    vertex_offset + chunk[1] as u32,
+                                    vertex_offset + chunk[2] as u32
+                                )?;
+                            }
+                        }
+                    }
+                    bevy::mesh::Indices::U32(indices) => {
+                        for chunk in indices.chunks(3) {
+                            if chunk.len() == 3 {
+                                writeln!(
+                                    writer,
+                                    "f {} {} {}",
+                                    vertex_offset + chunk[0],
+                                    vertex_offset + chunk[1],
+                                    vertex_offset + chunk[2]
+                                )?;
+                            }
+                        }
+                    }
+                }
+            }
+
+            vertex_offset += vertices.len() as u32;
+            writeln!(writer)?;
+            mesh_count += 1;
+        }
+    }
+
+    writer.flush()?;
+    bevy::log::info!("Exported {} meshes to {}", mesh_count, filename.display());
+
+    Ok(())
+}
+
+pub fn save_meshes(
+    meshes_assets: Res<Assets<Mesh>>,
+    map_name: Res<WorldName>,
+    mut next_state: ResMut<NextState<ProcessingStep>>,
+) {
+    bevy::log::info!("trying to save meshes");
+
+    match export_obj(
+        meshes_assets.iter().map(|(_, mesh)| mesh),
+        &map_name
+            .output
+            .join(&map_name.map_name)
+            .with_extension("obj"),
+    ) {
+        Err(err) => {
+            bevy::log::error!("coudln't save meshes {err:?}");
+        }
+        Ok(_) => {
+            bevy::log::info!("saved meshes");
+        }
+    }
+
+    next_state.set(ProcessingStep::Exit);
+}

bspeater/src/export.rs

@@ -167,7 +167,7 @@ pub fn geoset_to_meshes(
 
             Some(
                 Mesh::new(
-                    bevy::render::mesh::PrimitiveTopology::TriangleList,
+                    bevy::mesh::PrimitiveTopology::TriangleList,
                     RenderAssetUsages::all(),
                 )
                 .with_inserted_attribute(
@@ -187,7 +187,7 @@ pub fn geoset_to_meshes(
                     vec![ty as u32; pushing_vertices.len()],
                 )
                 .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, pushing_vertices)
-                .with_inserted_indices(bevy::render::mesh::Indices::U32(indices)),
+                .with_inserted_indices(bevy::mesh::Indices::U32(indices)),
             )
         })
         .collect::<Vec<Mesh>>()
@@ -219,7 +219,7 @@ fn brush_to_mesh(
     ];
 
     let transform = Transform::from_translation(brush.origin)
-        .compute_matrix()
+        .to_matrix()
         .inverse()
         .transpose();
     let planes = planes
@@ -273,7 +273,7 @@ fn prop_to_mesh(
             static_prop.angles.z.to_radians(),
         ))
         .with_scale(Vec3::splat(static_prop.scale))
-        .compute_matrix();
+        .to_matrix();
 
     if let Some(model_data) = model_data
         .get(static_prop.model_index as usize)