Tracing and Performance improvements

tracing
chunk rebuild testing
speed up world gen by moving collider creation to thread pool

game/main/Cargo.toml

@@ -14,3 +14,7 @@ noise = "0.8.2"
 world_generation ={path="../../engine/world_generation"}
 bevy_rapier3d = { version = "0.25.0", features = [ "simd-stable", "debug-render-3d","parallel" ] }
 rayon = "1.10.0"
+
+
+[features]
+tracing = ["bevy/trace_tracy", "world_generation/tracing"]

game/main/src/map_rendering/chunk_rebuild.rs

@@ -22,7 +22,8 @@ pub struct ChunkRebuildPlugin;
 impl Plugin for ChunkRebuildPlugin {
 	fn build(&self, app: &mut App) {
 		app.insert_resource(ChunkRebuildQueue::default());
-		app.add_systems(PostUpdate, chunk_rebuilder);
+		app.init_resource::<PhosChunkRegistry>();
+		app.add_systems(PreUpdate, chunk_rebuilder);
 	}
 }
 
@@ -58,17 +59,18 @@ fn chunk_rebuilder(
 		.map(|idx| {
 			let chunk = &heightmap.chunks[*idx];
 			let mesh = generate_chunk_mesh(chunk, &heightmap, cur_painter, &tile_assets, &tile_mappers);
-			let collision = generate_chunk_collider(chunk, &heightmap);
+			let (col_verts, col_indicies) = generate_chunk_collider(chunk, &heightmap);
+			let collider = Collider::trimesh_with_flags(col_verts, col_indicies, TriMeshFlags::MERGE_DUPLICATE_VERTICES);
 			return (
 				mesh,
-				collision,
+				collider,
 				offset_to_world(chunk.chunk_offset * Chunk::SIZE as i32, 0.),
 				hex_utils::offset_to_index(chunk.chunk_offset, heightmap.width),
 			);
 		})
 		.collect();
 
-	for (mesh, (col_verts, col_indicies), pos, index) in chunk_meshes {
+	for (mesh, collider, pos, index) in chunk_meshes {
 		let chunk = commands.spawn((
 			MaterialMeshBundle {
 				mesh: meshes.add(mesh),
@@ -82,7 +84,7 @@ fn chunk_rebuilder(
 				0.,
 				(Chunk::SIZE / 2) as f32 * 1.5,
 			)),
-			Collider::trimesh_with_flags(col_verts, col_indicies, TriMeshFlags::MERGE_DUPLICATE_VERTICES),
+			collider,
 		));
 		chunks.chunks[index] = chunk.id();
 	}

game/main/src/map_rendering/map_init.rs

@@ -1,6 +1,8 @@
-use bevy::{asset::LoadState, log::tracing_subscriber::registry, pbr::ExtendedMaterial, prelude::*};
+#[cfg(feature = "tracing")]
+use bevy::log::*;
+use bevy::{asset::LoadState, pbr::ExtendedMaterial, prelude::*};
 use bevy_inspector_egui::quick::ResourceInspectorPlugin;
-use bevy_rapier3d::geometry::{Collider, TriMeshFlags};
+use bevy_rapier3d::geometry::Collider;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use world_generation::{
 	biome_painter::*,
@@ -20,7 +22,9 @@ use crate::{
 	utlis::render_distance_system::RenderDistanceVisibility,
 };
 
-use super::prelude::CurrentBiomePainter;
+use super::{
+	chunk_rebuild::ChunkRebuildPlugin, prelude::CurrentBiomePainter, terraforming_test::TerraFormingTestPlugin,
+};
 
 pub struct MapInitPlugin;
 
@@ -29,6 +33,8 @@ impl Plugin for MapInitPlugin {
 		app.add_plugins((
 			ResourceInspectorPlugin::<PhosMap>::default(),
 			ResourceInspectorPlugin::<GenerationConfig>::default(),
+			ChunkRebuildPlugin,
+			TerraFormingTestPlugin,
 		));
 
 		app.add_systems(Startup, (load_textures, load_tiles));
@@ -212,11 +218,19 @@ fn spawn_map(
 		.chunks
 		.par_iter()
 		.map(|chunk: &Chunk| {
+			#[cfg(feature = "tracing")]
+			let _gen_mesh = info_span!("Generate Chunk").entered();
 			let mesh = generate_chunk_mesh(chunk, &heightmap, cur_painter, &tile_assets, &tile_mappers);
-			let collision = generate_chunk_collider(chunk, &heightmap);
+			let (col_verts, col_indicies) = generate_chunk_collider(chunk, &heightmap);
+			let collider: Collider;
+			{
+				#[cfg(feature = "tracing")]
+				let _collider_span = info_span!("Create Collider Trimesh").entered();
+				collider = Collider::trimesh(col_verts, col_indicies);
+			}
 			return (
 				mesh,
-				collision,
+				collider,
 				offset_to_world(chunk.chunk_offset * Chunk::SIZE as i32, 0.),
 				hex_utils::offset_to_index(chunk.chunk_offset, heightmap.width),
 			);
@@ -225,23 +239,29 @@ fn spawn_map(
 
 	let mut registry = PhosChunkRegistry::new(chunk_meshes.len());
 
-	for (mesh, (col_verts, col_indicies), pos, index) in chunk_meshes {
-		let chunk = commands.spawn((
-			MaterialMeshBundle {
-				mesh: meshes.add(mesh),
-				material: atlas.chunk_material_handle.clone(),
-				transform: Transform::from_translation(pos),
-				..default()
-			},
-			PhosChunk::new(index),
-			RenderDistanceVisibility::default().with_offset(Vec3::new(
-				(Chunk::SIZE / 2) as f32 * SHORT_DIAGONAL,
-				0.,
-				(Chunk::SIZE / 2) as f32 * 1.5,
-			)),
-			Collider::trimesh_with_flags(col_verts, col_indicies, TriMeshFlags::MERGE_DUPLICATE_VERTICES),
-		));
-		registry.chunks.push(chunk.id());
+	{
+		#[cfg(feature = "tracing")]
+		let _spawn_span = info_span!("Spawn Chunks").entered();
+		let visibility_offset = Vec3::new(
+			(Chunk::SIZE / 2) as f32 * SHORT_DIAGONAL,
+			0.,
+			(Chunk::SIZE / 2) as f32 * 1.5,
+		);
+		for (mesh, collider, pos, index) in chunk_meshes {
+			// let mesh_handle = meshes.a
+			let chunk = commands.spawn((
+				MaterialMeshBundle {
+					mesh: meshes.add(mesh),
+					material: atlas.chunk_material_handle.clone(),
+					transform: Transform::from_translation(pos),
+					..default()
+				},
+				PhosChunk::new(index),
+				RenderDistanceVisibility::default().with_offset(visibility_offset),
+				collider,
+			));
+			registry.chunks.push(chunk.id());
+		}
 	}
 
 	commands.spawn((PbrBundle {

game/main/src/map_rendering/terraforming_test.rs

@@ -1,8 +1,8 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, window::PrimaryWindow};
 use bevy_rapier3d::{pipeline::QueryFilter, plugin::RapierContext};
 use world_generation::{hex_utils::HexCoord, prelude::Map};
 
-use crate::camera_system::components::PhosCamera;
+use crate::{camera_system::components::PhosCamera, prelude::PhosChunkRegistry};
 
 use super::chunk_rebuild::ChunkRebuildQueue;
 
@@ -15,23 +15,52 @@ impl Plugin for TerraFormingTestPlugin {
 }
 
 fn deform(
-	cam: Query<&Transform, With<PhosCamera>>,
-	keyboard: Res<ButtonInput<KeyCode>>,
+	cam_query: Query<(&GlobalTransform, &Camera), With<PhosCamera>>,
+	window: Query<&Window, With<PrimaryWindow>>,
+	keyboard: Res<ButtonInput<MouseButton>>,
 	rapier_context: Res<RapierContext>,
 	mut heightmap: ResMut<Map>,
 	mut rebuild: ResMut<ChunkRebuildQueue>,
+	time: Res<Time>,
 ) {
-	if !keyboard.pressed(KeyCode::KeyF) {
+	if !keyboard.just_pressed(MouseButton::Left) {
 		return;
 	}
 
-	let cam_transform = cam.single();
-	let fwd: Vec3 = cam_transform.forward().into();
+	let win = window.single();
+	let (cam_transform, camera) = cam_query.single();
+	let Some(cursor_pos) = win.cursor_position() else {
+		return;
+	};
 
-	let collision = rapier_context.cast_ray(cam_transform.translation, fwd, 100., true, QueryFilter::only_fixed());
+	let Some(cam_ray) = camera.viewport_to_world(cam_transform, cursor_pos) else {
+		return;
+	};
 
-	if let Some((entity, dist)) = collision {
-		let contact_point = cam_transform.translation + (fwd * dist);
+	let collision = rapier_context.cast_ray(
+		cam_ray.origin,
+		cam_ray.direction.into(),
+		100.,
+		true,
+		QueryFilter::only_fixed(),
+	);
+
+	if let Some((_, dist)) = collision {
+		let contact_point = cam_ray.get_point(dist);
 		let contact_coord = HexCoord::from_world_pos(contact_point);
+		let cur_height = heightmap.sample_height(&contact_coord);
+		heightmap.set_height(&contact_coord, cur_height + 1.);
+		let cur_chunk = contact_coord.to_chunk_index(heightmap.width);
+
+		if contact_coord.is_on_chunk_edge() {
+			let neighbors = contact_coord.get_neighbors();
+			let mut other_chunks: Vec<_> = neighbors
+				.iter()
+				.map(|c| c.to_chunk_index(heightmap.width))
+				.filter(|c| c != &cur_chunk)
+				.collect();
+			rebuild.queue.append(&mut other_chunks);
+		}
+		rebuild.queue.push(cur_chunk);
 	}
 }

game/main/src/phos.rs

@@ -26,7 +26,6 @@ impl Plugin for PhosGamePlugin {
 			MapInitPlugin,
 			MaterialPlugin::<ExtendedMaterial<StandardMaterial, ChunkMaterial>>::default(),
 			RenderDistancePlugin,
-			ChunkRebuildPlugin,
 		));
 
 		//Systems - Startup