From e5b2e51a29f39535eee7bf582c023633f2926d6f Mon Sep 17 00:00:00 2001
From: Arkitu <85173315+Arkitu@users.noreply.github.com>
Date: Sun, 22 Dec 2024 22:19:07 +0100
Subject: [PATCH] map color update
---
src/map.rs | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/map.rs b/src/map.rs
index 9e68047..b3d86cc 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -65,7 +65,7 @@ fn setup(
} else if z <= 0.52 {
CellKind::Beach
} else if z < 0.8 {
- CellKind::Dirt
+ CellKind::Grass
} else {
CellKind::Stone
};
@@ -77,7 +77,7 @@ fn setup(
let mut colors = Vec::new();
let mut indices = Vec::new();
- for (c, cd) in voronoi.iter_cells().zip(cells_data.iter_mut()).filter(|(_,cd)| cd.kind != CellKind::Forest) {
+ for (c, mut cd) in voronoi.iter_cells().zip(cells_data).filter(|(_,cd)| cd.kind != CellKind::Forest) {
let mut color = cd.color();
// if c.site() == selected_tile {
// color[0] = (color[0]+0.4).clamp(0., 1.);
@@ -95,6 +95,7 @@ fn setup(
indices.extend_from_slice(&[i as u32, (i+v) as u32, (i+v+1) as u32]);
cd.vertices.extend_from_slice(&[i, i+v, i+v+1]);
}
+ cmds.spawn(cd);
}
let mesh = Mesh::new(PrimitiveTopology::TriangleList, RenderAssetUsages::default())
@@ -121,16 +122,19 @@ fn setup(
}
fn update(
- cells: Query<&CellData>,
+ mut cells: Query<&mut CellData>,
mut map: Query<(&Mesh2d, &mut MapColors), With<MapMarker>>,
mut meshes: ResMut<Assets<Mesh>>
) {
let (mesh, mut cols) = map.single_mut();
if let Some(mesh) = meshes.get_mut(mesh) {
// let cols = mesh.attribute_mut(Mesh::ATTRIBUTE_COLOR).unwrap();
- for cd in cells.iter() {
+ for mut cd in cells.iter_mut() {
+ // info!(cd.resource);
+ cd.update();
+ // dbg!(cd.resource);
let col = cd.color();
- for id in cd.vertices.iter() {
+ for id in cd.vertices.iter() {
cols.0[*id] = col.clone();
}
}