rework building placement to use physics system
This commit is contained in:
parent
56a4f8b597
commit
9c4787f5e2
3 changed files with 53 additions and 122 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
(
|
(
|
||||||
map: {
|
map: {
|
||||||
KeyCode(ShiftLeft): [
|
MouseButton(Middle): [
|
||||||
MultiPlaceTower,
|
CameraOrbitEnable,
|
||||||
],
|
],
|
||||||
MouseButton(Right): [
|
MouseButton(Right): [
|
||||||
PlaceTower,
|
PlaceTower,
|
||||||
|
|
@ -9,8 +9,8 @@
|
||||||
MouseButton(Left): [
|
MouseButton(Left): [
|
||||||
CameraPanEnable,
|
CameraPanEnable,
|
||||||
],
|
],
|
||||||
MouseButton(Middle): [
|
KeyCode(ShiftLeft): [
|
||||||
CameraOrbitEnable,
|
MultiPlaceTower,
|
||||||
],
|
],
|
||||||
MouseScroll: [
|
MouseScroll: [
|
||||||
CameraZoom,
|
CameraZoom,
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ pub struct BuildingPlugin;
|
||||||
impl Plugin for BuildingPlugin {
|
impl Plugin for BuildingPlugin {
|
||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
app.init_resource::<BuildingTypes>()
|
app.init_resource::<BuildingTypes>()
|
||||||
.init_resource::<PlacedBuildings>()
|
|
||||||
.add_event::<PlaceBuilding>()
|
.add_event::<PlaceBuilding>()
|
||||||
.add_systems(FixedUpdate, place_building.in_set(GameSystemSet::PostTick));
|
.add_systems(FixedUpdate, place_building.in_set(GameSystemSet::PostTick));
|
||||||
}
|
}
|
||||||
|
|
@ -33,30 +32,6 @@ pub struct Building {
|
||||||
pub info: Entity,
|
pub info: Entity,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Component)]
|
|
||||||
#[component(on_remove = on_building_removed)]
|
|
||||||
struct BuildingPosition(IVec3);
|
|
||||||
|
|
||||||
fn on_building_removed(mut world: DeferredWorld, context: HookContext) {
|
|
||||||
let (info, location) = world
|
|
||||||
.get_entity(context.entity)
|
|
||||||
.map(|e| {
|
|
||||||
(
|
|
||||||
e.components::<&Building>().info,
|
|
||||||
e.components::<&BuildingPosition>().0,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
.unwrap();
|
|
||||||
let size = world
|
|
||||||
.get_entity(info)
|
|
||||||
.unwrap()
|
|
||||||
.components::<&BuildingInfo>()
|
|
||||||
.size;
|
|
||||||
world
|
|
||||||
.resource_mut::<PlacedBuildings>()
|
|
||||||
.remove_building(location, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Component, Clone)]
|
#[derive(Component, Clone)]
|
||||||
#[require(Name, Cost, UpgradeTree)]
|
#[require(Name, Cost, UpgradeTree)]
|
||||||
#[component(on_add = register_building_info)]
|
#[component(on_add = register_building_info)]
|
||||||
|
|
@ -68,6 +43,15 @@ pub struct BuildingInfo {
|
||||||
pub unlocked: bool,
|
pub unlocked: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl BuildingInfo {
|
||||||
|
pub fn get_placed_collider_and_position(&self, pos: Vec3) -> (Collider, Vec3) {
|
||||||
|
let size_v3 = self.size.as_vec3();
|
||||||
|
let collider = Collider::cuboid(size_v3.x, size_v3.y, size_v3.z);
|
||||||
|
let position = pos + Vec3::new(0., size_v3.y / 2., 0.);
|
||||||
|
(collider, position)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Component)]
|
#[derive(Component)]
|
||||||
pub struct BuildingPreview {
|
pub struct BuildingPreview {
|
||||||
pub info: Entity,
|
pub info: Entity,
|
||||||
|
|
@ -114,76 +98,6 @@ pub struct PlacedBuilding {
|
||||||
pub instance: Entity,
|
pub instance: Entity,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Resource, Default)]
|
|
||||||
pub struct PlacedBuildings {
|
|
||||||
pub map: HashMap<IVec3, PlacedBuilding>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PlacedBuildings {
|
|
||||||
// todo - update these to account for building being in the center
|
|
||||||
pub fn placement_valid(&self, location: IVec3, info: &BuildingInfo) -> bool {
|
|
||||||
for x in 0..info.size.x {
|
|
||||||
for y in 0..info.size.y {
|
|
||||||
for z in 0..info.size.z {
|
|
||||||
if self
|
|
||||||
.map
|
|
||||||
.contains_key(&(location + IVec3::new(x as i32, y as i32, z as i32)))
|
|
||||||
{
|
|
||||||
//shouldn't happen
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn place_building(
|
|
||||||
&mut self,
|
|
||||||
location: IVec3,
|
|
||||||
info: &BuildingInfo,
|
|
||||||
info_entity: Entity,
|
|
||||||
instance_entity: Entity,
|
|
||||||
) {
|
|
||||||
for x in 0..info.size.x {
|
|
||||||
for y in 0..info.size.y {
|
|
||||||
for z in 0..info.size.z {
|
|
||||||
if self
|
|
||||||
.map
|
|
||||||
.insert(
|
|
||||||
location + IVec3::new(x as i32, y as i32, z as i32),
|
|
||||||
PlacedBuilding {
|
|
||||||
info: info_entity,
|
|
||||||
instance: instance_entity,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.is_some()
|
|
||||||
{
|
|
||||||
//shouldn't happen
|
|
||||||
error!("placed building on old building!!! RIP");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn remove_building(&mut self, location: IVec3, size: UVec3) {
|
|
||||||
for x in 0..size.x {
|
|
||||||
for y in 0..size.y {
|
|
||||||
for z in 0..size.z {
|
|
||||||
if self
|
|
||||||
.map
|
|
||||||
.remove(&(location + IVec3::new(x as i32, y as i32, z as i32)))
|
|
||||||
.is_none()
|
|
||||||
{
|
|
||||||
//shouldn't happen
|
|
||||||
error!("removed building where there wasn't one!!!! RIP");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Event)]
|
#[derive(Event)]
|
||||||
pub struct PlaceBuilding {
|
pub struct PlaceBuilding {
|
||||||
pub info: Entity,
|
pub info: Entity,
|
||||||
|
|
@ -195,12 +109,31 @@ pub struct PopulatePlacedBuilding {
|
||||||
pub info: Entity,
|
pub info: Entity,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn valid_placement(
|
||||||
|
spatial_query: &SpatialQuery,
|
||||||
|
collider_query: &Query<&Building>,
|
||||||
|
size: Vec3,
|
||||||
|
position: Vec3,
|
||||||
|
) -> bool {
|
||||||
|
!spatial_query
|
||||||
|
.shape_intersections(
|
||||||
|
// shrink the collider a bit to allow for buildings right next to each other
|
||||||
|
&Collider::cuboid(size.x - 0.1, size.y - 0.1, size.z - 0.1),
|
||||||
|
position,
|
||||||
|
Quat::IDENTITY,
|
||||||
|
&SpatialQueryFilter::from_mask(Team::Core.collision_layers().memberships),
|
||||||
|
)
|
||||||
|
.iter()
|
||||||
|
.any(|b| collider_query.contains(*b))
|
||||||
|
}
|
||||||
|
|
||||||
fn place_building(
|
fn place_building(
|
||||||
mut reader: EventReader<PlaceBuilding>,
|
mut reader: EventReader<PlaceBuilding>,
|
||||||
mut building_map: ResMut<PlacedBuildings>,
|
|
||||||
mut commands: Commands,
|
mut commands: Commands,
|
||||||
mut resources: ResMut<Resources>,
|
mut resources: ResMut<Resources>,
|
||||||
info_query: Query<(&BuildingInfo, &Cost, &Name), With<UpgradeTree>>,
|
info_query: Query<(&BuildingInfo, &Cost, &Name), With<UpgradeTree>>,
|
||||||
|
building_query: Query<&Building>,
|
||||||
|
spatial_query: SpatialQuery,
|
||||||
) {
|
) {
|
||||||
for PlaceBuilding {
|
for PlaceBuilding {
|
||||||
info: info_entity,
|
info: info_entity,
|
||||||
|
|
@ -211,25 +144,26 @@ fn place_building(
|
||||||
error!("tried to place building without info or required components!");
|
error!("tried to place building without info or required components!");
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
if !building_map.placement_valid(*location, info) {
|
|
||||||
error!("invalid building placement at {:?}, rejecting", location);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if !resources.buy(&cost) {
|
if !resources.buy(&cost) {
|
||||||
info!("not enough money to buy tower!");
|
info!("not enough money to buy tower!");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let size_v3 = info.size.as_vec3();
|
let size_v3 = info.size.as_vec3();
|
||||||
|
let (collider, position) = info.get_placed_collider_and_position(location.as_vec3());
|
||||||
|
if !valid_placement(&spatial_query, &building_query, size_v3, position) {
|
||||||
|
error!("tried to place building colliding with other building");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
let instance = commands
|
let instance = commands
|
||||||
.spawn((
|
.spawn((
|
||||||
// adjust model up slightly so base of all towers are aligned
|
// adjust model up slightly so base of all towers are aligned
|
||||||
Transform::from_translation(location.as_vec3() + Vec3::new(0., size_v3.y / 2., 0.)),
|
Transform::from_translation(position),
|
||||||
Building {
|
Building {
|
||||||
level: 0,
|
level: 0,
|
||||||
info: *info_entity,
|
info: *info_entity,
|
||||||
},
|
},
|
||||||
BuildingPosition(*location),
|
collider,
|
||||||
Collider::cuboid(size_v3.x, size_v3.y, size_v3.z),
|
|
||||||
Mesh3d::default(),
|
Mesh3d::default(),
|
||||||
name.clone(),
|
name.clone(),
|
||||||
RigidBody::Static,
|
RigidBody::Static,
|
||||||
|
|
@ -242,7 +176,6 @@ fn place_building(
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
.id();
|
.id();
|
||||||
building_map.place_building(*location, info, *info_entity, instance);
|
|
||||||
|
|
||||||
commands.trigger_targets(PopulatePlacedBuilding { info: *info_entity }, instance);
|
commands.trigger_targets(PopulatePlacedBuilding { info: *info_entity }, instance);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,9 @@
|
||||||
#![allow(clippy::type_complexity)]
|
#![allow(clippy::type_complexity)]
|
||||||
#![allow(clippy::too_many_arguments)]
|
#![allow(clippy::too_many_arguments)]
|
||||||
|
|
||||||
|
use avian3d::prelude::SpatialQuery;
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use building::{BuildingInfo, BuildingPreview, PlaceBuilding, PlacedBuildings};
|
use building::{Building, BuildingInfo, BuildingPreview, PlaceBuilding, valid_placement};
|
||||||
use input::{Cancellable, Inputs, Selected, actions::InputAction};
|
use input::{Cancellable, Inputs, Selected, actions::InputAction};
|
||||||
use physics::Ground;
|
use physics::Ground;
|
||||||
|
|
||||||
|
|
@ -49,7 +50,8 @@ fn move_preview(
|
||||||
trigger: Trigger<Pointer<Move>>,
|
trigger: Trigger<Pointer<Move>>,
|
||||||
preview: Single<(&mut Transform, &mut ActiveBuildingPreview, &BuildingPreview)>,
|
preview: Single<(&mut Transform, &mut ActiveBuildingPreview, &BuildingPreview)>,
|
||||||
info_query: Query<&BuildingInfo>,
|
info_query: Query<&BuildingInfo>,
|
||||||
placed_buildings: Res<PlacedBuildings>,
|
building_query: Query<&Building>,
|
||||||
|
spatial_query: SpatialQuery,
|
||||||
) {
|
) {
|
||||||
let Some(dest) = trigger.event().hit.position else {
|
let Some(dest) = trigger.event().hit.position else {
|
||||||
return;
|
return;
|
||||||
|
|
@ -61,20 +63,24 @@ fn move_preview(
|
||||||
};
|
};
|
||||||
// center mouse on building
|
// center mouse on building
|
||||||
let loc = dest.round();
|
let loc = dest.round();
|
||||||
if !placed_buildings.placement_valid(loc.as_ivec3(), info) {
|
let (_, position) = info.get_placed_collider_and_position(loc);
|
||||||
|
if !valid_placement(
|
||||||
|
&spatial_query,
|
||||||
|
&building_query,
|
||||||
|
info.size.as_vec3(),
|
||||||
|
position,
|
||||||
|
) {
|
||||||
info!("invalid placement!!!!!");
|
info!("invalid placement!!!!!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
active.0 = loc.as_ivec3();
|
active.0 = loc.as_ivec3();
|
||||||
tf.translation = loc + Vec3::Y * info.size.y as f32 / 2.;
|
tf.translation = position;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn place_preview(
|
fn place_preview(
|
||||||
_trigger: Trigger<Pointer<Click>>,
|
_trigger: Trigger<Pointer<Click>>,
|
||||||
inputs: Res<Inputs<Update>>,
|
inputs: Res<Inputs<Update>>,
|
||||||
query: Single<(&BuildingPreview, &ActiveBuildingPreview)>,
|
query: Single<(&BuildingPreview, &ActiveBuildingPreview)>,
|
||||||
info_query: Query<&BuildingInfo>,
|
|
||||||
placed_buildings: Res<PlacedBuildings>,
|
|
||||||
mut place_writer: EventWriter<PlaceBuilding>,
|
mut place_writer: EventWriter<PlaceBuilding>,
|
||||||
mut select_writer: EventWriter<SelectBuildingPreview>,
|
mut select_writer: EventWriter<SelectBuildingPreview>,
|
||||||
) {
|
) {
|
||||||
|
|
@ -82,14 +88,6 @@ fn place_preview(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let (preview, active) = query.into_inner();
|
let (preview, active) = query.into_inner();
|
||||||
let Ok(info) = info_query.get(preview.info) else {
|
|
||||||
error!("building preview has no associated info!");
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
if !placed_buildings.placement_valid(active.0, info) {
|
|
||||||
info!("invalid placement!!!!!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if !inputs.pressed(InputAction::MultiPlaceTower) {
|
if !inputs.pressed(InputAction::MultiPlaceTower) {
|
||||||
select_writer.write(SelectBuildingPreview(None));
|
select_writer.write(SelectBuildingPreview(None));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue