update to bevy 0.16.0

Need to wait for asset_loader upate full release
Need to refactor Prefab system to use the new relationships

.vscode/launch.json

@@ -14,12 +14,17 @@
 			"args": [],
 			"cwd": "${workspaceRoot}/game/main",
 			"preLaunchTask": "Build",
-			// "environment": [
-			// 	{
-			// 		"name": "RUST_BACKTRACE",
-			// 		"value": "1"
-			// 	}
-			// ]
+			"environment": [
+				// {
+				// 	"name": "RUST_BACKTRACE",
+				// 	"value": "1"
+				// },
+				{
+					//Set Asset Folder
+					"name": "CARGO_MANIFEST_DIR",
+					"value": "${workspaceRoot}\\game\\main"
+				}
+			]
 		}
 	]
 }

Cargo.toml

@@ -5,7 +5,7 @@ members = [
 	"game/buildings",
 	"game/shared",
     "engine/world_generation",
-	"engine/asset_loader", "game/buildings", "game/shared", "game/units", "engine/data"]
+	"engine/asset_loader", "game/buildings", "game/shared", "game/units", "engine/data", "game/resources", "engine/asset_loader_proc"]
 
 # Enable a small amount of optimization in debug mode
 [profile.dev]

engine/asset_loader/Cargo.toml

@@ -3,10 +3,11 @@ name = "asset_loader"
 version = "0.1.0"
 edition = "2021"
 
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 serde = "1.0.204"
 serde_json = "1.0.120"
-bevy = "0.14.0"
+bevy = "0.16.0"
 ron = "0.8.1"

engine/asset_loader/src/lib.rs

@@ -1,69 +1 @@
-pub mod macros {
-
-	#[macro_export]
-	macro_rules! create_asset_loader {
-		(
-			$plugin_name: ident,
-			$loader_name: ident,
-			$asset_type: ident,
-			$extensions: expr,
-			$($string_name: ident -> $handle_name: ident)* ;
-			$($string_array_name: ident -> $handle_array_name: ident)* ?
-		) => {
-			use bevy::prelude::*;
-			use bevy::asset::{AssetLoader, AssetEvent, AssetEvents, LoadContext, LoadState, AsyncReadExt, io::Reader};
-			use bevy::utils::BoxedFuture;
-			pub struct $plugin_name;
-			impl Plugin for $plugin_name {
-				fn build(&self, app: &mut App) {
-					app.init_asset::<$asset_type>()
-						.init_asset_loader::<$loader_name>();
-				}
-			}
-
-			#[derive(Default)]
-			pub struct $loader_name;
-
-			impl AssetLoader for $loader_name {
-				type Asset = $asset_type;
-
-				type Settings = ();
-
-				type Error = String;
-
-				async fn load<'a>(
-					&'a self,
-					reader: &'a mut Reader<'_>,
-					_settings: &'a Self::Settings,
-					load_context: &'a mut LoadContext<'_>,
-				) -> Result<Self::Asset, Self::Error> {
-					let mut bytes = Vec::new();
-					let read_result = reader.read_to_end(&mut bytes).await;
-					if read_result.is_err() {
-						return Err(read_result.err().unwrap().to_string());
-					}
-					let serialized: Result<Self::Asset, _> =
-						ron::de::from_bytes::<Self::Asset>(&bytes);
-					if serialized.is_err() {
-						return Err(serialized.err().unwrap().to_string());
-					}
-					let mut asset = serialized.unwrap();
-					$(
-
-						asset.$handle_name = load_context.load(&asset.$string_name);
-					)*
-					$(
-						for i in 0..asset.$string_array_name.len(){
-							asset.$handle_array_name.push(load_context.load(&asset.$string_array_name[i]));
-						}
-					)?
-					return Ok(asset);
-				}
-
-				fn extensions(&self) -> &[&str] {
-					$extensions
-				}
-			}
-		};
-	}
-}
+pub mod macros;

engine/asset_loader/src/macros.rs

@@ -0,0 +1,65 @@
+#[macro_export]
+macro_rules! create_asset_loader {
+	(
+		$plugin_name: ident,
+		$loader_name: ident,
+		$asset_type: ident,
+		$extensions: expr,
+		$($string_name: ident -> $handle_name: ident)* ;
+		$($string_array_name: ident -> $handle_array_name: ident)* ?
+	) => {
+		use bevy::prelude::*;
+		use bevy::asset::{AssetLoader, AssetEvent, AssetEvents, LoadContext, LoadState, AsyncReadExt, io::Reader};
+		pub struct $plugin_name;
+		impl Plugin for $plugin_name {
+			fn build(&self, app: &mut App) {
+				app.init_asset::<$asset_type>()
+					.init_asset_loader::<$loader_name>();
+			}
+		}
+
+		#[derive(Default)]
+		pub struct $loader_name;
+
+		impl AssetLoader for $loader_name {
+			type Asset = $asset_type;
+
+			type Settings = ();
+
+			type Error = String;
+
+			async fn load(
+		        &self,
+				reader: & mut dyn bevy::asset::io::Reader,
+				_: &Self::Settings,
+				load_context: &mut LoadContext<'_>,
+		    ) -> Result<Self::Asset, Self::Error> {
+				let mut bytes = Vec::new();
+				let read_result = reader.read_to_end(&mut bytes).await;
+				if read_result.is_err() {
+					return Err(read_result.err().unwrap().to_string());
+				}
+				let serialized: Result<Self::Asset, _> =
+					ron::de::from_bytes::<Self::Asset>(&bytes);
+				if serialized.is_err() {
+					return Err(serialized.err().unwrap().to_string());
+				}
+				let mut asset = serialized.unwrap();
+				$(
+
+					asset.$handle_name = load_context.load(&asset.$string_name);
+				)*
+				$(
+					for i in 0..asset.$string_array_name.len(){
+						asset.$handle_array_name.push(load_context.load(&asset.$string_array_name[i]));
+					}
+				)?
+				return Ok(asset);
+			}
+
+			fn extensions(&self) -> &[&str] {
+				$extensions
+			}
+		}
+	};
+}

engine/asset_loader_proc/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "asset_loader_proc"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+serde = "1.0.204"
+serde_json = "1.0.120"
+bevy = "0.16.0"
+ron = "0.8.1"

engine/asset_loader_proc/src/lib.rs

@@ -0,0 +1 @@
+  

engine/world_generation/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.14.0"
+bevy = "0.16.0"
 noise = "0.9.0"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.115"
 asset_loader = { path = "../asset_loader" }
 rayon = "1.10.0"
-bevy-inspector-egui = "0.25.0"
-bevy_asset_loader = { version = "0.21.0", features = [
+bevy-inspector-egui = "0.28.1"
+bevy_asset_loader = { version = "0.23.0-rc.3", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }

engine/world_generation/src/consts.rs

@@ -16,6 +16,21 @@ pub const HEX_CORNERS: [Vec3; 6] = [
 	Vec3::new(-INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
 ];
 
+pub const WATER_HEX_CORNERS: [Vec3; 12] = [
+	Vec3::new(0., 0., OUTER_RADIUS),
+	Vec3::new(INNER_RADIUS / 2.0, 0., 0.75 * OUTER_RADIUS),
+	Vec3::new(INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
+	Vec3::new(INNER_RADIUS, 0., 0.),
+	Vec3::new(INNER_RADIUS, 0., -0.5 * OUTER_RADIUS),
+	Vec3::new(INNER_RADIUS / 2.0, 0., -0.75 * OUTER_RADIUS),
+	Vec3::new(0., 0., -OUTER_RADIUS),
+	Vec3::new(-INNER_RADIUS / 2.0, 0., -0.75 * OUTER_RADIUS),
+	Vec3::new(-INNER_RADIUS, 0., -0.5 * OUTER_RADIUS),
+	Vec3::new(-INNER_RADIUS, 0., 0.),
+	Vec3::new(-INNER_RADIUS, 0., 0.5 * OUTER_RADIUS),
+	Vec3::new(-INNER_RADIUS / 2.0, 0., 0.75 * OUTER_RADIUS),
+];
+
 pub const HEX_NORMALS: [Vec3; 6] = [
 	Vec3::new(INNER_RADIUS / 2., 0., (OUTER_RADIUS + 0.5 * OUTER_RADIUS) / 2.),
 	Vec3::Z,
@@ -26,9 +41,9 @@ pub const HEX_NORMALS: [Vec3; 6] = [
 ];
 
 pub const ATTRIBUTE_PACKED_VERTEX_DATA: MeshVertexAttribute =
-	MeshVertexAttribute::new("PackedVertexData", 988540817, VertexFormat::Uint32);
+	MeshVertexAttribute::new("PackedVertexData", 7, VertexFormat::Uint32);
 pub const ATTRIBUTE_VERTEX_HEIGHT: MeshVertexAttribute =
-	MeshVertexAttribute::new("VertexHeight", 988540717, VertexFormat::Float32);
+	MeshVertexAttribute::new("VertexHeight", 8, VertexFormat::Float32);
 
 pub const ATTRIBUTE_TEXTURE_INDEX: MeshVertexAttribute =
 	MeshVertexAttribute::new("TextureIndex", 988540917, VertexFormat::Uint32);

engine/world_generation/src/generators/mesh_generator.rs

@@ -94,6 +94,148 @@ fn create_tile(
 	}
 }
 
+pub fn generate_chunk_water_mesh(chunk: &MeshChunkData, sealevel: f32, map_width: usize, map_height: usize) -> Mesh {
+	#[cfg(feature = "tracing")]
+	let _gen_mesh = info_span!("Generate Water Surface Mesh").entered();
+	let vertex_count: usize = Chunk::SIZE * Chunk::SIZE * 7;
+	let mut verts = Vec::with_capacity(vertex_count);
+	let mut uvs = Vec::with_capacity(vertex_count);
+	let mut indices = Vec::with_capacity(vertex_count);
+	let mut normals = Vec::with_capacity(vertex_count);
+
+	for z in 0..Chunk::SIZE {
+		for x in 0..Chunk::SIZE {
+			let idx = x + z * Chunk::SIZE;
+			let height = chunk.heights[idx];
+			if height > sealevel {
+				continue;
+			}
+			let off_pos = Vec3::new(x as f32, sealevel, z as f32);
+			let tile_pos = offset3d_to_world(off_pos);
+			let coord = HexCoord::from_grid_pos(x, z);
+			let (n, neighbor_has_land) = chunk.get_neighbors_with_water_info(&coord);
+
+			create_tile_water_surface(
+				tile_pos,
+				chunk.distance_to_land[idx],
+				&n,
+				neighbor_has_land,
+				&mut verts,
+				&mut uvs,
+				&mut indices,
+				&mut normals,
+			);
+		}
+	}
+	let mesh = Mesh::new(
+		PrimitiveTopology::TriangleList,
+		RenderAssetUsages::MAIN_WORLD | RenderAssetUsages::RENDER_WORLD,
+	)
+	.with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, verts)
+	.with_inserted_attribute(Mesh::ATTRIBUTE_UV_0, uvs)
+	.with_inserted_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
+	.with_inserted_indices(Indices::U32(indices));
+	return mesh;
+}
+
+fn create_tile_water_surface(
+	pos: Vec3,
+	dist_to_land: f32,
+	neighbors: &[(f32, Option<f32>); 6],
+	neighbor_has_land: bool,
+	verts: &mut Vec<Vec3>,
+	uvs: &mut Vec<Vec2>,
+	indices: &mut Vec<u32>,
+	normals: &mut Vec<Vec3>,
+) {
+	if !neighbor_has_land {
+		crate_tile_water_inner_surface(pos, dist_to_land, neighbors, verts, uvs, indices, normals);
+		return;
+	}
+	crate_tile_water_shore_surface(pos, dist_to_land, neighbors, verts, uvs, indices, normals);
+}
+
+fn crate_tile_water_inner_surface(
+	pos: Vec3,
+	dist_to_land: f32,
+	neighbors: &[(f32, Option<f32>); 6],
+	verts: &mut Vec<Vec3>,
+	uvs: &mut Vec<Vec2>,
+	indices: &mut Vec<u32>,
+	normals: &mut Vec<Vec3>,
+) {
+	//todo: share verts
+	let idx = verts.len() as u32;
+	for i in 0..6 {
+		let p = pos + HEX_CORNERS[i];
+		verts.push(p);
+		let n1 = if let Some(v) = neighbors[i].1 { v } else { dist_to_land };
+		let n2 = if let Some(v) = neighbors[(i + 5) % 6].1 {
+			v
+		} else {
+			dist_to_land
+		};
+		let d = (n1 + n2 + dist_to_land) / 3.0;
+		uvs.push(Vec2::new(0.0, d.remap(0., 4., 1.0, 0.0)));
+		normals.push(Vec3::Y);
+	}
+	for i in 0..3 {
+		let off = i * 2;
+		indices.push(off + idx);
+		indices.push(((off + 1) % 6) + idx);
+		indices.push(((off + 2) % 6) + idx);
+	}
+	indices.push(idx);
+	indices.push(idx + 2);
+	indices.push(idx + 4);
+}
+
+fn crate_tile_water_shore_surface(
+	pos: Vec3,
+	dist_to_land: f32,
+	neighbors: &[(f32, Option<f32>); 6],
+	verts: &mut Vec<Vec3>,
+	uvs: &mut Vec<Vec2>,
+	indices: &mut Vec<u32>,
+	normals: &mut Vec<Vec3>,
+) {
+	let idx = verts.len() as u32;
+	//todo: only use triangle fan when on shoreline
+	verts.push(pos);
+	uvs.push(Vec2::new(0.0, dist_to_land.remap(0., 4., 1.0, 0.0)));
+	normals.push(Vec3::Y);
+	for i in 0..12 {
+		let p = pos + WATER_HEX_CORNERS[i];
+		verts.push(p);
+		let ni = i / 2;
+		let n = neighbors[ni];
+		let nn = neighbors[(ni + 5) % 6];
+		let mut uv = Vec2::new(0.0, dist_to_land.remap(0., 4., 1.0, 0.0));
+
+		if nn.0 > pos.y || n.0 > pos.y {
+			uv.x = 1.0;
+		}
+		if ni * 2 != i {
+			if n.0 <= pos.y {
+				uv.x = 0.0;
+			}
+			let d = if let Some(v) = n.1 { v } else { dist_to_land };
+			uv.y = ((d + dist_to_land) / 2.0).remap(0., 4., 1.0, 0.0);
+		} else {
+			let d = if let Some(v) = n.1 { v } else { dist_to_land };
+			let d2 = if let Some(v) = nn.1 { v } else { dist_to_land };
+			uv.y = ((d + d2 + dist_to_land) / 3.0).remap(0., 4., 1.0, 0.0);
+		}
+
+		indices.push(idx);
+		indices.push(idx + 1 + i as u32);
+		indices.push(idx + 1 + ((i as u32 + 1) % 12));
+
+		uvs.push(uv);
+		normals.push(Vec3::Y);
+	}
+}
+
 fn create_tile_wall(
 	pos: Vec3,
 	dir: usize,

engine/world_generation/src/generators/packed_mesh_generator.rs

@@ -1,9 +1,5 @@
-use crate::hex_utils::HexCoord;
-use crate::map::biome_map::{self, BiomeChunk, BiomeMap};
+use crate::hex_utils::{offset3d_to_world, HexCoord};
 use crate::prelude::*;
-use crate::tile_manager::TileAsset;
-use crate::tile_mapper::TileMapperAsset;
-use crate::{biome_asset::BiomeAsset, biome_painter::BiomePainterAsset};
 use bevy::{
 	prelude::*,
 	render::{
@@ -12,15 +8,7 @@ use bevy::{
 	},
 };
 
-pub fn generate_packed_chunk_mesh(
-	chunk: &Chunk,
-	map: &Map,
-	biome_chunk: &BiomeChunk,
-	painter: &BiomePainterAsset,
-	tiles: &Res<Assets<TileAsset>>,
-	biomes: &Res<Assets<BiomeAsset>>,
-	mappers: &Res<Assets<TileMapperAsset>>,
-) -> Mesh {
+pub fn generate_packed_chunk_mesh(chunk: &MeshChunkData) -> Mesh {
 	let vertex_count: usize = Chunk::SIZE * Chunk::SIZE * 6;
 	let mut packed_data = Vec::with_capacity(vertex_count);
 	let mut indices = Vec::with_capacity(vertex_count);
@@ -28,16 +16,10 @@ pub fn generate_packed_chunk_mesh(
 
 	for z in 0..Chunk::SIZE {
 		for x in 0..Chunk::SIZE {
-			let height = chunk.heights[x + z * Chunk::SIZE];
-			let data = biome_chunk.data[x + z * Chunk::SIZE];
-			let coord =
-				HexCoord::from_offset(IVec2::new(x as i32, z as i32) + (chunk.chunk_offset * Chunk::SIZE as i32));
-			let n = map.get_neighbors(&coord);
-			let biome = biomes.get(painter.sample_biome(biomes, &data)).unwrap();
-
-			let mapper = mappers.get(biome.tile_mapper.id());
-			let tile_handle = mapper.unwrap().sample_tile(height);
-			let tile = tiles.get(tile_handle).unwrap();
+			let idx = x + z * Chunk::SIZE;
+			let height = chunk.heights[idx];
+			let coord = HexCoord::from_grid_pos(x, z);
+			let n = chunk.get_neighbors(&coord);
 
 			create_packed_tile(
 				UVec2::new(x as u32, z as u32),
@@ -46,8 +28,8 @@ pub fn generate_packed_chunk_mesh(
 				&mut packed_data,
 				&mut indices,
 				&mut heights,
-				tile.texture_id,
-				tile.side_texture_id,
+				chunk.textures[idx][0],
+				chunk.textures[idx][1],
 			);
 		}
 	}
@@ -65,7 +47,7 @@ pub fn generate_packed_chunk_mesh(
 fn create_packed_tile(
 	offset: UVec2,
 	height: f32,
-	neighbors: &[Option<f32>; 6],
+	neighbors: &[f32; 6],
 	packed_data: &mut Vec<u32>,
 	indices: &mut Vec<u32>,
 	heights: &mut Vec<f32>,
@@ -85,23 +67,18 @@ fn create_packed_tile(
 	}
 
 	for i in 0..neighbors.len() {
-		let cur_n = neighbors[i];
-		match cur_n {
-			Some(n_height) => {
-				if n_height < height {
-					create_packed_tile_wall(
-						offset,
-						height,
-						n_height,
-						i,
-						packed_data,
-						indices,
-						heights,
-						side_texture_index,
-					);
-				}
-			}
-			_ => {}
+		let n_height = neighbors[i];
+		if n_height < height {
+			create_packed_tile_wall(
+				offset,
+				height,
+				n_height,
+				i,
+				packed_data,
+				indices,
+				heights,
+				side_texture_index,
+			);
 		}
 	}
 }

engine/world_generation/src/heightmap.rs

@@ -8,7 +8,7 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator};
 
 use crate::biome_painter::BiomePainter;
 use crate::map::biome_map::{BiomeChunk, BiomeData, BiomeMap};
-use crate::{map, prelude::*};
+use crate::prelude::*;
 
 pub fn generate_heightmap(cfg: &GenerationConfig, seed: u32, painter: &BiomePainter) -> (Map, BiomeMap) {
 	let biomes = generate_biomes(cfg, seed, painter);
@@ -39,7 +39,7 @@ pub fn generate_heightmap(cfg: &GenerationConfig, seed: u32, painter: &BiomePain
 			chunks,
 			height: cfg.size.y as usize,
 			width: cfg.size.x as usize,
-			sea_level: cfg.sea_level as f32,
+			sealevel: cfg.sea_level as f32,
 			min_level: min,
 			max_level: max,
 			biome_count: painter.biomes.len(),

engine/world_generation/src/hex_utils.rs

@@ -1,4 +1,3 @@
-use num::{PrimInt, Saturating};
 use std::fmt::Display;
 
 use crate::prelude::Chunk;
@@ -56,11 +55,11 @@ pub fn tile_to_world_distance(dist: u32) -> f32 {
 	return dist as f32 * (2. * INNER_RADIUS);
 }
 
-pub fn get_tile_count(radius: usize) -> usize {
+pub fn get_tile_count_in_range(radius: usize) -> usize {
 	return 1 + 3 * (radius + 1) * radius;
 }
 
-#[derive(Default, Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[derive(Default, Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub struct HexCoord {
 	pub hex: IVec3,
 }
@@ -240,7 +239,7 @@ impl HexCoord {
 
 	pub fn hex_select(&self, radius: usize, include_center: bool) -> Vec<HexCoord> {
 		assert!(radius != 0, "Radius cannot be zero");
-		let mut result = Vec::with_capacity(get_tile_count(radius));
+		let mut result = Vec::with_capacity(get_tile_count_in_range(radius));
 
 		if include_center {
 			result.push(*self);
@@ -267,7 +266,7 @@ impl HexCoord {
 		width: usize,
 	) -> Vec<HexCoord> {
 		assert!(radius != 0, "Radius cannot be zero");
-		let mut result = Vec::with_capacity(get_tile_count(radius));
+		let mut result = Vec::with_capacity(get_tile_count_in_range(radius));
 
 		if include_center {
 			if self.is_in_bounds(height, width) {
@@ -296,10 +295,10 @@ impl HexCoord {
 
 		let mut p = self.scale(4, radius);
 
-		if radius == 1 {
-			result.push(*self);
-			return result;
-		}
+		// if radius == 1 {
+		// 	result.push(*self);
+		// 	return result;
+		// }
 
 		for i in 0..6 {
 			for _j in 0..radius {

engine/world_generation/src/map/chunk.rs

@@ -1,7 +1,6 @@
 use crate::hex_utils::SHORT_DIAGONAL;
 use bevy::prelude::*;
 
-use super::biome_map::BiomeData;
 
 #[derive(Clone)]
 pub struct Chunk {

engine/world_generation/src/map/config.rs

@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use bevy_asset_loader::asset_collection::AssetCollection;
 use bevy_inspector_egui::InspectorOptions;
 use serde::{Deserialize, Serialize};
 

engine/world_generation/src/map/map.rs

@@ -3,7 +3,6 @@ use bevy::prelude::*;
 use crate::hex_utils::*;
 
 use super::{
-	biome_map::{BiomeData, BiomeMap},
 	chunk::Chunk,
 	mesh_chunk::MeshChunkData,
 };
@@ -13,13 +12,25 @@ pub struct Map {
 	pub chunks: Vec<Chunk>,
 	pub height: usize,
 	pub width: usize,
-	pub sea_level: f32,
+	pub sealevel: f32,
 	pub min_level: f32,
 	pub max_level: f32,
 	pub biome_count: usize,
 }
 
 impl Map {
+	pub fn get_tile_count(&self) -> usize {
+		return self.get_tile_width() * self.get_tile_height();
+	}
+
+	pub fn get_tile_width(&self) -> usize {
+		return self.width * Chunk::SIZE;
+	}
+
+	pub fn get_tile_height(&self) -> usize {
+		return self.height * Chunk::SIZE;
+	}
+
 	pub fn get_chunk_mesh_data(&self, chunk_index: usize) -> MeshChunkData {
 		#[cfg(feature = "tracing")]
 		let _spawn_span = info_span!("Chunk Mesh Data").entered();
@@ -27,11 +38,50 @@ impl Map {
 
 		return MeshChunkData {
 			min_height: self.min_level,
+			sealevel: self.sealevel,
 			heights: chunk.heights.clone(),
 			textures: chunk.textures.clone(),
+			distance_to_land: self.get_distance_from_land(chunk.chunk_offset, 4),
 		};
 	}
 
+	fn get_distance_from_land(&self, chunk_offset: IVec2, range: usize) -> [f32; Chunk::AREA] {
+		#[cfg(feature = "tracing")]
+		let _spawn_span = info_span!("Chunk Land Dist Data").entered();
+		let mut dists = [0.0; Chunk::AREA];
+		let cx = chunk_offset.x as usize * Chunk::SIZE;
+		let cz = chunk_offset.y as usize * Chunk::SIZE;
+		for z in 0..Chunk::SIZE {
+			for x in 0..Chunk::SIZE {
+				let coord = HexCoord::from_grid_pos(x + cx, z + cz);
+				let index = coord.to_chunk_local_index();
+
+				if !self.is_in_bounds(&coord) {
+					warn!("Coord is not in bounds!?");
+				}
+
+				//Current tile is land tile
+				if self.sample_height(&coord) > self.sealevel {
+					dists[index] = 0.0;
+					continue;
+				}
+
+				//Find closest land tile
+				if let Some(d) = self.hex_select_first(&coord, range, false, |_t, h, r| {
+					if h > self.sealevel {
+						return Some(r as f32);
+					}
+					return None;
+				}) {
+					dists[index] = d;
+				} else {
+					dists[index] = range as f32;
+				}
+			}
+		}
+		return dists;
+	}
+
 	pub fn get_neighbors(&self, pos: &HexCoord) -> [Option<f32>; 6] {
 		let mut results: [Option<f32>; 6] = [None; 6];
 		let w = self.width * Chunk::SIZE;
@@ -83,52 +133,19 @@ impl Map {
 		let chunk = &self.chunks[pos.to_chunk_index(self.width)];
 		return chunk.biome_id[pos.to_chunk_local_index()];
 	}
-	/*
-	pub fn get_biome_noise(&self, pos: &HexCoord) -> &BiomeData {
-		assert!(
-			self.is_in_bounds(pos),
-			"The provided coordinate is not within the map bounds"
-		);
-
-		let chunk = &self.chunks[pos.to_chunk_index(self.width)];
-		return &chunk.biome_data[pos.to_chunk_local_index()];
-	}
-
-	pub fn get_moisture(&self, pos: &HexCoord) -> f32 {
-		assert!(
-			self.is_in_bounds(pos),
-			"The provided coordinate is not within the map bounds"
-		);
-
-		let chunk = &self.chunks[pos.to_chunk_index(self.width)];
-		return chunk.biome_data[pos.to_chunk_local_index()].moisture;
-	}
-
-	pub fn get_tempurature(&self, pos: &HexCoord) -> f32 {
-		assert!(
-			self.is_in_bounds(pos),
-			"The provided coordinate is not within the map bounds"
-		);
-
-		let chunk = &self.chunks[pos.to_chunk_index(self.width)];
-		return chunk.biome_data[pos.to_chunk_local_index()].temperature;
-	}
-
-	pub fn get_continentality(&self, pos: &HexCoord) -> f32 {
-		assert!(
-			self.is_in_bounds(pos),
-			"The provided coordinate is not within the map bounds"
-		);
-
-		let chunk = &self.chunks[pos.to_chunk_index(self.width)];
-		return chunk.biome_data[pos.to_chunk_local_index()].continentality;
-	}
-	*/
 
 	pub fn get_center(&self) -> Vec3 {
 		let w = self.get_world_width();
 		let h = self.get_world_height();
-		return Vec3::new(w / 2., self.sea_level, h / 2.);
+		return Vec3::new(w / 2., self.sealevel, h / 2.);
+	}
+
+	pub fn get_center_with_height(&self) -> Vec3 {
+		let w = self.get_world_width();
+		let h = self.get_world_height();
+		let mut pos = Vec3::new(w / 2., self.sealevel, h / 2.);
+		pos.y = self.sample_height(&HexCoord::from_world_pos(pos));
+		return pos;
 	}
 
 	pub fn get_world_width(&self) -> f32 {
@@ -168,9 +185,9 @@ impl Map {
 		assert!(radius != 0, "Radius cannot be zero");
 
 		let mut result = if include_center {
-			Vec::with_capacity(get_tile_count(radius) + 1)
+			Vec::with_capacity(get_tile_count_in_range(radius) + 1)
 		} else {
-			Vec::with_capacity(get_tile_count(radius))
+			Vec::with_capacity(get_tile_count_in_range(radius))
 		};
 		if include_center {
 			let h = self.sample_height(&center);
@@ -193,6 +210,80 @@ impl Map {
 		return result;
 	}
 
+	pub fn hex_select_first<OP, Ret>(
+		&self,
+		center: &HexCoord,
+		radius: usize,
+		include_center: bool,
+		op: OP,
+	) -> Option<Ret>
+	where
+		OP: (Fn(&HexCoord, f32, usize) -> Option<Ret>) + Sync + Send,
+	{
+		assert!(radius != 0, "Radius cannot be zero");
+
+		if include_center {
+			let h = self.sample_height(&center);
+			let r = (op)(center, h, 0);
+			if r.is_some() {
+				return r;
+			}
+		}
+
+		for k in 0..(radius + 1) {
+			let mut p = center.scale(4, k);
+			for i in 0..6 {
+				for _j in 0..k {
+					p = p.get_neighbor(i);
+					if self.is_in_bounds(&p) {
+						let h = self.sample_height(&p);
+						let r = (op)(&p, h, k);
+						if r.is_some() {
+							return r;
+						}
+					}
+				}
+			}
+		}
+
+		return None;
+	}
+
+	pub fn ring_select_first<OP, Ret>(
+		&self,
+		center: &HexCoord,
+		start_radius: usize,
+		end_radius: usize,
+		op: OP,
+	) -> Option<Ret>
+	where
+		OP: (Fn(&HexCoord, f32, usize) -> Option<Ret>) + Sync + Send,
+	{
+		assert!(start_radius != 0, "Start radius cannot be zero");
+		assert!(
+			start_radius > end_radius,
+			"Start radius cannot be lower than end radius"
+		);
+
+		for k in start_radius..(end_radius + 1) {
+			let mut p = center.scale(4, k);
+			for i in 0..6 {
+				for _j in 0..k {
+					p = p.get_neighbor(i);
+					if self.is_in_bounds(&p) {
+						let h = self.sample_height(&p);
+						let r = (op)(&p, h, k);
+						if r.is_some() {
+							return r;
+						}
+					}
+				}
+			}
+		}
+
+		return None;
+	}
+
 	pub fn hex_select_mut<OP, Ret>(
 		&mut self,
 		center: &HexCoord,
@@ -206,9 +297,9 @@ impl Map {
 		assert!(radius != 0, "Radius cannot be zero");
 
 		let mut result = if include_center {
-			Vec::with_capacity(get_tile_count(radius) + 1)
+			Vec::with_capacity(get_tile_count_in_range(radius) + 1)
 		} else {
-			Vec::with_capacity(get_tile_count(radius))
+			Vec::with_capacity(get_tile_count_in_range(radius))
 		};
 		if include_center {
 			let h = self.sample_height_mut(&center);

engine/world_generation/src/map/map_utils.rs

@@ -1,16 +1,12 @@
 use std::ops::Add;
 
-use bevy::{math::VectorSpace, prelude::*};
+use bevy::{asset::AssetLoader, math::VectorSpace, prelude::*};
 use image::ImageBuffer;
 use rayon::prelude::*;
 
-use crate::{biome_painter::BiomePainter, hex_utils::HexCoord};
+use crate::hex_utils::HexCoord;
 
-use super::{
-	biome_map::{self, BiomeMap},
-	chunk::Chunk,
-	map::Map,
-};
+use super::{biome_map::BiomeMap, chunk::Chunk, map::Map};
 
 pub fn render_image(
 	size: UVec2,
@@ -40,7 +36,7 @@ pub fn update_image(
 		let idx = (y * w + x) as usize;
 		let v = data[idx];
 		let t = v.remap(min, max, 0.0, 1.0);
-		let col = LinearRgba::lerp(&color1, color2, t);
+		let col = LinearRgba::lerp(color1, color2, t);
 		*pixel = to_pixel(&col);
 	});
 }
@@ -68,7 +64,7 @@ pub fn update_map(map: &Map, smooth: f32, image: &mut ImageBuffer<image::Rgba<u8
 		let height = map.sample_height(&coord);
 
 		let mut color = Hsla::hsl(138.0, 1.0, 0.4);
-		if height < map.sea_level {
+		if height < map.sealevel {
 			color.hue = 217.0;
 		}
 
@@ -95,10 +91,10 @@ fn get_height_color_blend(base_color: Hsla, height: f32, height2: f32, smooth: f
 			d /= smooth;
 			if d > 0.0 {
 				let c2: LinearRgba = color.with_lightness(color.lightness + 0.1).into();
-				color = LinearRgba::lerp(&color.into(), c2, d).into();
+				color = LinearRgba::lerp(color.into(), c2, d).into();
 			} else {
 				let c2: LinearRgba = color.with_lightness(color.lightness - 0.1).into();
-				color = LinearRgba::lerp(&color.into(), c2, d.abs()).into();
+				color = LinearRgba::lerp(color.into(), c2, d.abs()).into();
 			}
 		}
 	}

engine/world_generation/src/map/mesh_chunk.rs

@@ -1,3 +1,7 @@
+use std::collections::VecDeque;
+
+use bevy::math::IVec2;
+
 use crate::hex_utils::HexCoord;
 
 use super::chunk::Chunk;
@@ -6,6 +10,8 @@ pub struct MeshChunkData {
 	pub heights: [f32; Chunk::AREA],
 	pub textures: [[u32; 2]; Chunk::AREA],
 	pub min_height: f32,
+	pub sealevel: f32,
+	pub distance_to_land: [f32; Chunk::AREA],
 }
 
 impl MeshChunkData {
@@ -22,4 +28,58 @@ impl MeshChunkData {
 
 		return data;
 	}
+
+	pub fn get_neighbors_with_water_info(&self, coord: &HexCoord) -> ([(f32, Option<f32>); 6], bool) {
+		let mut has_land = false;
+		let mut data = [(self.min_height, None); 6];
+		let n_tiles = coord.get_neighbors();
+		for i in 0..6 {
+			let n = n_tiles[i];
+			if !n.is_in_bounds(Chunk::SIZE, Chunk::SIZE) {
+				continue;
+			}
+			let idx = n.to_index(Chunk::SIZE);
+			data[i] = (self.heights[idx], Some(self.distance_to_land[idx]));
+			if data[i].0 > self.sealevel {
+				has_land = true;
+			}
+		}
+		return (data, has_land);
+	}
+
+	pub fn caluclate_water_distances(data: &mut Vec<MeshChunkData>, height: usize, width: usize, range: usize) {
+		let mut open: VecDeque<(HexCoord, f32, usize)> = VecDeque::new();
+		let mut closed: Vec<(HexCoord, f32)> = Vec::new();
+		for z in 0..height {
+			for x in 0..width {
+				let chunk = &mut data[z * height + x];
+				chunk.prepare_chunk_open(x * Chunk::SIZE, z * Chunk::SIZE, &mut open);
+			}
+		}
+	}
+
+	fn prepare_chunk_open(&mut self, offset_x: usize, offset_z: usize, open: &mut VecDeque<(HexCoord, f32, usize)>) {
+		for z in 0..Chunk::SIZE {
+			for x in 0..Chunk::SIZE {
+				let coord = HexCoord::from_grid_pos(x + offset_x, z + offset_z);
+				let idx = coord.to_chunk_local_index();
+				let h = self.heights[idx];
+				self.distance_to_land[idx] = if h > self.sealevel { 0.0 } else { 4.0 };
+				if h > self.sealevel {
+					open.push_back((coord, h, 0));
+				}
+			}
+		}
+	}
+
+	fn fill_chunk_borders(
+		&mut self,
+		chunks: &Vec<MeshChunkData>,
+		offset: IVec2,
+		open: &mut VecDeque<(HexCoord, f32, usize)>,
+		closed: &mut Vec<(HexCoord, f32)>,
+	) {
+		self.prepare_chunk_open(offset.x as usize * Chunk::SIZE, offset.y as usize * Chunk::SIZE, open);
+		todo!("Fill closed list with bordering tiles")
+	}
 }

engine/world_generation/src/tile_manager.rs

@@ -1,5 +1,5 @@
 use asset_loader::create_asset_loader;
-use bevy::{asset::Asset, ecs::system::Resource, reflect::TypePath};
+use bevy::{asset::Asset, reflect::TypePath};
 use serde::{Deserialize, Serialize};
 #[derive(Resource, Debug)]
 pub struct TileManager {

game/buildings/Cargo.toml

@@ -6,15 +6,15 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.14.0"
+bevy = "0.16.0"
 world_generation = { path = "../../engine/world_generation" }
 shared = { path = "../shared" }
-bevy_rapier3d = "0.27.0"
+bevy_rapier3d = "0.29.0"
 serde = { version = "1.0.204", features = ["derive"] }
 asset_loader = { path = "../../engine/asset_loader" }
 serde_json = "1.0.120"
 ron = "0.8.1"
-bevy_asset_loader = { version = "0.21.0", features = [
+bevy_asset_loader = { version = "0.23.0-rc.3", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }

game/buildings/src/assets/building_asset.rs

@@ -1,9 +1,19 @@
 use asset_loader::create_asset_loader;
-use bevy::prelude::*;
+use bevy::{
+	gltf::{GltfMesh, GltfNode},
+	prelude::*,
+};
 use serde::{Deserialize, Serialize};
-use shared::identifiers::ResourceIdentifier;
+use shared::{component_defination::ComponentDefination, identifiers::ResourceIdentifier, prefab_defination::*};
 
-use crate::footprint::BuildingFootprint;
+use crate::{
+	buildings::{
+		conduit_building::ResourceConduitInfo, factory_building::FactoryBuildingInfo,
+		resource_gathering::ResourceGatheringBuildingInfo,
+	},
+	footprint::BuildingFootprint,
+	prelude::Building,
+};
 
 #[derive(Asset, TypePath, Debug, Serialize, Deserialize)]
 pub struct BuildingAsset {
@@ -12,11 +22,108 @@ pub struct BuildingAsset {
 	pub footprint: BuildingFootprint,
 	pub prefab_path: String,
 	#[serde(skip)]
-	pub prefab: Handle<Scene>,
+	pub prefab: Handle<Gltf>,
+	pub base_mesh_path: String,
 
 	pub cost: Vec<ResourceIdentifier>,
 	pub consumption: Vec<ResourceIdentifier>,
 	pub production: Vec<ResourceIdentifier>,
+
+	pub health: u32,
+
+	pub building_type: BuildingType,
+	pub components: Option<Vec<ComponentDefination>>,
+}
+
+impl BuildingAsset {
+	pub fn spawn(
+		&self,
+		pos: Vec3,
+		rot: Quat,
+		gltf: &Gltf,
+		commands: &mut Commands,
+		meshes: &Assets<GltfMesh>,
+		nodes: &Assets<GltfNode>,
+	) -> Option<Entity> {
+		let base_node = &gltf.named_nodes[&self.base_mesh_path.clone().into_boxed_str()];
+		if let Some(node) = nodes.get(base_node.id()) {
+			if let Some(mesh_handle) = &node.mesh {
+				if let Some(gltf_mesh) = meshes.get(mesh_handle.id()) {
+					let (mesh, mat) = gltf_mesh.unpack();
+					let mut entity = commands.spawn((
+						Mesh3d(mesh),
+						MeshMaterial3d(mat),
+						Transform::from_translation(pos).with_rotation(rot),
+						Building,
+					));
+					entity.with_children(|b| {
+						for child in &node.children {
+							let child_node = nodes.get(child.id());
+							if child_node.is_none() {
+								continue;
+							}
+							self.process_node(child_node.unwrap(), meshes, nodes, b, &node.name);
+						}
+					});
+					if let Some(component) = self.get_component_def(&format!("/{0}", &node.name)) {
+						component.apply(&mut entity);
+					}
+					return Some(entity.id());
+				}
+			}
+		}
+		return None;
+	}
+
+	fn process_node(
+		&self,
+		node: &GltfNode,
+		meshes: &Assets<GltfMesh>,
+		nodes: &Assets<GltfNode>,
+		commands: &mut ChildBuilder,
+		parent: &String,
+	) -> Option<Entity> {
+		let path = format!("{0}/{1}", parent, node.name);
+		if let Some(mesh) = &node.mesh {
+			if let Some(gltf_mesh) = meshes.get(mesh.id()) {
+				let (mesh, mat) = gltf_mesh.unpack();
+				let mut entity = commands.spawn((Mesh3d(mesh), MeshMaterial3d(mat), node.transform, Building));
+				entity.with_children(|b| {
+					for child in &node.children {
+						let child_node = nodes.get(child.id());
+						if child_node.is_none() {
+							continue;
+						}
+						self.process_node(child_node.unwrap(), meshes, nodes, b, &path);
+					}
+				});
+				if let Some(component) = self.get_component_def(&path) {
+					component.apply(&mut entity);
+				}
+				return Some(entity.id());
+			}
+		}
+		return None;
+	}
+
+	fn get_component_def(&self, path: &String) -> Option<&ComponentDefination> {
+		if let Some(components) = &self.components {
+			for c in components {
+				if c.path.ends_with(path) {
+					return Some(c);
+				}
+			}
+		}
+		return None;
+	}
+}
+
+#[derive(Serialize, Deserialize, Debug, TypePath)]
+pub enum BuildingType {
+	Basic,
+	Gathering(ResourceGatheringBuildingInfo),
+	FactoryBuildingInfo(FactoryBuildingInfo),
+	ResourceConduit(ResourceConduitInfo),
 }
 
 create_asset_loader!(

game/buildings/src/build_queue.rs

@@ -1,4 +1,3 @@
-use std::path::Display;
 
 use bevy::prelude::Resource;
 use shared::building::BuildingIdentifier;

game/buildings/src/building_plugin.rs

@@ -1,6 +1,11 @@
 use std::f32::consts::E;
 
-use bevy::{ecs::world::CommandQueue, prelude::*, window::PrimaryWindow};
+use bevy::{
+	ecs::world::CommandQueue,
+	gltf::{GltfMesh, GltfNode},
+	prelude::*,
+	window::PrimaryWindow,
+};
 use bevy_asset_loader::loading_state::{
 	config::{ConfigureLoadingState, LoadingStateConfig},
 	LoadingStateAppExt,
@@ -87,7 +92,6 @@ fn hq_placement(
 	mut build_queue: ResMut<BuildQueue>,
 	mut next_state: ResMut<NextState<GameplayState>>,
 ) {
-
 	if let Some(contact) = tile_under_cursor.0 {
 		let positions = map.hex_select(&contact.tile, 3, true, |pos, h, _| pos.to_world(h));
 		show_indicators(positions, &mut commands, &indicator);
@@ -106,12 +110,9 @@ fn hq_placement(
 fn show_indicators(positions: Vec<Vec3>, commands: &mut Commands, indicator: &IndicatorCube) {
 	for p in positions {
 		commands.spawn((
-			PbrBundle {
-				mesh: indicator.0.clone(),
-				material: indicator.1.clone(),
-				transform: Transform::from_translation(p),
-				..default()
-			},
+			Mesh3d(indicator.0.clone()),
+			MeshMaterial3d(indicator.1.clone()),
+			Transform::from_translation(p),
 			Despawn,
 		));
 	}
@@ -122,6 +123,9 @@ fn process_build_queue(
 	mut commands: Commands,
 	db: Res<BuildingDatabase>,
 	building_assets: Res<Assets<BuildingAsset>>,
+	gltf_assets: Res<Assets<Gltf>>,
+	gltf_meshes: Res<Assets<GltfMesh>>,
+	gltf_nodes: Res<Assets<GltfNode>>,
 	mut building_map: ResMut<BuildingMap>,
 	heightmap: Res<Map>,
 ) {
@@ -130,16 +134,21 @@ fn process_build_queue(
 		if let Some(building) = building_assets.get(handle.id()) {
 			let h = heightmap.sample_height(&item.pos);
 			println!("Spawning {} at {}", building.name, item.pos);
-			let e = commands.spawn((
-				SceneBundle {
-					scene: building.prefab.clone(),
-					transform: Transform::from_translation(item.pos.to_world(h)),
-					..Default::default()
-				},
-				Building,
-			));
-
-			building_map.add_building(BuildingEntry::new(item.pos, e.id()));
+			if let Some(gltf) = gltf_assets.get(building.prefab.id()) {
+				let e = building.spawn(
+					item.pos.to_world(h),
+					Quat::IDENTITY,
+					gltf,
+					&mut commands,
+					&gltf_meshes,
+					&gltf_nodes,
+				);
+				if let Some(b) = e {
+					building_map.add_building(BuildingEntry::new(item.pos, b));
+				}
+			} else {
+				warn!("Failed to spawn building");
+			}
 		}
 	}
 	queue.queue.clear();

game/buildings/src/buildings/basic_building.rs

@@ -0,0 +1,3 @@
+use serde::{Deserialize, Serialize};
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BasicBuildingInfo {}

game/buildings/src/buildings/conduit_building.rs

@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ResourceConduitInfo {
+	pub range: usize,
+	pub connection_range: usize,
+}

game/buildings/src/buildings/factory_building.rs

@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct FactoryBuildingInfo {
+	pub units_to_build: Vec<()>
+}

game/buildings/src/buildings/mod.rs

@@ -0,0 +1,5 @@
+pub mod basic_building;
+pub mod conduit_building;
+pub mod factory_building;
+pub mod resource_gathering;
+pub mod tech_building;

game/buildings/src/buildings/resource_gathering.rs

@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+use shared::identifiers::ResourceIdentifier;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ResourceGatheringBuildingInfo {
+	pub resources_to_gather: Vec<ResourceIdentifier>,
+	pub gather_range: usize,
+}

game/buildings/src/buildings/tech_building.rs

@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+use shared::{building::BuildingIdentifier, StatusEffect};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct TechBuildingInfo {
+	pub effect_range: usize,
+	pub buildings_to_unlock: Vec<BuildingIdentifier>,
+	pub buffs: Vec<StatusEffect>,
+}

game/buildings/src/lib.rs

@@ -4,4 +4,5 @@ pub mod building_plugin;
 pub mod buildings_map;
 pub mod footprint;
 pub mod prelude;
+mod buildings;
 pub use building_plugin::*;

game/main/Cargo.toml

@@ -7,12 +7,12 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.14.0", features = ["file_watcher"] }
-bevy-inspector-egui = "0.25.0"
-iyes_perf_ui = "0.3.0"
+bevy = { version = "0.16.0", features = ["file_watcher"] }
+bevy-inspector-egui = "0.28.1"
+# iyes_perf_ui = "0.3.0"
 noise = "0.8.2"
 world_generation = { path = "../../engine/world_generation" }
-bevy_rapier3d = { version = "0.27.0", features = [
+bevy_rapier3d = { version = "0.29.0", features = [
 	"simd-stable",
 	"parallel",
 	"debug-render-3d",
@@ -21,12 +21,19 @@ rayon = "1.10.0"
 buildings = { path = "../buildings" }
 units = { path = "../units" }
 shared = { path = "../shared" }
-bevy_asset_loader = { version = "0.21.0", features = [
+bevy_asset_loader = { version = "0.23.0-rc.3", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }
 ron = "0.8.1"
 image = "0.25.2"
+# bevy_lunex = "0.2.4"
 
 [features]
-tracing = ["bevy/trace_tracy", "world_generation/tracing", "buildings/tracing"]
+tracing = [
+	"bevy/trace_tracy",
+	"world_generation/tracing",
+	"buildings/tracing",
+	"units/tracing",
+	"shared/tracing",
+]

game/main/build.rs

@@ -13,6 +13,10 @@ where
 
 	for path in fs::read_dir(from).unwrap() {
 		let path = path.unwrap().path();
+		println!("{path:?}");
+		if path.starts_with("assets/raw_assets") {
+			continue;
+		}
 		let to = to.clone().join(path.file_name().unwrap());
 
 		if path.is_file() {

game/main/src/camera_system/camera_plugin.rs

@@ -1,12 +1,13 @@
-use bevy::core_pipeline::experimental::taa::{TemporalAntiAliasBundle, TemporalAntiAliasPlugin};
+use bevy::core_pipeline::experimental::taa::{TemporalAntiAliasBundle, TemporalAntiAliasPlugin, TemporalAntiAliasing};
 use bevy::core_pipeline::prepass::DepthPrepass;
 use bevy::input::mouse::{MouseMotion, MouseScrollUnit, MouseWheel};
 use bevy::prelude::*;
-use bevy::window::CursorGrabMode;
-use shared::states::MenuState;
+use bevy::window::{CursorGrabMode, PrimaryWindow};
+use shared::sets::GameplaySet;
 use shared::tags::MainCamera;
 use world_generation::hex_utils::HexCoord;
 use world_generation::prelude::Map;
+use world_generation::states::GeneratorState;
 
 use super::components::*;
 
@@ -15,148 +16,132 @@ pub struct PhosCameraPlugin;
 impl Plugin for PhosCameraPlugin {
 	fn build(&self, app: &mut App) {
 		app.register_type::<PhosCamera>();
+		app.register_type::<PhosOrbitCamera>();
 
 		app.add_systems(PreStartup, setup);
 
-		app.add_systems(Update, rts_camera_system.run_if(in_state(MenuState::InGame)));
-		app.add_systems(PostUpdate, limit_camera_bounds.run_if(in_state(MenuState::InGame)));
-		//Free Cam
-		//app.add_systems(Update, (grab_mouse, (update_camera, update_camera_mouse).chain()));
+		app.add_systems(Update, orbit_camera_upate.in_set(GameplaySet));
+
+		app.add_systems(Update, init_bounds.run_if(in_state(GeneratorState::SpawnMap)));
 
 		app.add_plugins(TemporalAntiAliasPlugin);
 	}
 }
 
-fn setup(mut commands: Commands, mut msaa: ResMut<Msaa>) {
+fn init_bounds(
+	mut commands: Commands,
+	mut cam: Query<(&mut Transform, Entity), With<PhosCamera>>,
+	heightmap: Res<Map>,
+) {
+	let (mut cam_t, cam_entity) = cam.single_mut();
+	cam_t.translation = heightmap.get_center();
+	commands
+		.entity(cam_entity)
+		.insert(CameraBounds::from_size(heightmap.get_world_size()))
+		.insert(PhosOrbitCamera {
+			target: heightmap.get_center_with_height(),
+			..Default::default()
+		});
+}
+
+fn setup(mut commands: Commands) {
 	commands
 		.spawn((
-			Camera3dBundle {
-				transform: Transform::from_xyz(0., 30., 0.).looking_to(Vec3::NEG_Z, Vec3::Y),
-				..default()
-			},
+			Camera3d::default(),
+			Transform::from_xyz(0., 30., 0.).looking_to(Vec3::NEG_Z, Vec3::Y),
 			PhosCamera::default(),
 			MainCamera,
 			DepthPrepass,
-			PhosCameraTargets::default(),
+			PhosOrbitCamera::default(),
+			TemporalAntiAliasing::default(),
 		))
-		.insert(TemporalAntiAliasBundle::default());
+		.insert(Msaa::Off);
+	// .insert(RenderLayers::layer(0))
 
-	*msaa = Msaa::Off;
-}
-fn update_camera(
-	mut cam_query: Query<(&PhosCamera, &mut Transform)>,
-	keyboard_input: Res<ButtonInput<KeyCode>>,
-	time: Res<Time>,
-	windows: Query<&Window>,
-) {
-	let window = windows.single();
-	if window.cursor.grab_mode != CursorGrabMode::Locked {
-		return;
-	}
-	let (cam, mut transform) = cam_query.single_mut();
-
-	let mut move_vec = Vec3::ZERO;
-	if keyboard_input.pressed(KeyCode::KeyA) {
-		move_vec += Vec3::NEG_X;
-	}
-	if keyboard_input.pressed(KeyCode::KeyD) {
-		move_vec += Vec3::X;
-	}
-	if keyboard_input.pressed(KeyCode::KeyW) {
-		move_vec += Vec3::NEG_Z;
-	}
-	if keyboard_input.pressed(KeyCode::KeyS) {
-		move_vec += Vec3::Z;
-	}
-
-	let rot = transform.rotation;
-	move_vec = (rot * move_vec.normalize_or_zero()) * cam.speed * time.delta_seconds();
-
-	if keyboard_input.pressed(KeyCode::ShiftLeft) {
-		move_vec += Vec3::from(transform.down());
-	}
-	if keyboard_input.pressed(KeyCode::Space) {
-		move_vec += Vec3::from(transform.up());
-	}
-
-	transform.translation += move_vec.normalize_or_zero() * cam.speed * time.delta_seconds();
+	// *msaa = Msaa::Off;
 }
 
-fn update_camera_mouse(
-	mut cam_query: Query<&mut Transform, With<PhosCamera>>,
-	mut mouse_move: EventReader<MouseMotion>,
-	time: Res<Time>,
-	windows: Query<&Window>,
-) {
-	let window = windows.single();
-	if window.cursor.grab_mode != CursorGrabMode::Locked {
-		return;
-	}
-	let mut transform = cam_query.single_mut();
-
-	for ev in mouse_move.read() {
-		let (mut yaw, mut pitch, _) = transform.rotation.to_euler(EulerRot::YXZ);
-		match window.cursor.grab_mode {
-			CursorGrabMode::None => (),
-			_ => {
-				// Using smallest of height or width ensures equal vertical and horizontal sensitivity
-				pitch -= ev.delta.y.to_radians() * time.delta_seconds() * 5.;
-				yaw -= ev.delta.x.to_radians() * time.delta_seconds() * 5.;
-			}
-		}
-
-		pitch = pitch.clamp(-1.54, 1.54);
-
-		// Order is important to prevent unintended roll
-		transform.rotation = Quat::from_axis_angle(Vec3::Y, yaw) * Quat::from_axis_angle(Vec3::X, pitch);
-	}
-}
-
-fn grab_mouse(mut windows: Query<&mut Window>, mouse: Res<ButtonInput<MouseButton>>, key: Res<ButtonInput<KeyCode>>) {
-	let mut window = windows.single_mut();
-
-	if mouse.just_pressed(MouseButton::Middle) {
-		window.cursor.visible = false;
-		window.cursor.grab_mode = CursorGrabMode::Locked;
-	}
-
-	if key.just_pressed(KeyCode::Escape) {
-		window.cursor.visible = true;
-		window.cursor.grab_mode = CursorGrabMode::None;
-	}
-}
-
-fn rts_camera_system(
-	mut cam_query: Query<(&mut Transform, &PhosCamera, &mut PhosCameraTargets)>,
+fn orbit_camera_upate(
+	mut cam_query: Query<(&mut Transform, &PhosCamera, &mut PhosOrbitCamera, &CameraBounds)>,
 	mut wheel: EventReader<MouseWheel>,
+	mut mouse_motion: EventReader<MouseMotion>,
+	mouse: Res<ButtonInput<MouseButton>>,
+	mut window_query: Query<&mut Window, With<PrimaryWindow>>,
 	key: Res<ButtonInput<KeyCode>>,
 	time: Res<Time>,
-	heightmap: Res<Map>,
+	map: Res<Map>,
+	#[cfg(debug_assertions)] mut gizmos: Gizmos,
 ) {
-	let (mut cam, cam_cfg, mut cam_targets) = cam_query.single_mut();
+	let (mut transform, config, mut orbit, bounds) = cam_query.single_mut();
+	let mut window = window_query.single_mut();
+
+	let target = orbit.target;
+	let mut cam_pos = target;
+
+	//Apply Camera Dist
+	cam_pos -= orbit.forward * orbit.distance;
+
+	if mouse.pressed(MouseButton::Middle) {
+		let mut orbit_move = Vec2::ZERO;
+		for e in mouse_motion.read() {
+			orbit_move += e.delta;
+		}
+		orbit_move *= config.pan_speed * time.delta_secs() * -1.0;
+		let rot_y = Quat::from_axis_angle(Vec3::Y, orbit_move.x);
+		let right = orbit.forward.cross(Vec3::Y).normalize();
+		let rot_x = Quat::from_axis_angle(right, orbit_move.y);
+		orbit.forward = rot_x * rot_y * orbit.forward;
+		// orbit.forward.y = orbit.forward.y.clamp(-0.9, 0.0);
+		orbit.forward = orbit.forward.normalize();
+		window.cursor_options.grab_mode = CursorGrabMode::Locked;
+		window.cursor_options.visible = false;
+	} else {
+		window.cursor_options.grab_mode = CursorGrabMode::None;
+		window.cursor_options.visible = true;
+	}
+	if key.pressed(KeyCode::KeyE) {
+		let rot = Quat::from_axis_angle(Vec3::Y, f32::to_radians(config.speed) * time.delta_secs());
+		orbit.forward = rot * orbit.forward;
+	} else if key.pressed(KeyCode::KeyQ) {
+		let rot = Quat::from_axis_angle(Vec3::Y, f32::to_radians(-config.speed) * time.delta_secs());
+		orbit.forward = rot * orbit.forward;
+	}
+
 	let mut cam_move = Vec3::ZERO;
-	let mut cam_pos = cam.translation;
 
 	if key.pressed(KeyCode::KeyA) {
-		cam_move.x = -1.;
-	} else if key.pressed(KeyCode::KeyD) {
 		cam_move.x = 1.;
+	} else if key.pressed(KeyCode::KeyD) {
+		cam_move.x = -1.;
 	}
 
 	if key.pressed(KeyCode::KeyW) {
-		cam_move.z = -1.;
-	} else if key.pressed(KeyCode::KeyS) {
 		cam_move.z = 1.;
+	} else if key.pressed(KeyCode::KeyS) {
+		cam_move.z = -1.;
 	}
 
 	let move_speed = if key.pressed(KeyCode::ShiftLeft) {
-		cam_cfg.speed * 2.
+		config.speed * 2.0
 	} else {
-		cam_cfg.speed
+		config.speed
 	};
 
-	cam_move = cam_move.normalize_or_zero() * move_speed * time.delta_seconds();
-	cam_pos += cam_move;
+	if cam_move != Vec3::ZERO {
+		cam_move = cam_move.normalize();
+		let move_fwd = Vec3::new(orbit.forward.x, 0., orbit.forward.z).normalize();
+		let move_rot = Quat::from_rotation_arc(Vec3::NEG_Z, move_fwd);
+		#[cfg(debug_assertions)]
+		{
+			gizmos.arrow(orbit.target, orbit.target + move_fwd, LinearRgba::WHITE.with_alpha(0.5));
+			gizmos.arrow(orbit.target, orbit.target - (move_rot * cam_move), LinearRgba::BLUE);
+		}
+		orbit.target -= (move_rot * cam_move) * move_speed * time.delta_secs();
+		orbit.target.y = sample_ground(orbit.target, &map);
+
+		orbit.target.x = orbit.target.x.clamp(bounds.min.x, bounds.max.x);
+		orbit.target.z = orbit.target.z.clamp(bounds.min.y, bounds.max.y);
+	}
 
 	let mut scroll = 0.0;
 	for e in wheel.read() {
@@ -166,56 +151,20 @@ fn rts_camera_system(
 		}
 	}
 
-	let ground_height = sample_ground(cam.translation, &heightmap);
+	orbit.distance -= scroll * time.delta_secs() * config.zoom_speed;
+	orbit.distance = orbit.distance.clamp(config.min_height, config.max_height);
 
-	cam_targets.height -= scroll;
-	if cam_targets.height > cam_cfg.max_height {
-		cam_targets.height = cam_cfg.max_height;
-	}
+	// let ground_below_cam = sample_ground(cam_pos, &map) + config.min_height;
+	// if cam_pos.y <= ground_below_cam {
+	// 	cam_pos.y = ground_below_cam;
+	// }
 
-	let min_height = ground_height + cam_cfg.min_height;
+	// if cam_pos.y < target.y {
+	// 	cam_pos.y = target.y;
+	// }
 
-	if min_height != cam_targets.last_height {
-		cam_targets.last_height = min_height;
-		cam_targets.anim_time = 0.;
-		cam_targets.rotate_time = 0.;
-	}
-
-	if scroll != 0. {
-		cam_targets.anim_time = 0.;
-		cam_targets.rotate_time = 0.;
-		if cam_targets.height < min_height {
-			cam_targets.height = min_height;
-		}
-	}
-
-	let desired_height = if cam_targets.height < min_height {
-		min_height
-	} else {
-		cam_targets.height
-	};
-	if cam_targets.anim_time < 1. {
-		cam_targets.anim_time += time.delta_seconds() * cam_cfg.zoom_speed;
-		cam_targets.anim_time = cam_targets.anim_time.min(1.);
-	}
-	cam_pos.y = f32::lerp(cam_pos.y, desired_height, cam_targets.anim_time);
-	if cam_pos.y < min_height {
-		cam_pos.y = min_height;
-	}
-	let t = cam_pos.y.remap(cam_cfg.min_height, cam_cfg.max_height, 0., 1.);
-
-	if cam_targets.rotate_time < 1. {
-		cam_targets.rotate_time += time.delta_seconds();
-		cam_targets.rotate_time = cam_targets.rotate_time.min(1.);
-	}
-	let angle = cam_cfg.min_angle.lerp(cam_cfg.max_angle, t);
-	let mut rot = cam.rotation.to_euler(EulerRot::XYZ);
-	rot.0 = -angle;
-	cam.rotation = Quat::from_euler(EulerRot::XYZ, rot.0, rot.1, rot.2);
-	// let rot = Quat::from_axis_angle(Vec3::X, -angle);
-	// cam.rotation = rot;
-
-	cam.translation = cam_pos;
+	transform.translation = cam_pos;
+	transform.look_at(target, Vec3::Y);
 }
 
 fn sample_ground(pos: Vec3, heightmap: &Map) -> f32 {
@@ -224,7 +173,7 @@ fn sample_ground(pos: Vec3, heightmap: &Map) -> f32 {
 	let mut ground_height = if heightmap.is_in_bounds(&tile_under) {
 		heightmap.sample_height(&tile_under)
 	} else {
-		heightmap.sea_level
+		heightmap.sealevel
 	};
 
 	for n in neighbors {
@@ -234,19 +183,8 @@ fn sample_ground(pos: Vec3, heightmap: &Map) -> f32 {
 			}
 		}
 	}
-	if ground_height < heightmap.sea_level {
-		ground_height = heightmap.sea_level;
+	if ground_height < heightmap.sealevel {
+		ground_height = heightmap.sealevel;
 	}
 	return ground_height;
 }
-
-fn limit_camera_bounds(mut cam_query: Query<(&mut Transform, &CameraBounds)>) {
-	let (mut tranform, bounds) = cam_query.single_mut();
-
-	let mut pos = tranform.translation;
-
-	pos.x = pos.x.clamp(bounds.min.x, bounds.max.x);
-	pos.z = pos.z.clamp(bounds.min.y, bounds.max.y);
-
-	tranform.translation = pos;
-}

game/main/src/camera_system/components.rs

@@ -1,4 +1,5 @@
-use bevy::prelude::*;
+use bevy::{math::Direction3d, prelude::*};
+use rayon::str;
 use world_generation::{hex_utils::SHORT_DIAGONAL, prelude::Chunk};
 
 #[derive(Component, Reflect)]
@@ -8,6 +9,7 @@ pub struct PhosCamera {
 	pub max_height: f32,
 	pub speed: f32,
 	pub zoom_speed: f32,
+	pub pan_speed: Vec2,
 	pub min_angle: f32,
 	pub max_angle: f32,
 }
@@ -18,30 +20,26 @@ impl Default for PhosCamera {
 			min_height: 10.,
 			max_height: 420.,
 			speed: 100.,
-			zoom_speed: 0.3,
+			pan_speed: Vec2::new(0.8, 0.5),
+			zoom_speed: 20.,
 			min_angle: (20. as f32).to_radians(),
 			max_angle: 1.,
 		}
 	}
 }
-
-#[derive(Component)]
-pub struct PhosCameraTargets {
-	pub height: f32,
+#[derive(Component, Reflect)]
+pub struct PhosOrbitCamera {
+	pub target: Vec3,
+	pub distance: f32,
 	pub forward: Vec3,
-	pub last_height: f32,
-	pub anim_time: f32,
-	pub rotate_time: f32,
 }
 
-impl Default for PhosCameraTargets {
+impl Default for PhosOrbitCamera {
 	fn default() -> Self {
 		Self {
-			height: Default::default(),
-			forward: Vec3::NEG_Z,
-			last_height: Default::default(),
-			anim_time: Default::default(),
-			rotate_time: Default::default(),
+			target: Default::default(),
+			distance: 40.0,
+			forward: Vec3::new(0.0, -0.5, 0.5).normalize(),
 		}
 	}
 }
@@ -53,14 +51,11 @@ pub struct CameraBounds {
 }
 
 impl CameraBounds {
-	pub fn from_size(size: UVec2) -> Self {
+	pub fn from_size(world_size: Vec2) -> Self {
 		let padding = Chunk::WORLD_SIZE;
 		return Self {
 			min: Vec2::ZERO - padding,
-			max: Vec2::new(
-				(size.x as usize * Chunk::SIZE) as f32 * SHORT_DIAGONAL,
-				(size.y * Chunk::SIZE as u32) as f32 * 1.5,
-			) + padding,
+			max: world_size + padding,
 		};
 	}
 }

game/main/src/main.rs

@@ -1,6 +1,8 @@
+use std::env;
+
+use bevy::image::{ImageAddressMode, ImageFilterMode, ImageSamplerDescriptor};
 use bevy::pbr::wireframe::WireframePlugin;
 use bevy::prelude::*;
-use bevy::render::texture::{ImageAddressMode, ImageFilterMode, ImageSamplerDescriptor};
 use bevy::window::PresentMode;
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use phos::PhosGamePlugin;
@@ -10,6 +12,7 @@ mod map_rendering;
 mod phos;
 mod prelude;
 mod shader_extensions;
+mod ui;
 mod utlis;
 
 fn main() {

game/main/src/map_rendering/chunk_rebuild.rs

@@ -33,6 +33,7 @@ fn chunk_rebuilder(
 	heightmap: Res<Map>,
 ) {
 	let pool = AsyncComputeTaskPool::get();
+	let map_size = UVec2::new(heightmap.width as u32, heightmap.height as u32);
 
 	for (chunk_entity, idx) in &chunk_query {
 		#[cfg(feature = "tracing")]
@@ -46,7 +47,8 @@ fn chunk_rebuilder(
 			#[cfg(feature = "tracing")]
 			let _spawn_span = info_span!("Rebuild Task").entered();
 			let mut queue = CommandQueue::default();
-			let (mesh, collider_data, _, _) = prepare_chunk_mesh(&chunk_data, chunk_offset, chunk_index);
+			let (mesh, water_mesh, collider_data, _, _) =
+				prepare_chunk_mesh(&chunk_data, chunk_data.sealevel, chunk_offset, chunk_index, map_size);
 			#[cfg(feature = "tracing")]
 			let trimesh_span = info_span!("Chunk Trimesh").entered();
 			let c = Collider::trimesh_with_flags(
@@ -71,14 +73,14 @@ fn chunk_rebuilder(
 }
 
 fn collider_task_resolver(
-	mut chunks: Query<(&mut ChunkRebuildTask, &Handle<Mesh>), With<PhosChunk>>,
+	mut chunks: Query<(&mut ChunkRebuildTask, &Mesh3d), With<PhosChunk>>,
 	mut commands: Commands,
 	mut meshes: ResMut<Assets<Mesh>>,
 ) {
 	for (mut task, mesh_handle) in &mut chunks {
 		if let Some((mut c, mesh)) = futures::check_ready(&mut task.task) {
 			commands.append(&mut c);
-			meshes.insert(mesh_handle, mesh);
+			meshes.insert(mesh_handle.id(), mesh);
 		}
 	}
 }

game/main/src/map_rendering/map_init.rs

@@ -3,12 +3,11 @@ use bevy::log::*;
 use bevy::{
 	pbr::{ExtendedMaterial, NotShadowCaster},
 	prelude::*,
-	render::texture::ImageFormat,
+	render::render_resource::{ColorTargetState, FragmentState, RenderPipelineDescriptor},
 };
 use bevy_asset_loader::prelude::*;
 
 use bevy_inspector_egui::quick::ResourceInspectorPlugin;
-use image::DynamicImage;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use shared::states::{AssetLoadState, GameplayState, MenuState};
 use world_generation::{
@@ -16,29 +15,22 @@ use world_generation::{
 	biome_painter::*,
 	heightmap::generate_heightmap,
 	hex_utils::{offset_to_index, SHORT_DIAGONAL},
-	map::{
-		biome_map::{self, BiomeMap},
-		map_utils::{render_biome_noise_map, render_map},
-	},
+	map::biome_map::BiomeMap,
 	prelude::*,
 	tile_manager::*,
 	tile_mapper::*,
 };
 
 use crate::{
-	camera_system::components::*,
 	prelude::{PhosAssets, PhosChunk, PhosChunkRegistry},
 	shader_extensions::{
 		chunk_material::ChunkMaterial,
 		water_material::{WaterMaterial, WaterSettings},
 	},
-	utlis::{
-		chunk_utils::{paint_map, prepare_chunk_mesh_with_collider},
-		render_distance_system::RenderDistanceVisibility,
-	},
+	utlis::chunk_utils::{paint_map, prepare_chunk_mesh_with_collider},
 };
 
-use super::{chunk_rebuild::ChunkRebuildPlugin, terraforming_test::TerraFormingTestPlugin};
+use super::{chunk_rebuild::ChunkRebuildPlugin, render_distance_system::RenderDistanceVisibility};
 
 pub struct MapInitPlugin;
 
@@ -53,7 +45,6 @@ impl Plugin for MapInitPlugin {
 		app.add_plugins(BiomeAssetPlugin);
 
 		app.add_plugins(ResourceInspectorPlugin::<GenerationConfig>::default());
-		app.add_plugins(ResourceInspectorPlugin::<WaterInspect>::default());
 		app.register_type::<ExtendedMaterial<StandardMaterial, WaterMaterial>>();
 		app.register_asset_reflect::<ExtendedMaterial<StandardMaterial, WaterMaterial>>();
 		app.add_plugins((
@@ -94,12 +85,7 @@ impl Plugin for MapInitPlugin {
 	}
 }
 
-#[derive(Resource, Reflect, Default)]
-#[reflect(Resource)]
-struct WaterInspect(Handle<ExtendedMaterial<StandardMaterial, WaterMaterial>>);
-
 fn setup_materials(
-	mut commands: Commands,
 	mut phos_assets: ResMut<PhosAssets>,
 	mut water_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, WaterMaterial>>>,
 ) {
@@ -120,7 +106,6 @@ fn setup_materials(
 			..default()
 		},
 	});
-	commands.insert_resource(WaterInspect(water_material.clone()));
 	phos_assets.water_material = water_material;
 }
 
@@ -159,7 +144,6 @@ fn finalize_texture(
 
 fn create_heightmap(
 	mut commands: Commands,
-	mut cam: Query<(&mut Transform, Entity), With<PhosCamera>>,
 	mut next_state: ResMut<NextState<GeneratorState>>,
 	biome_painter: Res<BiomePainter>,
 ) {
@@ -215,10 +199,6 @@ fn create_heightmap(
 	};
 	let (heightmap, biome_map) = generate_heightmap(&config, 42069, &biome_painter);
 
-	let (mut cam_t, cam_entity) = cam.single_mut();
-	cam_t.translation = heightmap.get_center();
-
-	commands.entity(cam_entity).insert(CameraBounds::from_size(config.size));
 	commands.insert_resource(heightmap);
 	commands.insert_resource(biome_map);
 	commands.insert_resource(config);
@@ -240,16 +220,26 @@ fn spawn_map(
 ) {
 	paint_map(&mut heightmap, &biome_painter, &tile_assets, &tile_mappers);
 
+	//Prepare Mesh Data
+	let map_size = UVec2::new(heightmap.width as u32, heightmap.height as u32);
 	let chunk_meshes: Vec<_> = heightmap
 		.chunks
 		.par_iter()
 		.map(|chunk: &Chunk| {
 			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);
+			return prepare_chunk_mesh_with_collider(
+				&heightmap.get_chunk_mesh_data(index),
+				heightmap.sealevel,
+				chunk.chunk_offset,
+				index,
+				map_size,
+			);
 		})
 		.collect();
 
 	let mut registry = PhosChunkRegistry::new(chunk_meshes.len());
+
+	//Spawn Chunks
 	{
 		#[cfg(feature = "tracing")]
 		let _spawn_span = info_span!("Spawn Chunks").entered();
@@ -258,37 +248,33 @@ fn spawn_map(
 			0.,
 			(Chunk::SIZE / 2) as f32 * 1.5,
 		);
-		for (mesh, collider, pos, index) in chunk_meshes {
+		for (chunk_mesh, water_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());
+			let chunk = commands
+				.spawn((
+					Mesh3d(meshes.add(chunk_mesh)),
+					MeshMaterial3d(atlas.chunk_material_handle.clone()),
+					Transform::from_translation(pos),
+					PhosChunk::new(index),
+					RenderDistanceVisibility::default().with_offset(visibility_offset),
+					collider,
+				))
+				.id();
+			let water = commands
+				.spawn((
+					Mesh3d(meshes.add(water_mesh)),
+					MeshMaterial3d(atlas.water_material.clone()),
+					Transform::from_translation(pos),
+					PhosChunk::new(index),
+					NotShadowCaster,
+					RenderDistanceVisibility::default().with_offset(visibility_offset),
+				))
+				.id();
+			registry.chunks.push(chunk);
+			registry.waters.push(water);
 		}
 	}
 
-	commands.spawn((
-		MaterialMeshBundle {
-			transform: Transform::from_translation(heightmap.get_center()),
-			mesh: meshes.add(
-				Plane3d::default()
-					.mesh()
-					.size(heightmap.get_world_width(), heightmap.get_world_height()),
-			),
-			material: atlas.water_material.clone(),
-			..default()
-		},
-		NotShadowCaster,
-	));
-
 	commands.insert_resource(registry);
 	generator_state.set(GeneratorState::Idle);
 	if cur_game_state.get() != &MenuState::InGame {

game/main/src/map_rendering/mod.rs

@@ -2,3 +2,4 @@ pub mod chunk_rebuild;
 pub mod map_init;
 pub mod prelude;
 pub mod terraforming_test;
+pub mod render_distance_system;

game/main/src/map_rendering/render_distance_system.rs

@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use shared::tags::MainCamera;
 
 use crate::camera_system::components::PhosCamera;
 
@@ -9,9 +10,6 @@ impl Plugin for RenderDistancePlugin {
 		app.register_type::<RenderDistanceSettings>();
 		app.add_systems(PostUpdate, render_distance_system)
 			.insert_resource(RenderDistanceSettings::default());
-
-		#[cfg(debug_assertions)]
-		app.insert_resource(RenderDistanceSettings::new(f32::MAX));
 	}
 }
 
@@ -55,7 +53,7 @@ impl Default for RenderDistanceVisibility {
 
 fn render_distance_system(
 	mut objects: Query<(&Transform, &mut Visibility, &RenderDistanceVisibility)>,
-	camera_query: Query<&Transform, With<PhosCamera>>,
+	camera_query: Query<&Transform, With<MainCamera>>,
 	settings: Res<RenderDistanceSettings>,
 ) {
 	let camera = camera_query.single();

game/main/src/phos.rs

@@ -1,7 +1,8 @@
 use crate::camera_system::components::PhosCamera;
 use crate::map_rendering::map_init::MapInitPlugin;
+use crate::map_rendering::render_distance_system::RenderDistancePlugin;
+use crate::ui::build_ui::BuildUIPlugin;
 use crate::utlis::editor_plugin::EditorPlugin;
-use crate::utlis::render_distance_system::RenderDistancePlugin;
 use crate::utlis::tile_selection_plugin::TileSelectionPlugin;
 use crate::{camera_system::camera_plugin::PhosCameraPlugin, utlis::debug_plugin::DebugPlugin};
 use bevy::{
@@ -13,7 +14,8 @@ use bevy_rapier3d::dynamics::{Ccd, RigidBody, Velocity};
 use bevy_rapier3d::geometry::Collider;
 use bevy_rapier3d::plugin::{NoUserData, RapierPhysicsPlugin};
 use buildings::BuildingPugin;
-use iyes_perf_ui::prelude::*;
+// use iyes_perf_ui::prelude::*;
+use shared::animation_plugin::SimpleAnimationPlugin;
 use shared::sets::GameplaySet;
 use shared::states::{GameplayState, MenuState};
 use shared::{despawn::DespawnPuglin, states::AssetLoadState};
@@ -37,6 +39,8 @@ impl Plugin for PhosGamePlugin {
 			MapInitPlugin,
 			RenderDistancePlugin,
 			BuildingPugin,
+			BuildUIPlugin,
+			SimpleAnimationPlugin,
 			UnitsPlugin,
 			DespawnPuglin,
 			TileSelectionPlugin,
@@ -57,8 +61,8 @@ impl Plugin for PhosGamePlugin {
 		//Perf UI
 		app.add_plugins(bevy::diagnostic::FrameTimeDiagnosticsPlugin)
 			.add_plugins(bevy::diagnostic::EntityCountDiagnosticsPlugin)
-			.add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
-			.add_plugins(PerfUiPlugin);
+			.add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin);
+		// .add_plugins(PerfUiPlugin);
 
 		//Physics
 		app.add_plugins(RapierPhysicsPlugin::<NoUserData>::default());
@@ -74,52 +78,51 @@ impl Plugin for PhosGamePlugin {
 fn configure_gameplay_set(app: &mut App) {
 	app.configure_sets(
 		Update,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 	app.configure_sets(
 		PreUpdate,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 	app.configure_sets(
 		PostUpdate,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 
 	app.configure_sets(
 		FixedUpdate,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 	app.configure_sets(
 		FixedPreUpdate,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 	app.configure_sets(
 		FixedPostUpdate,
-		GameplaySet.run_if(in_state(GeneratorState::Idle).and_then(in_state(MenuState::InGame))),
+		GameplaySet.run_if(in_state(GeneratorState::Idle).and(in_state(MenuState::InGame))),
 	);
 }
 
 fn init_game(mut commands: Commands, mut materials: ResMut<Assets<StandardMaterial>>) {
-	commands.spawn((
-		PerfUiRoot::default(),
-		PerfUiEntryFPS::default(),
-		PerfUiEntryFPSWorst::default(),
-		PerfUiEntryFrameTime::default(),
-		PerfUiEntryFrameTimeWorst::default(),
-	));
+	// commands.spawn((
+	// 	PerfUiRoot::default(),
+	// 	PerfUiEntryFPS::default(),
+	// 	PerfUiEntryFPSWorst::default(),
+	// 	PerfUiEntryFrameTime::default(),
+	// 	PerfUiEntryFrameTimeWorst::default(),
+	// ));
 
-	commands.spawn(DirectionalLightBundle {
-		directional_light: DirectionalLight {
+	commands.spawn((
+		DirectionalLight {
 			shadows_enabled: true,
 			..default()
 		},
-		cascade_shadow_config: CascadeShadowConfig {
+		CascadeShadowConfig {
 			bounds: vec![200., 400., 600., 800.],
 			..default()
 		},
-		transform: Transform::from_xyz(500., 260.0, 500.).looking_at(Vec3::ZERO, Vec3::Y),
-		..default()
-	});
+		Transform::from_xyz(500., 260.0, 500.).looking_at(Vec3::ZERO, Vec3::Y),
+	));
 
 	let sphere_mat = StandardMaterial {
 		base_color: Color::srgb(1., 1., 0.),
@@ -142,12 +145,9 @@ fn spawn_sphere(
 	if keyboard_input.just_pressed(KeyCode::KeyF) {
 		let cam_transform = cam.single();
 		commands.spawn((
-			MaterialMeshBundle {
-				mesh: meshes.add(Sphere::new(0.3)),
-				material: mat.0.clone(),
-				transform: Transform::from_translation(cam_transform.translation),
-				..default()
-			},
+			Mesh3d(meshes.add(Sphere::new(0.3))),
+			MeshMaterial3d(mat.0.clone()),
+			Transform::from_translation(cam_transform.translation),
 			Collider::ball(0.3),
 			RigidBody::Dynamic,
 			Ccd::enabled(),

game/main/src/prelude.rs

@@ -30,12 +30,14 @@ impl PhosChunk {
 #[derive(Resource, Default)]
 pub struct PhosChunkRegistry {
 	pub chunks: Vec<Entity>,
+	pub waters: Vec<Entity>,
 }
 
 impl PhosChunkRegistry {
 	pub fn new(size: usize) -> Self {
 		return Self {
 			chunks: Vec::with_capacity(size),
+			waters: Vec::with_capacity(size),
 		};
 	}
 }

game/main/src/shader_extensions/chunk_material.rs

@@ -1,8 +1,10 @@
 use bevy::asset::{Asset, Handle};
-use bevy::pbr::MaterialExtension;
+use bevy::image::Image;
+use bevy::pbr::{Material, MaterialExtension};
 use bevy::reflect::TypePath;
+use bevy::render::mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef};
 use bevy::render::render_resource::{AsBindGroup, ShaderRef};
-use bevy::render::texture::Image;
+use world_generation::consts::{ATTRIBUTE_PACKED_VERTEX_DATA, ATTRIBUTE_VERTEX_HEIGHT};
 
 #[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 pub struct ChunkMaterial {
@@ -15,25 +17,50 @@ impl MaterialExtension for ChunkMaterial {
 	fn fragment_shader() -> ShaderRef {
 		"shaders/world/chunk.wgsl".into()
 	}
+}
 
-	// fn vertex_shader() -> ShaderRef {
+#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
+pub struct PackedChunkMaterial {
+	#[texture(100, dimension = "2d_array")]
+	#[sampler(101)]
+	pub array_texture: Handle<Image>,
+}
+
+impl Material for PackedChunkMaterial {
+	fn fragment_shader() -> ShaderRef {
+		"shaders/world/chunk.wgsl".into()
+	}
+
+	fn vertex_shader() -> ShaderRef {
+		"shaders/world/chunk_packed.wgsl".into()
+	}
+
+	fn prepass_vertex_shader() -> ShaderRef {
+		"shaders/world/chunk_packed.wgsl".into()
+	}
+
+	// fn deferred_vertex_shader() -> ShaderRef {
 	// 	"shaders/world/chunk_packed.wgsl".into()
 	// }
 
-	// fn specialize(
-	// 	_pipeline: &bevy::pbr::MaterialExtensionPipeline,
-	// 	descriptor: &mut bevy::render::render_resource::RenderPipelineDescriptor,
-	// 	layout: &bevy::render::mesh::MeshVertexBufferLayout,
-	// 	_key: bevy::pbr::MaterialExtensionKey<Self>,
-	// ) -> Result<(), bevy::render::render_resource::SpecializedMeshPipelineError> {
-	// 	let vertex_layout = layout.get_layout(&[
-	// 		// Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
-	// 		// Mesh::ATTRIBUTE_UV_0.at_shader_location(1),
-	// 		// Mesh::ATTRIBUTE_NORMAL.at_shader_location(2),
-	// 		ATTRIBUTE_PACKED_VERTEX_DATA.at_shader_location(7),
-	// 		ATTRIBUTE_VERTEX_HEIGHT.at_shader_location(8),
-	// 	])?;
-	// 	descriptor.vertex.buffers = vec![vertex_layout];
-	// 	Ok(())
+	// fn opaque_render_method(&self) -> bevy::pbr::OpaqueRendererMethod {
+	// 	return OpaqueRendererMethod::Auto;
 	// }
+
+	fn specialize(
+		_pipeline: &bevy::pbr::MaterialPipeline<Self>,
+		descriptor: &mut bevy::render::render_resource::RenderPipelineDescriptor,
+		layout: &MeshVertexBufferLayoutRef,
+		_key: bevy::pbr::MaterialPipelineKey<Self>,
+	) -> Result<(), bevy::render::render_resource::SpecializedMeshPipelineError> {
+		let vertex_layout = layout.0.get_layout(&[
+			// Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
+			// Mesh::ATTRIBUTE_UV_0.at_shader_location(1),
+			// Mesh::ATTRIBUTE_NORMAL.at_shader_location(2),
+			ATTRIBUTE_PACKED_VERTEX_DATA.at_shader_location(7),
+			ATTRIBUTE_VERTEX_HEIGHT.at_shader_location(8),
+		])?;
+		descriptor.vertex.buffers = vec![vertex_layout];
+		Ok(())
+	}
 }

game/main/src/ui/build_ui.rs

@@ -0,0 +1,38 @@
+use bevy::{
+	prelude::*,
+	render::{camera::RenderTarget, view::RenderLayers},
+};
+use shared::{states::AssetLoadState, tags::MainCamera};
+pub struct BuildUIPlugin;
+
+impl Plugin for BuildUIPlugin {
+	fn build(&self, app: &mut App) {
+		app.add_systems(Startup, setup_cameras);
+		app.add_systems(Update, spawn_ui.run_if(in_state(AssetLoadState::LoadComplete)));
+	}
+}
+
+fn setup_cameras(mut commands: Commands) {
+	commands.spawn((Camera2d, IsDefaultUiCamera, UiBoxShadowSamples(6)));
+}
+
+fn spawn_ui(mut commands: Commands) {
+	commands
+		.spawn((Node {
+			width: Val::Percent(100.),
+			height: Val::Percent(100.),
+			justify_content: JustifyContent::Center,
+			align_items: AlignItems::End,
+			..default()
+		},))
+		.insert(PickingBehavior::IGNORE)
+		.with_children(|parent| {
+			parent.spawn((
+				Node {
+					width: Val::Px(500.),
+					..Default::default()
+				},
+				BackgroundColor(LinearRgba::GREEN.into()),
+			));
+		});
+}

game/main/src/ui/mod.rs

@@ -0,0 +1 @@
+pub mod build_ui;

game/main/src/utlis/chunk_utils.rs

@@ -3,14 +3,18 @@ use bevy::log::*;
 use bevy::{
 	asset::Assets,
 	ecs::system::Res,
-	math::{IVec2, Vec3},
+	math::{IVec2, UVec2, Vec3},
 	render::mesh::Mesh,
 };
 use bevy_rapier3d::geometry::{Collider, TriMeshFlags};
 use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
 use world_generation::{
 	biome_painter::BiomePainter,
-	generators::{chunk_colliders::generate_chunk_collider, mesh_generator::generate_chunk_mesh},
+	generators::{
+		chunk_colliders::generate_chunk_collider,
+		mesh_generator::{generate_chunk_mesh, generate_chunk_water_mesh},
+		packed_mesh_generator::generate_packed_chunk_mesh,
+	},
 	hex_utils::offset_to_world,
 	prelude::{Chunk, Map, MeshChunkData},
 	tile_manager::TileAsset,
@@ -50,16 +54,20 @@ pub fn paint_chunk(
 
 pub fn prepare_chunk_mesh(
 	chunk: &MeshChunkData,
+	sealevel: f32,
 	chunk_offset: IVec2,
 	chunk_index: usize,
-) -> (Mesh, (Vec<Vec3>, Vec<[u32; 3]>), Vec3, usize) {
+	map_size: UVec2,
+) -> (Mesh, 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);
+	let chunk_mesh = generate_chunk_mesh(chunk);
+	let water_mesh = generate_chunk_water_mesh(chunk, sealevel, map_size.x as usize, map_size.y as usize);
 	let col_data = generate_chunk_collider(chunk);
 
 	return (
-		mesh,
+		chunk_mesh,
+		water_mesh,
 		col_data,
 		offset_to_world(chunk_offset * Chunk::SIZE as i32, 0.),
 		chunk_index,
@@ -68,15 +76,18 @@ pub fn prepare_chunk_mesh(
 
 pub fn prepare_chunk_mesh_with_collider(
 	chunk: &MeshChunkData,
+	sealevel: f32,
 	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);
+	map_size: UVec2,
+) -> (Mesh, Mesh, Collider, Vec3, usize) {
+	let (chunk_mesh, water_mesh, (col_verts, col_indicies), pos, index) =
+		prepare_chunk_mesh(chunk, sealevel, chunk_offset, chunk_index, map_size);
 	let collider: Collider;
 	{
 		#[cfg(feature = "tracing")]
 		let _collider_span = info_span!("Create Collider Trimesh").entered();
 		collider = Collider::trimesh_with_flags(col_verts, col_indicies, TriMeshFlags::DELETE_DUPLICATE_TRIANGLES);
 	}
-	return (mesh, collider, pos, index);
+	return (chunk_mesh, water_mesh, collider, pos, index);
 }

game/main/src/utlis/debug_plugin.rs

@@ -1,17 +1,14 @@
-use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_inspector_egui::bevy_egui::{systems::InputEvents, EguiContexts};
-use bevy_inspector_egui::egui;
-use bevy_rapier3d::prelude::*;
-use shared::resources::TileUnderCursor;
+use bevy::{gizmos::gizmos, prelude::*};
 use shared::states::GameplayState;
-use shared::tags::MainCamera;
+use shared::{resources::TileUnderCursor, sets::GameplaySet};
 use world_generation::{
-	consts::HEX_CORNERS,
-	hex_utils::{HexCoord, INNER_RADIUS},
+	consts::{HEX_CORNERS, WATER_HEX_CORNERS},
 	prelude::Map,
 	states::GeneratorState,
 };
 
+use crate::camera_system::components::{PhosCamera, PhosOrbitCamera};
+
 pub struct DebugPlugin;
 
 impl Plugin for DebugPlugin {
@@ -32,6 +29,7 @@ impl Plugin for DebugPlugin {
 				.run_if(in_state(DebugState::Verbose)),
 		);
 
+		// app.add_systems(Update, camera_debug.in_set(GameplaySet));
 		app.add_systems(Update, regenerate_map.run_if(in_state(GeneratorState::Idle)));
 
 		app.insert_resource(Shape(Polyline3d::new([
@@ -70,31 +68,33 @@ fn regenerate_map(
 fn show_tile_heights(map: Res<Map>, mut gizmos: Gizmos, shape: Res<Shape>, tile_under_cursor: Res<TileUnderCursor>) {
 	if let Some(contact) = tile_under_cursor.0 {
 		let height = map.sample_height(&contact.tile);
-		gizmos.primitive_3d(
-			&shape.0,
-			contact.tile.to_world(height + 0.01),
-			Quat::IDENTITY,
-			Color::WHITE,
-		);
-		let nbors = map.get_neighbors(&contact.tile);
-		let contact_tile_pos = contact.tile.to_world(map.sample_height(&contact.tile));
-
-		// for i in 0..6 {
-		// 	if let Some(s) = nbors[i] {
-		// 		let coord = contact.tile.get_neighbor(i);
-		// 		let p = coord.to_world(s);
-		// 		gizmos.arrow(p, p + Vec3::Y * (i as f32 + 1.0), Color::WHITE);
-		// 	}
-
-		// 	let p = HEX_CORNERS[i] + contact_tile_pos;
-		// 	gizmos.arrow(p, p + Vec3::Y * (i as f32 + 1.0), LinearRgba::rgb(1.0, 0.0, 0.5));
-		// }
+		gizmos.primitive_3d(&shape.0, contact.tile.to_world(height + 0.01), Color::WHITE);
 
 		gizmos.line(contact.point, contact.point + Vec3::X, LinearRgba::RED);
 		gizmos.line(contact.point, contact.point + Vec3::Y, LinearRgba::GREEN);
 		gizmos.line(contact.point, contact.point + Vec3::Z, LinearRgba::BLUE);
-		//gizmos.sphere(contact_point, Quat::IDENTITY, 0.1, LinearRgba::rgb(1., 0., 0.5));
+
+		// show_water_corners(contact.tile.to_world(height + 1.0), &mut gizmos);
 	}
 }
 
+fn show_water_corners(pos: Vec3, gizmos: &mut Gizmos) {
+	for i in 0..WATER_HEX_CORNERS.len() {
+		let p = pos + WATER_HEX_CORNERS[i];
+		let p2 = pos + WATER_HEX_CORNERS[(i + 1) % WATER_HEX_CORNERS.len()];
+
+		gizmos.line(p, p2, LinearRgba::RED);
+	}
+}
+
+fn camera_debug(mut cam_query: Query<(&PhosCamera, &PhosOrbitCamera)>, mut gizmos: Gizmos) {
+	let (config, orbit) = cam_query.single();
+
+	gizmos.sphere(orbit.target, 0.3, LinearRgba::RED);
+	let cam_proxy = orbit.target - (orbit.forward * 10.0);
+	gizmos.ray(orbit.target, orbit.forward * 10.0, LinearRgba::rgb(1.0, 0.0, 1.0));
+
+	gizmos.circle(cam_proxy, 0.3, LinearRgba::rgb(1.0, 1.0, 0.0));
+}
+
 fn verbose_data() {}

game/main/src/utlis/editor_plugin.rs

@@ -14,11 +14,11 @@ impl Plugin for EditorPlugin {
 	fn build(&self, app: &mut App) {
 		app.init_resource::<UIState>();
 
-		app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap)));
-		app.add_systems(
-			Update,
-			(render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)),
-		);
+		// app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap)));
+		// app.add_systems(
+		// 	Update,
+		// 	(render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)),
+		// );
 	}
 }
 
@@ -69,7 +69,7 @@ fn asset_reloaded(
 	let mut rebuild = false;
 	for event in asset_events.read() {
 		match event {
-			AssetEvent::Modified {..}=>	rebuild = true,
+			AssetEvent::Modified { .. } => rebuild = true,
 			_ => (),
 		}
 	}

game/main/src/utlis/mod.rs

@@ -1,5 +1,4 @@
 pub mod chunk_utils;
-pub mod render_distance_system;
 pub mod debug_plugin;
 pub mod editor_plugin;
 pub mod tile_selection_plugin;

game/main/src/utlis/tile_selection_plugin.rs

@@ -1,5 +1,8 @@
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_rapier3d::{plugin::RapierContext, prelude::QueryFilter};
+use bevy_rapier3d::{
+	plugin::{RapierContext, ReadDefaultRapierContext},
+	prelude::QueryFilter,
+};
 use shared::{
 	resources::{TileContact, TileUnderCursor},
 	tags::MainCamera,
@@ -20,17 +23,22 @@ impl Plugin for TileSelectionPlugin {
 fn update_tile_under_cursor(
 	cam_query: Query<(&GlobalTransform, &Camera), With<MainCamera>>,
 	window: Query<&Window, With<PrimaryWindow>>,
-	rapier_context: Res<RapierContext>,
+	rapier_context: ReadDefaultRapierContext,
 	map: Res<Map>,
 	mut tile_under_cursor: ResMut<TileUnderCursor>,
 ) {
-	let win = window.single();
+	let win_r = window.get_single();
+	if win_r.is_err() {
+		return;
+	}
+	let win = win_r.unwrap();
+
 	let (cam_transform, camera) = cam_query.single();
 	let Some(cursor_pos) = win.cursor_position() else {
 		return;
 	};
 
-	let Some(cam_ray) = camera.viewport_to_world(cam_transform, cursor_pos) else {
+	let Ok(cam_ray) = camera.viewport_to_world(cam_transform, cursor_pos) else {
 		return;
 	};
 

game/resources/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "resources"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bevy = "0.16.0"
+world_generation = { path = "../../engine/world_generation" }
+shared = { path = "../shared" }
+serde = { version = "1.0.204", features = ["derive"] }
+asset_loader = { path = "../../engine/asset_loader" }
+serde_json = "1.0.120"
+ron = "0.8.1"
+bevy_asset_loader = { version = "0.23.0-rc.3", features = [
+	"standard_dynamic_assets",
+	"3d",
+] }
+
+[features]
+tracing = []

game/resources/src/lib.rs

@@ -0,0 +1,16 @@
+pub mod resource_asset;
+
+pub fn add(left: usize, right: usize) -> usize {
+	left + right
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn it_works() {
+		let result = add(2, 2);
+		assert_eq!(result, 4);
+	}
+}

game/resources/src/resource_asset.rs

@@ -0,0 +1,49 @@
+use asset_loader::create_asset_loader;
+use bevy::prelude::*;
+use bevy_asset_loader::asset_collection::AssetCollection;
+use serde::{Deserialize, Serialize};
+use shared::Tier;
+
+#[derive(Asset, TypePath, Debug, Serialize, Deserialize)]
+pub struct ResourceAsset {
+	pub identifier: String,
+	pub name: String,
+	pub description: String,
+	pub sprite_id: usize,
+	pub tier: Tier,
+}
+
+create_asset_loader!(
+	ResourceAssetPlugin,
+	ResourceAssetLoader,
+	ResourceAsset,
+	&["res", "res.ron"],
+	;?
+);
+
+#[derive(Resource, AssetCollection)]
+pub struct ResourceDatabase {
+	#[asset(key = "resources", collection(typed))]
+	pub units: Vec<Handle<ResourceAsset>>,
+}
+
+impl ResourceDatabase {
+	pub fn create_lookup(&self, assets: &Assets<ResourceAsset>) -> ResourceLookup {
+		let mut identifiers = Vec::with_capacity(self.units.len());
+		for handle in &self.units {
+			if let Some(asset) = assets.get(handle.id()) {
+				identifiers.push(asset.identifier.clone());
+			}
+		}
+		return ResourceLookup {
+			handles: self.units.clone(),
+			identifiers,
+		};
+	}
+}
+
+#[derive(Resource)]
+pub struct ResourceLookup {
+	pub handles: Vec<Handle<ResourceAsset>>,
+	pub identifiers: Vec<String>,
+}

game/shared/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.14.0"
+bevy = "0.16.0"
 serde = { version = "1.0.204", features = ["derive"] }
 world_generation = { path = "../../engine/world_generation" }
 

game/shared/src/animation_plugin.rs

@@ -0,0 +1,18 @@
+use bevy::prelude::*;
+
+use crate::prefab_defination::RotationAnimation;
+
+pub struct SimpleAnimationPlugin;
+
+impl Plugin for SimpleAnimationPlugin {
+	fn build(&self, app: &mut App) {
+		app.add_systems(Update, rotate);
+	}
+}
+
+fn rotate(mut query: Query<(&mut Transform, &RotationAnimation)>, time: Res<Time>) {
+	for (mut transform, rot) in query.iter_mut() {
+		let cur_rot = transform.rotation;
+		transform.rotation = cur_rot * Quat::from_axis_angle(rot.axis, rot.speed.to_radians() * time.delta_secs());
+	}
+}

game/shared/src/building.rs

@@ -1,6 +1,7 @@
+use bevy::reflect::Reflect;
 use serde::{Deserialize, Serialize};
 
-#[derive(Default, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Default, Reflect, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct BuildingIdentifier(pub usize);
 
 impl From<i32> for BuildingIdentifier {

game/shared/src/component_defination.rs

@@ -0,0 +1,20 @@
+use bevy::{
+	ecs::system::EntityCommands, math::{Quat, Vec3}, prelude::*
+};
+use serde::{Deserialize, Serialize};
+
+use crate::prefab_defination::AnimationComponent;
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ComponentDefination {
+	pub path: String,
+	pub animations: Vec<AnimationComponent>,
+}
+
+
+impl ComponentDefination {
+	pub fn apply(&self, commands: &mut EntityCommands){
+		for c in &self.animations {
+			c.apply(commands);
+		}
+	}
+}

game/shared/src/despawn.rs

@@ -24,7 +24,7 @@ impl Plugin for DespawnPuglin {
 
 fn despawn_at(mut commands: Commands, time: Res<Time>, entities: Query<(Entity, &DespawnAt), Without<DespawnAfter>>) {
 	for (entity, at) in entities.iter() {
-		let d = at.0 - time.elapsed_seconds();
+		let d = at.0 - time.elapsed_secs();
 		commands
 			.entity(entity)
 			.insert(DespawnAfter(Timer::from_seconds(d, TimerMode::Once)));

game/shared/src/identifiers.rs

@@ -1,9 +1,15 @@
-use bevy::prelude::Resource;
+use bevy::reflect::Reflect;
 use serde::{Deserialize, Serialize};
 use world_generation::hex_utils::HexCoord;
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Reflect)]
 pub struct ResourceIdentifier {
 	pub id: u32,
 	pub qty: u32,
 }
+
+#[derive(Serialize, Deserialize, Debug, Reflect)]
+pub struct UnitIdentifier(u32);
+
+#[derive(Serialize, Deserialize, Debug, Reflect)]
+pub struct TileIdentifier(u32);

game/shared/src/lib.rs

@@ -1,8 +1,37 @@
+use bevy::reflect::Reflect;
+use serde::{Deserialize, Serialize};
+
 pub mod building;
 pub mod despawn;
+pub mod events;
 pub mod identifiers;
+pub mod resources;
+pub mod sets;
 pub mod states;
 pub mod tags;
-pub mod events;
-pub mod sets;
-pub mod resources;
+pub mod prefab_defination;
+pub mod component_defination;
+pub mod animation_plugin;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum Tier {
+	Zero,
+	One,
+	Two,
+	Three,
+	Superior,
+}
+
+#[derive(Serialize, Deserialize, Debug, Reflect)]
+pub enum StatusEffect {
+	UnitRange(f32),
+	UnitAttack(f32),
+	UnitHealth(f32),
+	StructureRange(f32),
+	StructureAttack(f32),
+	StructureHealth(f32),
+	BuildSpeedMulti(f32),
+	BuildCostMulti(f32),
+	ConsumptionMulti(f32),
+	ProductionMulti(f32),
+}

game/shared/src/prefab_defination.rs

@@ -0,0 +1,79 @@
+use bevy::{
+	ecs::system::{EntityCommand, EntityCommands},
+	gltf::{Gltf, GltfMesh},
+	math::{Quat, Vec3},
+	prelude::*,
+};
+use serde::{Deserialize, Serialize};
+#[derive(Serialize, Deserialize, Debug)]
+pub struct PrefabDefination {
+	pub path: String,
+	pub pos: Vec3,
+	pub rot: Vec3,
+	pub children: Option<Vec<PrefabDefination>>,
+	pub animations: Option<Vec<AnimationComponent>>,
+}
+
+impl PrefabDefination {
+	pub fn spawn_recursive(&self, gltf: &Gltf, commands: &mut ChildBuilder, meshes: &Assets<GltfMesh>) {
+		let mesh_handle = &gltf.named_meshes[&self.path.clone().into_boxed_str()];
+		if let Some(gltf_mesh) = meshes.get(mesh_handle.id()) {
+			let (m, mat) = gltf_mesh.unpack();
+			let mut entity = commands.spawn((
+				Mesh3d(m),
+				MeshMaterial3d(mat),
+				Transform::from_translation(self.pos).with_rotation(Quat::from_euler(
+					bevy::math::EulerRot::XYZ,
+					self.rot.x,
+					self.rot.y,
+					self.rot.z,
+				)),
+			));
+			if let Some(children) = &self.children {
+				entity.with_children(|b| {
+					for child in children {
+						child.spawn_recursive(gltf, b, meshes);
+					}
+				});
+			}
+		}
+	}
+}
+
+pub trait UnpackGltfMesh {
+	fn unpack(&self) -> (Handle<Mesh>, Handle<StandardMaterial>);
+}
+
+impl UnpackGltfMesh for GltfMesh {
+	fn unpack(&self) -> (Handle<Mesh>, Handle<StandardMaterial>) {
+		let p = &self.primitives[0];
+		let mut mat: Handle<StandardMaterial> = default();
+		if let Some(mesh_material) = &p.material {
+			mat = mesh_material.clone();
+		}
+		return (p.mesh.clone(), mat);
+	}
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum AnimationComponent {
+	Rotation(RotationAnimation),
+	Slider,
+}
+
+#[derive(Serialize, Deserialize, Debug, Component, Clone, Copy)]
+pub struct RotationAnimation {
+	pub axis: Vec3,
+	pub speed: f32,
+}
+
+impl AnimationComponent {
+	pub fn apply(&self, commands: &mut EntityCommands) {
+		match self {
+			AnimationComponent::Rotation(comp) => {
+				commands.insert(comp.clone());
+			}
+			AnimationComponent::Slider => todo!(),
+		};
+	}
+}

game/units/Cargo.toml

@@ -4,19 +4,21 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.14.0"
+bevy = "0.16.0"
 world_generation = { path = "../../engine/world_generation" }
 shared = { path = "../shared" }
-bevy_rapier3d = "0.27.0"
+bevy_rapier3d = "0.29.0"
 serde = { version = "1.0.204", features = ["derive"] }
 asset_loader = { path = "../../engine/asset_loader" }
 serde_json = "1.0.120"
 ron = "0.8.1"
-bevy_asset_loader = { version = "0.21.0", features = [
+bevy_asset_loader = { version = "0.23.0-rc.3", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }
 quadtree_rs = "0.1.3"
+pathfinding = "4.11.0"
+ordered-float = "4.3.0"
 
 [features]
-tracing = []
+tracing = ["bevy/trace_tracy"]

game/units/src/components.rs

@@ -1,5 +1,6 @@
 use bevy::{ecs::world::CommandQueue, prelude::*, tasks::Task};
 use serde::{Deserialize, Serialize};
+use world_generation::hex_utils::HexCoord;
 
 #[derive(Component, Debug)]
 pub struct Unit;
@@ -19,10 +20,12 @@ pub enum UnitDomain {
 }
 
 #[derive(Component, Debug)]
-pub struct Target(pub Vec3);
+pub struct Target(pub HexCoord);
 
 #[derive(Component, Debug)]
 pub struct Path(pub Vec<Vec3>, pub usize);
 
 #[derive(Component, Debug)]
-pub struct PathTask(pub Task<CommandQueue>);
+pub struct PathTask(pub Task<Option<CommandQueue>>);
+#[derive(Component, Debug)]
+pub struct PathTaskPending(pub usize);

game/units/src/lib.rs

@@ -1,5 +1,10 @@
+use bevy::reflect::Reflect;
+use serde::{Deserialize, Serialize};
+
 pub mod assets;
 pub mod components;
+pub mod nav_data;
+pub mod resources;
 #[cfg(debug_assertions)]
 pub mod units_debug_plugin;
 pub mod units_plugin;

game/units/src/nav_data.rs

@@ -0,0 +1,100 @@
+use bevy::prelude::*;
+use ordered_float::OrderedFloat;
+use world_generation::{hex_utils::HexCoord, prelude::Map};
+
+#[derive(Clone, Resource)]
+pub struct NavData {
+	pub tiles: Vec<NavTile>,
+	pub map_height: usize,
+	pub map_width: usize,
+}
+
+impl NavData {
+	pub fn get_neighbors(&self, coord: &HexCoord) -> Vec<(HexCoord, OrderedFloat<f32>)> {
+		let mut neighbors = Vec::with_capacity(6);
+		let cur_height = self.get_height(coord);
+		for i in 0..6 {
+			let n = coord.get_neighbor(i);
+			if !self.is_in_bounds(&n) {
+				continue;
+			}
+			let n_height = self.get_height(&n);
+			neighbors.push((n, OrderedFloat((cur_height - n_height).abs().powi(2))));
+		}
+		return neighbors;
+	}
+	pub fn get(&self, coord: &HexCoord) -> &NavTile {
+		return &self.tiles[coord.to_index(self.map_width)];
+	}
+
+	pub fn get_height(&self, coord: &HexCoord) -> f32 {
+		return self.tiles[coord.to_index(self.map_width)].height;
+	}
+
+	pub fn is_in_bounds(&self, pos: &HexCoord) -> bool {
+		return pos.is_in_bounds(self.map_height, self.map_width);
+	}
+
+	pub fn build(map: &Map) -> NavData {
+		#[cfg(feature = "tracing")]
+		let _path_span = info_span!("Build Nav Data").entered();
+		let mut tiles = Vec::with_capacity(map.get_tile_count());
+		let h = map.get_tile_height();
+		let w = map.get_tile_width();
+		for y in 0..h {
+			for x in 0..w {
+				let coord = HexCoord::from_grid_pos(x, y);
+				let height = map.sample_height(&coord);
+				let tile = NavTile {
+					coord,
+					height,
+					move_cost: 1.0,
+				};
+				tiles.push(tile);
+			}
+		}
+
+		return NavData {
+			tiles,
+			map_width: w,
+			map_height: h,
+		};
+	}
+
+	pub fn update(&mut self, map: &Map) {
+		#[cfg(feature = "tracing")]
+		let _path_span = info_span!("Update Nav Data").entered();
+		let h = map.get_tile_height();
+		let w = map.get_tile_width();
+		for y in 0..h {
+			for x in 0..w {
+				let coord = HexCoord::from_grid_pos(x, y);
+				let height = map.sample_height(&coord);
+				let tile = NavTile {
+					coord,
+					height,
+					move_cost: 1.0,
+				};
+				self.tiles[y * w + x] = tile;
+			}
+		}
+	}
+	pub fn update_tile(&mut self, coord: &HexCoord, height: f32, move_cost: f32) {
+		let tile = &mut self.tiles[coord.to_index(self.map_width)];
+		tile.move_cost = move_cost;
+		tile.height = height;
+	}
+}
+
+#[derive(Clone)]
+pub struct NavTile {
+	pub height: f32,
+	pub move_cost: f32,
+	pub coord: HexCoord,
+}
+
+impl NavTile {
+	pub fn calculate_heuristic(&self, to: &HexCoord) -> OrderedFloat<f32> {
+		return (self.coord.distance(to) as f32).into();
+	}
+}

game/units/src/resources.rs

@@ -0,0 +1,4 @@
+use bevy::prelude::*;
+
+#[derive(Resource, Debug, Default)]
+pub struct PathBatchId(pub usize);

game/units/src/units_debug_plugin.rs

@@ -1,10 +1,7 @@
-use std::f32::consts::E;
-
 use bevy::prelude::*;
 use shared::{resources::TileUnderCursor, sets::GameplaySet, states::AssetLoadState};
-use world_generation::{heightmap, prelude::Map};
 
-use crate::components::{LandUnit, Target, Unit};
+use crate::components::{LandUnit, Path, Target, Unit};
 
 pub struct UnitsDebugPlugin;
 
@@ -13,6 +10,7 @@ impl Plugin for UnitsDebugPlugin {
 		app.add_systems(Update, init.run_if(in_state(AssetLoadState::Loading)));
 
 		app.add_systems(Update, (spawn_test_unit, set_unit_target).in_set(GameplaySet));
+		app.add_systems(FixedUpdate, (visualize_paths).in_set(GameplaySet));
 	}
 }
 
@@ -36,11 +34,7 @@ fn spawn_test_unit(
 	if let Some(contact) = tile_under_cursor.0 {
 		info!("Spawning Test Unit");
 		commands.spawn((
-			PbrBundle {
-				transform: Transform::from_translation(contact.surface),
-				mesh: unit.0.clone(),
-				..default()
-			},
+			(Transform::from_translation(contact.surface), Mesh3d(unit.0.clone())),
 			Unit,
 			LandUnit,
 		));
@@ -60,7 +54,25 @@ fn set_unit_target(
 		for e in units.iter() {
 			info!("Setting Target");
 			let mut e = commands.entity(e);
-			e.insert(Target(contact.surface));
+			e.insert(Target(contact.tile));
+		}
+	}
+}
+
+fn visualize_paths(units: Query<&Path, With<Unit>>, mut gizmos: Gizmos) {
+	for path in units.iter() {
+		if path.1 > path.0.len() {
+			continue;
+		}
+		for node in 1..path.0.len() {
+			let from = path.0[node];
+			let to = path.0[node - 1];
+			let color = if node > path.1 {
+				LinearRgba::rgb(1.0, 0.5, 0.0)
+			} else {
+				LinearRgba::rgb(1.0, 0.5, 1.5)
+			};
+			gizmos.line(from + Vec3::Y * 0.1, to + Vec3::Y * 0.1, color);
 		}
 	}
 }

game/units/src/units_plugin.rs

@@ -1,34 +1,54 @@
-use bevy::{
-	ecs::world::CommandQueue, prelude::*, tasks::AsyncComputeTaskPool, transform::commands, utils::futures,
-	window::PrimaryWindow,
-};
-use bevy_asset_loader::loading_state::{
-	config::{ConfigureLoadingState, LoadingStateConfig},
-	LoadingStateAppExt,
-};
-use shared::{resources::TileUnderCursor, sets::GameplaySet, states::AssetLoadState};
-use world_generation::{hex_utils::HexCoord, prelude::Map};
+use std::collections::HashMap;
 
+use bevy::{ecs::world::CommandQueue, prelude::*, tasks::AsyncComputeTaskPool, utils::futures};
+use pathfinding::prelude::astar;
+use shared::{events::TileModifiedEvent, resources::TileUnderCursor, sets::GameplaySet};
+use world_generation::{hex_utils::HexCoord, prelude::Map, states::GeneratorState};
+
+#[cfg(debug_assertions)]
+use crate::units_debug_plugin::UnitsDebugPlugin;
 use crate::{
-	assets::{unit_asset::UnitAssetPlugin, unit_database::UnitDatabase},
-	components::{Path, PathTask, Target, Unit},
-	units_debug_plugin::UnitsDebugPlugin,
+	assets::unit_asset::UnitAssetPlugin,
+	components::{Path, PathTask, PathTaskPending, Target, Unit},
+	nav_data::NavData,
+	resources::PathBatchId,
 };
 
 pub struct UnitsPlugin;
 
 impl Plugin for UnitsPlugin {
 	fn build(&self, app: &mut App) {
+		app.init_resource::<PathBatchId>();
 		app.add_plugins(UnitAssetPlugin);
 
 		#[cfg(debug_assertions)]
 		app.add_plugins(UnitsDebugPlugin);
 
 		// app.configure_loading_state(LoadingStateConfig::new(AssetLoadState::Loading).load_collection::<UnitDatabase>());
+		app.add_systems(PostUpdate, build_navdata.run_if(in_state(GeneratorState::SpawnMap)));
 
 		app.add_systems(Update, units_control.in_set(GameplaySet));
-		app.add_systems(Update, move_unit.in_set(GameplaySet));
-		app.add_systems(FixedPreUpdate, (calculate_path, resolve_path_task).in_set(GameplaySet));
+		app.add_systems(Update, (move_unit, update_navdata).in_set(GameplaySet));
+		app.add_systems(
+			FixedPreUpdate,
+			(dispatch_path_requests, resolve_path_task).in_set(GameplaySet),
+		);
+	}
+}
+
+fn build_navdata(mut commands: Commands, map: Res<Map>) {
+	let nav_data = NavData::build(&map);
+	commands.insert_resource(nav_data);
+}
+
+fn update_navdata(mut tile_updates: EventReader<TileModifiedEvent>, mut nav_data: ResMut<NavData>) {
+	for event in tile_updates.read() {
+		match event {
+			TileModifiedEvent::HeightChanged(coord, new_height) => {
+				nav_data.update_tile(coord, *new_height, 1.0);
+			}
+			_ => (),
+		}
 	}
 }
 
@@ -51,7 +71,7 @@ fn move_unit(
 			path.1 += 1;
 			continue;
 		}
-		let vel = d.normalize() * 10.0 * time.delta_seconds();
+		let vel = d.normalize() * 10.0 * time.delta_secs();
 		t.translation += vel;
 		let coord = HexCoord::from_world_pos(t.translation);
 		if map.is_in_bounds(&coord) {
@@ -60,35 +80,155 @@ fn move_unit(
 	}
 }
 
-fn calculate_path(
-	units: Query<(&Transform, &Target, Entity), (With<Unit>, Without<PathTask>)>,
+fn dispatch_path_requests(
+	units: Query<(&Transform, &Target, Entity), With<Unit>>,
 	map: Res<Map>,
+	nav_data: Res<NavData>,
+	mut batch_id: ResMut<PathBatchId>,
 	mut commands: Commands,
 ) {
-	let pool = AsyncComputeTaskPool::get();
+	if units.is_empty() {
+		return;
+	}
+	let mut groups: HashMap<HexCoord, Vec<PathRequest>> = HashMap::new();
+
+	#[cfg(feature = "tracing")]
+	let _group_span = info_span!("Grouping").entered();
 	for (transform, target, entity) in units.iter() {
-		let from = transform.translation;
-		let to = target.0;
+		let req = PathRequest {
+			entity,
+			from: HexCoord::from_world_pos(transform.translation),
+		};
+		if let Some(group) = groups.get_mut(&target.0) {
+			group.push(req);
+		} else {
+			groups.insert(target.0, vec![req]);
+		}
+	}
+	#[cfg(feature = "tracing")]
+	drop(_group_span);
 
-		let task = pool.spawn(async move {
+	let pool = AsyncComputeTaskPool::get();
+	for (target, units) in groups {
+		let id = batch_id.0;
+		batch_id.0 += 1;
+
+		for req in &units {
+			commands
+				.entity(req.entity)
+				.insert(PathTaskPending(id))
+				.remove::<Target>();
+		}
+
+		let destinations = get_end_points(&target, units.len(), &map);
+		let req = BatchPathRequest::new(units, destinations);
+
+		#[cfg(feature = "tracing")]
+		let _clone_span = info_span!("Nav Data Clone").entered();
+		let local_nav_data = nav_data.clone();
+		#[cfg(feature = "tracing")]
+		drop(_clone_span);
+
+		let batch_task = pool.spawn(async move {
+			let mut i = 0;
 			let mut queue = CommandQueue::default();
+			for entitiy_req in req.entities {
+				let dst = req.destination[i];
+				i += 1;
+				#[cfg(feature = "tracing")]
+				let _path_span = info_span!("Path Finding").entered();
+				if let Some(path) = calculate_path(&entitiy_req.from, &dst, &local_nav_data) {
+					queue.push(move |world: &mut World| {
+						let mut unit_e = world.entity_mut(entitiy_req.entity);
 
-			queue.push(move |world: &mut World| {
-				//todo: calculate path
-				world.entity_mut(entity).insert(Path(vec![from, to], 0));
-			});
-			return queue;
+						if let Some(pending_task) = unit_e.get::<PathTaskPending>() {
+							if pending_task.0 == id {
+								unit_e.insert(path);
+								unit_e.remove::<PathTaskPending>();
+							}
+						}
+					});
+				}
+			}
+			if queue.is_empty() {
+				return None;
+			}
+			return Some(queue);
 		});
-
-		commands.entity(entity).insert(PathTask(task)).remove::<Target>();
+		commands.spawn(PathTask(batch_task));
 	}
 }
 
-fn resolve_path_task(mut tasks: Query<(&mut PathTask, Entity), With<Unit>>, mut commands: Commands) {
+fn get_end_points(coord: &HexCoord, count: usize, map: &Map) -> Vec<HexCoord> {
+	let mut result = Vec::with_capacity(count);
+	if count == 1 {
+		return vec![*coord];
+	}
+	result.push(*coord);
+	let mut r = 1;
+	while result.len() < count {
+		let tiles = HexCoord::select_ring(coord, r);
+		let needed = count - result.len();
+		if needed >= tiles.len() {
+			for t in tiles {
+				if map.is_in_bounds(&t) {
+					result.push(t);
+				}
+			}
+		} else {
+			for i in 0..needed {
+				let t = tiles[i];
+				if map.is_in_bounds(&t) {
+					result.push(t);
+				}
+			}
+		}
+		r += 1;
+	}
+
+	return result;
+}
+
+fn resolve_path_task(mut tasks: Query<(&mut PathTask, Entity)>, mut commands: Commands) {
 	for (mut task, entity) in tasks.iter_mut() {
-		if let Some(mut c) = futures::check_ready(&mut task.0) {
-			commands.append(&mut c);
-			commands.entity(entity).remove::<PathTask>();
+		if let Some(c) = futures::check_ready(&mut task.0) {
+			if let Some(mut queue) = c {
+				commands.append(&mut queue);
+			}
+			commands.entity(entity).despawn();
 		}
 	}
 }
+
+fn calculate_path(from: &HexCoord, to: &HexCoord, nav: &NavData) -> Option<Path> {
+	let path = astar(
+		from,
+		|n| nav.get_neighbors(n),
+		|n| nav.get(n).calculate_heuristic(to),
+		|n| n == to,
+	);
+	if let Some((nodes, _cost)) = path {
+		let result: Vec<_> = nodes.iter().map(|f| f.to_world(nav.get_height(f))).collect();
+		return Some(Path(result, 1));
+	}
+	return None;
+}
+
+struct PathRequest {
+	pub entity: Entity,
+	pub from: HexCoord,
+}
+
+struct BatchPathRequest {
+	pub entities: Vec<PathRequest>,
+	pub destination: Vec<HexCoord>,
+}
+
+impl BatchPathRequest {
+	pub fn new(entities: Vec<PathRequest>, dst: Vec<HexCoord>) -> Self {
+		return Self {
+			destination: dst,
+			entities,
+		};
+	}
+}