show range indicator when placing tower, cleanup tower info stats

This commit is contained in:
Jim 2025-09-01 21:37:18 -04:00
parent e6b04bbdd1
commit 3a25a1bd87
Signed by: jim
GPG key ID: 3D7D94BA53088BF4
9 changed files with 106 additions and 49 deletions

View file

@ -8,6 +8,7 @@ bevy = { workspace = true }
combat = { path = "../combat" }
input = { path = "../input" }
building = { path = "../building" }
[lints]
workspace = true

View file

@ -9,6 +9,7 @@ use bevy::{
pbr::{NotShadowCaster, NotShadowReceiver},
prelude::*,
};
use building::{ActiveBuildingPreview, BuildingPreview};
use combat::Range;
use input::Selected;
@ -40,6 +41,7 @@ pub struct DisplayCustomRangeIndicator;
#[derive(Resource)]
struct RangeResources {
base_mesh: Handle<Mesh>,
base_material: Handle<StandardMaterial>,
}
impl CustomRangeIndicator {
@ -114,6 +116,7 @@ fn init(
let mesh = meshes.add(Extrusion::new(Annulus::new(1000. - 0.1, 1000.), 1.0));
commands.insert_resource(RangeResources {
base_mesh: mesh.clone(),
base_material: material.clone(),
});
let selected_indicator = create_indicator(&mut commands, material, mesh);
commands
@ -127,8 +130,24 @@ fn display(
(Entity, &Range, &GlobalTransform),
(With<Selected>, Without<CustomRangeIndicator>),
>,
preview_query: Query<
(
Entity,
&BuildingPreview,
&GlobalTransform,
Option<&CustomRangeIndicator>,
),
With<ActiveBuildingPreview>,
>,
range_query: Query<&Range>,
selected_indicator_query: Single<
(&mut Transform, &mut Visibility, &mut Indicator, &mut Mesh3d),
(
&mut Transform,
&mut Visibility,
&mut Indicator,
&mut Mesh3d,
&mut MeshMaterial3d<StandardMaterial>,
),
With<SelectedIndicator>,
>,
custom_entity_query: Query<(
@ -143,7 +162,7 @@ fn display(
(&mut Transform, &mut Visibility, &mut Indicator, &mut Mesh3d),
Without<SelectedIndicator>,
>,
resources: Res<RangeResources>,
mut meshes: ResMut<Assets<Mesh>>,
) {
for (
@ -178,18 +197,37 @@ fn display(
tf.translation = gtf.translation().with_y(1.0);
}
//update selected entity
//update selected entity (or preview indicator)
{
let (mut tf, mut vis, mut indicator, mut mesh) = selected_indicator_query.into_inner();
let Ok((entity, range, gtf)) = selected_query.single() else {
*vis = Visibility::Hidden;
return;
};
let (mut tf, mut vis, mut indicator, mut mesh, mut mesh_material) =
selected_indicator_query.into_inner();
let (entity, range, gtf, material) =
if let Ok((entity, preview, gtf, opt_custom_indicator)) = preview_query.single() {
let Ok(range) = range_query.get(preview.info) else {
*vis = Visibility::Hidden;
return;
};
(
entity,
range,
gtf,
opt_custom_indicator
.map(|CustomRangeIndicator { material, .. }| material.clone())
.unwrap_or(resources.base_material.clone()),
)
} else if let Ok((entity, range, gtf)) = selected_query.single() {
(entity, range, gtf, resources.base_material.clone())
} else {
*vis = Visibility::Hidden;
return;
};
if entity != indicator.0 || indicator.1 != range.0 {
indicator.0 = entity;
indicator.1 = range.0;
// range or entity changed, generate new mesh
mesh.0 = meshes.add(Extrusion::new(Annulus::new(range.0 - 0.1, range.0), 1.0));
mesh_material.0 = material;
}
*vis = Visibility::Inherited;
tf.translation = gtf.translation().with_y(1.0);