add tower selection UI, cancellable actions, and pause UI
This commit is contained in:
parent
138a524abd
commit
918b4884b2
18 changed files with 468 additions and 23 deletions
|
|
@ -3,20 +3,25 @@
|
|||
#![allow(clippy::too_many_arguments)]
|
||||
|
||||
use bevy::prelude::*;
|
||||
use building::{
|
||||
ActiveBuildingPreview, BuildingInfo, BuildingPreview, PlaceBuilding, PlacedBuildings,
|
||||
};
|
||||
use input::Inputs;
|
||||
use building::{BuildingInfo, BuildingPreview, PlaceBuilding, PlacedBuildings};
|
||||
use input::{Cancellable, Inputs, actions::InputAction};
|
||||
use physics::Ground;
|
||||
|
||||
pub struct BuildingPlacementPlugin;
|
||||
|
||||
impl Plugin for BuildingPlacementPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.add_systems(Update, init);
|
||||
app.add_systems(Update, (init, cancel_preview, select_preview).chain())
|
||||
.add_event::<SelectBuildingPreview>();
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component, Default)]
|
||||
pub struct ActiveBuildingPreview(pub IVec3);
|
||||
|
||||
#[derive(Event)]
|
||||
pub struct SelectBuildingPreview(pub Option<Entity>);
|
||||
|
||||
fn init(mut commands: Commands, query: Single<Entity, With<Ground>>, mut setup: Local<bool>) {
|
||||
if *setup {
|
||||
return;
|
||||
|
|
@ -29,6 +34,16 @@ fn init(mut commands: Commands, query: Single<Entity, With<Ground>>, mut setup:
|
|||
info!("added building placement observers!");
|
||||
}
|
||||
|
||||
fn cancel_preview(
|
||||
mut writer: EventWriter<SelectBuildingPreview>,
|
||||
query: Query<(), (With<ActiveBuildingPreview>, With<Cancellable>)>,
|
||||
inputs: Res<Inputs<Update>>,
|
||||
) {
|
||||
if !query.is_empty() && inputs.just_pressed(InputAction::Cancel) {
|
||||
writer.write(SelectBuildingPreview(None));
|
||||
}
|
||||
}
|
||||
|
||||
fn move_preview(
|
||||
trigger: Trigger<Pointer<Move>>,
|
||||
preview: Single<(&mut Transform, &mut ActiveBuildingPreview, &BuildingPreview)>,
|
||||
|
|
@ -60,8 +75,9 @@ fn place_preview(
|
|||
info_query: Query<&BuildingInfo>,
|
||||
placed_buildings: Res<PlacedBuildings>,
|
||||
mut place_writer: EventWriter<PlaceBuilding>,
|
||||
mut select_writer: EventWriter<SelectBuildingPreview>,
|
||||
) {
|
||||
if !inputs.pressed(input::actions::InputAction::PlaceTower) {
|
||||
if !inputs.pressed(InputAction::PlaceTower) {
|
||||
return;
|
||||
}
|
||||
let (preview, active) = query.into_inner();
|
||||
|
|
@ -73,8 +89,42 @@ fn place_preview(
|
|||
info!("invalid placement!!!!!");
|
||||
return;
|
||||
}
|
||||
if !inputs.pressed(InputAction::MultiPlaceTower) {
|
||||
select_writer.write(SelectBuildingPreview(None));
|
||||
}
|
||||
place_writer.write(PlaceBuilding {
|
||||
info: preview.info,
|
||||
location: active.0,
|
||||
});
|
||||
}
|
||||
|
||||
fn select_preview(
|
||||
mut reader: EventReader<SelectBuildingPreview>,
|
||||
mut old_query: Query<(Entity, &mut Visibility), With<ActiveBuildingPreview>>,
|
||||
new_query: Query<(), With<BuildingPreview>>,
|
||||
mut commands: Commands,
|
||||
) {
|
||||
let Some(SelectBuildingPreview(opt_entity)) = reader.read().last() else {
|
||||
return;
|
||||
};
|
||||
for (entity, mut vis) in old_query.iter_mut() {
|
||||
if *opt_entity != Some(entity) {
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<(ActiveBuildingPreview, Cancellable)>();
|
||||
*vis = Visibility::Hidden;
|
||||
}
|
||||
}
|
||||
let Some(new_entity) = opt_entity else {
|
||||
return;
|
||||
};
|
||||
if !new_query.contains(*new_entity) {
|
||||
error!("tried to select a building without a preview!");
|
||||
return;
|
||||
}
|
||||
commands.entity(*new_entity).insert((
|
||||
Visibility::Visible,
|
||||
ActiveBuildingPreview::default(),
|
||||
Cancellable,
|
||||
));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue