optimize chunk meshing data

game/main/src/map_rendering/chunk_rebuild.rs

@@ -35,33 +35,31 @@ fn chunk_rebuilder(
 ) {
 	let pool = AsyncComputeTaskPool::get();
 
-	for (chunk, idx) in &chunk_query {
+	for (chunk_entity, idx) in &chunk_query {
 		#[cfg(feature = "tracing")]
 		let _spawn_span = info_span!("Rebuild Chunk").entered();
-		let map: Map;
-		{
-			let _clone_span = info_span!("Clone").entered();
-			map = heightmap.clone();
-		}
+
 		let chunk_index = idx.index;
+		let chunk_data = heightmap.get_chunk_mesh_data(chunk_index);
+		let chunk_offset = heightmap.chunks[chunk_index].chunk_offset;
 		let task = pool.spawn(async move {
 			#[cfg(feature = "tracing")]
 			let _spawn_span = info_span!("Rebuild Task").entered();
 			let mut queue = CommandQueue::default();
-			let (mesh, collider_data, _, _) = prepare_chunk_mesh(&map.chunks[chunk_index], &map);
+			let (mesh, collider_data, _, _) = prepare_chunk_mesh(&chunk_data, chunk_offset, chunk_index);
 			let c = Collider::trimesh_with_flags(
 				collider_data.0,
 				collider_data.1,
 				TriMeshFlags::DELETE_DUPLICATE_TRIANGLES,
 			);
 			queue.push(move |world: &mut World| {
-				world.entity_mut(chunk).insert(c).remove::<ChunkRebuildTask>();
+				world.entity_mut(chunk_entity).insert(c).remove::<ChunkRebuildTask>();
 			});
 
 			return (queue, mesh);
 		});
 		commands
-			.entity(chunk)
+			.entity(chunk_entity)
 			.insert(ChunkRebuildTask { task })
 			.remove::<RebuildChunk>();
 	}

game/main/src/map_rendering/map_init.rs

@@ -4,7 +4,11 @@ use bevy::{asset::LoadState, pbr::ExtendedMaterial, prelude::*};
 use bevy_inspector_egui::quick::ResourceInspectorPlugin;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use world_generation::{
-	biome_painter::*, heightmap::generate_heightmap, hex_utils::SHORT_DIAGONAL, prelude::*, tile_manager::*,
+	biome_painter::*,
+	heightmap::generate_heightmap,
+	hex_utils::{offset_to_index, SHORT_DIAGONAL},
+	prelude::*,
+	tile_manager::*,
 	tile_mapper::*,
 };
 
@@ -214,7 +218,8 @@ fn spawn_map(
 		.chunks
 		.par_iter()
 		.map(|chunk: &Chunk| {
-			return prepare_chunk_mesh_with_collider(chunk, &heightmap);
+			let index = offset_to_index(chunk.chunk_offset, heightmap.width);
+			return prepare_chunk_mesh_with_collider(&heightmap.get_chunk_mesh_data(index), chunk.chunk_offset, index);
 		})
 		.collect();
 

game/main/src/utlis/chunk_utils.rs

@@ -1,6 +1,11 @@
 #[cfg(feature = "tracing")]
 use bevy::log::*;
-use bevy::{asset::Assets, ecs::system::Res, math::Vec3, render::mesh::Mesh};
+use bevy::{
+	asset::Assets,
+	ecs::system::Res,
+	math::{IVec2, Vec3},
+	render::mesh::Mesh,
+};
 use bevy_rapier3d::geometry::{Collider, TriMeshFlags};
 use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
 use world_generation::{
@@ -8,7 +13,7 @@ use world_generation::{
 	chunk_colliders::generate_chunk_collider,
 	hex_utils::{offset_to_index, offset_to_world},
 	mesh_generator::generate_chunk_mesh,
-	prelude::{Chunk, Map},
+	prelude::{Chunk, Map, MeshChunkData},
 	tile_manager::TileAsset,
 	tile_mapper::TileMapperAsset,
 };
@@ -44,22 +49,30 @@ pub fn paint_chunk(
 	}
 }
 
-pub fn prepare_chunk_mesh(chunk: &Chunk, heightmap: &Map) -> (Mesh, (Vec<Vec3>, Vec<[u32; 3]>), Vec3, usize) {
+pub fn prepare_chunk_mesh(
+	chunk: &MeshChunkData,
+	chunk_offset: IVec2,
+	chunk_index: usize,
+) -> (Mesh, (Vec<Vec3>, Vec<[u32; 3]>), Vec3, usize) {
 	#[cfg(feature = "tracing")]
 	let _gen_mesh = info_span!("Generate Chunk").entered();
-	let mesh = generate_chunk_mesh(chunk, &heightmap);
-	let col_data = generate_chunk_collider(chunk, &heightmap);
+	let mesh = generate_chunk_mesh(chunk);
+	let col_data = generate_chunk_collider(chunk);
 
 	return (
 		mesh,
 		col_data,
-		offset_to_world(chunk.chunk_offset * Chunk::SIZE as i32, 0.),
-		offset_to_index(chunk.chunk_offset, heightmap.width),
+		offset_to_world(chunk_offset * Chunk::SIZE as i32, 0.),
+		chunk_index,
 	);
 }
 
-pub fn prepare_chunk_mesh_with_collider(chunk: &Chunk, heightmap: &Map) -> (Mesh, Collider, Vec3, usize) {
-	let (mesh, (col_verts, col_indicies), pos, index) = prepare_chunk_mesh(chunk, heightmap);
+pub fn prepare_chunk_mesh_with_collider(
+	chunk: &MeshChunkData,
+	chunk_offset: IVec2,
+	chunk_index: usize,
+) -> (Mesh, Collider, Vec3, usize) {
+	let (mesh, (col_verts, col_indicies), pos, index) = prepare_chunk_mesh(chunk, chunk_offset, chunk_index);
 	let collider: Collider;
 	{
 		#[cfg(feature = "tracing")]