mirror of
https://github.com/bevyengine/bevy
synced 2024-12-30 15:03:23 +00:00
015f2c69ca
# Objective Continue improving the user experience of our UI Node API in the direction specified by [Bevy's Next Generation Scene / UI System](https://github.com/bevyengine/bevy/discussions/14437) ## Solution As specified in the document above, merge `Style` fields into `Node`, and move "computed Node fields" into `ComputedNode` (I chose this name over something like `ComputedNodeLayout` because it currently contains more than just layout info. If we want to break this up / rename these concepts, lets do that in a separate PR). `Style` has been removed. This accomplishes a number of goals: ## Ergonomics wins Specifying both `Node` and `Style` is now no longer required for non-default styles Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` ## Conceptual clarity `Style` was never a comprehensive "style sheet". It only defined "core" style properties that all `Nodes` shared. Any "styled property" that couldn't fit that mold had to be in a separate component. A "real" style system would style properties _across_ components (`Node`, `Button`, etc). We have plans to build a true style system (see the doc linked above). By moving the `Style` fields to `Node`, we fully embrace `Node` as the driving concept and remove the "style system" confusion. ## Next Steps * Consider identifying and splitting out "style properties that aren't core to Node". This should not happen for Bevy 0.15. --- ## Migration Guide Move any fields set on `Style` into `Node` and replace all `Style` component usage with `Node`. Before: ```rust commands.spawn(( Node::default(), Style { width: Val::Px(100.), ..default() }, )); ``` After: ```rust commands.spawn(Node { width: Val::Px(100.), ..default() }); ``` For any usage of the "computed node properties" that used to live on `Node`, use `ComputedNode` instead: Before: ```rust fn system(nodes: Query<&Node>) { for node in &nodes { let computed_size = node.size(); } } ``` After: ```rust fn system(computed_nodes: Query<&ComputedNode>) { for computed_node in &computed_nodes { let computed_size = computed_node.size(); } } ```
416 lines
12 KiB
Rust
416 lines
12 KiB
Rust
//! This example demonstrates bounding volume intersections.
|
|
|
|
use bevy::{
|
|
color::palettes::css::*,
|
|
math::{bounding::*, ops, Isometry2d},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.init_state::<Test>()
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(update_text, spin, update_volumes, update_test_state),
|
|
)
|
|
.add_systems(
|
|
PostUpdate,
|
|
(
|
|
render_shapes,
|
|
(
|
|
aabb_intersection_system.run_if(in_state(Test::AabbSweep)),
|
|
circle_intersection_system.run_if(in_state(Test::CircleSweep)),
|
|
ray_cast_system.run_if(in_state(Test::RayCast)),
|
|
aabb_cast_system.run_if(in_state(Test::AabbCast)),
|
|
bounding_circle_cast_system.run_if(in_state(Test::CircleCast)),
|
|
),
|
|
render_volumes,
|
|
)
|
|
.chain(),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Spin;
|
|
|
|
fn spin(time: Res<Time>, mut query: Query<&mut Transform, With<Spin>>) {
|
|
for mut transform in query.iter_mut() {
|
|
transform.rotation *= Quat::from_rotation_z(time.delta_secs() / 5.);
|
|
}
|
|
}
|
|
|
|
#[derive(States, Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
|
|
enum Test {
|
|
AabbSweep,
|
|
CircleSweep,
|
|
#[default]
|
|
RayCast,
|
|
AabbCast,
|
|
CircleCast,
|
|
}
|
|
|
|
fn update_test_state(
|
|
keycode: Res<ButtonInput<KeyCode>>,
|
|
cur_state: Res<State<Test>>,
|
|
mut state: ResMut<NextState<Test>>,
|
|
) {
|
|
if !keycode.just_pressed(KeyCode::Space) {
|
|
return;
|
|
}
|
|
|
|
use Test::*;
|
|
let next = match **cur_state {
|
|
AabbSweep => CircleSweep,
|
|
CircleSweep => RayCast,
|
|
RayCast => AabbCast,
|
|
AabbCast => CircleCast,
|
|
CircleCast => AabbSweep,
|
|
};
|
|
state.set(next);
|
|
}
|
|
|
|
fn update_text(mut text: Single<&mut Text>, cur_state: Res<State<Test>>) {
|
|
if !cur_state.is_changed() {
|
|
return;
|
|
}
|
|
|
|
text.clear();
|
|
|
|
text.push_str("Intersection test:\n");
|
|
use Test::*;
|
|
for &test in &[AabbSweep, CircleSweep, RayCast, AabbCast, CircleCast] {
|
|
let s = if **cur_state == test { "*" } else { " " };
|
|
text.push_str(&format!(" {s} {test:?} {s}\n"));
|
|
}
|
|
text.push_str("\nPress space to cycle");
|
|
}
|
|
|
|
#[derive(Component)]
|
|
enum Shape {
|
|
Rectangle(Rectangle),
|
|
Circle(Circle),
|
|
Triangle(Triangle2d),
|
|
Line(Segment2d),
|
|
Capsule(Capsule2d),
|
|
Polygon(RegularPolygon),
|
|
}
|
|
|
|
fn render_shapes(mut gizmos: Gizmos, query: Query<(&Shape, &Transform)>) {
|
|
let color = GRAY;
|
|
for (shape, transform) in query.iter() {
|
|
let translation = transform.translation.xy();
|
|
let rotation = transform.rotation.to_euler(EulerRot::YXZ).2;
|
|
let isometry = Isometry2d::new(translation, Rot2::radians(rotation));
|
|
match shape {
|
|
Shape::Rectangle(r) => {
|
|
gizmos.primitive_2d(r, isometry, color);
|
|
}
|
|
Shape::Circle(c) => {
|
|
gizmos.primitive_2d(c, isometry, color);
|
|
}
|
|
Shape::Triangle(t) => {
|
|
gizmos.primitive_2d(t, isometry, color);
|
|
}
|
|
Shape::Line(l) => {
|
|
gizmos.primitive_2d(l, isometry, color);
|
|
}
|
|
Shape::Capsule(c) => {
|
|
gizmos.primitive_2d(c, isometry, color);
|
|
}
|
|
Shape::Polygon(p) => {
|
|
gizmos.primitive_2d(p, isometry, color);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Component)]
|
|
enum DesiredVolume {
|
|
Aabb,
|
|
Circle,
|
|
}
|
|
|
|
#[derive(Component, Debug)]
|
|
enum CurrentVolume {
|
|
Aabb(Aabb2d),
|
|
Circle(BoundingCircle),
|
|
}
|
|
|
|
fn update_volumes(
|
|
mut commands: Commands,
|
|
query: Query<
|
|
(Entity, &DesiredVolume, &Shape, &Transform),
|
|
Or<(Changed<DesiredVolume>, Changed<Shape>, Changed<Transform>)>,
|
|
>,
|
|
) {
|
|
for (entity, desired_volume, shape, transform) in query.iter() {
|
|
let translation = transform.translation.xy();
|
|
let rotation = transform.rotation.to_euler(EulerRot::YXZ).2;
|
|
let isometry = Isometry2d::new(translation, Rot2::radians(rotation));
|
|
match desired_volume {
|
|
DesiredVolume::Aabb => {
|
|
let aabb = match shape {
|
|
Shape::Rectangle(r) => r.aabb_2d(isometry),
|
|
Shape::Circle(c) => c.aabb_2d(isometry),
|
|
Shape::Triangle(t) => t.aabb_2d(isometry),
|
|
Shape::Line(l) => l.aabb_2d(isometry),
|
|
Shape::Capsule(c) => c.aabb_2d(isometry),
|
|
Shape::Polygon(p) => p.aabb_2d(isometry),
|
|
};
|
|
commands.entity(entity).insert(CurrentVolume::Aabb(aabb));
|
|
}
|
|
DesiredVolume::Circle => {
|
|
let circle = match shape {
|
|
Shape::Rectangle(r) => r.bounding_circle(isometry),
|
|
Shape::Circle(c) => c.bounding_circle(isometry),
|
|
Shape::Triangle(t) => t.bounding_circle(isometry),
|
|
Shape::Line(l) => l.bounding_circle(isometry),
|
|
Shape::Capsule(c) => c.bounding_circle(isometry),
|
|
Shape::Polygon(p) => p.bounding_circle(isometry),
|
|
};
|
|
commands
|
|
.entity(entity)
|
|
.insert(CurrentVolume::Circle(circle));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn render_volumes(mut gizmos: Gizmos, query: Query<(&CurrentVolume, &Intersects)>) {
|
|
for (volume, intersects) in query.iter() {
|
|
let color = if **intersects { AQUA } else { ORANGE_RED };
|
|
match volume {
|
|
CurrentVolume::Aabb(a) => {
|
|
gizmos.rect_2d(a.center(), a.half_size() * 2., color);
|
|
}
|
|
CurrentVolume::Circle(c) => {
|
|
gizmos.circle_2d(c.center(), c.radius(), color);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Component, Deref, DerefMut, Default)]
|
|
struct Intersects(bool);
|
|
|
|
const OFFSET_X: f32 = 125.;
|
|
const OFFSET_Y: f32 = 75.;
|
|
|
|
fn setup(mut commands: Commands) {
|
|
commands.spawn(Camera2d);
|
|
commands.spawn((
|
|
Transform::from_xyz(-OFFSET_X, OFFSET_Y, 0.),
|
|
Shape::Circle(Circle::new(45.)),
|
|
DesiredVolume::Aabb,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Transform::from_xyz(0., OFFSET_Y, 0.),
|
|
Shape::Rectangle(Rectangle::new(80., 80.)),
|
|
Spin,
|
|
DesiredVolume::Circle,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Transform::from_xyz(OFFSET_X, OFFSET_Y, 0.),
|
|
Shape::Triangle(Triangle2d::new(
|
|
Vec2::new(-40., -40.),
|
|
Vec2::new(-20., 40.),
|
|
Vec2::new(40., 50.),
|
|
)),
|
|
Spin,
|
|
DesiredVolume::Aabb,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Transform::from_xyz(-OFFSET_X, -OFFSET_Y, 0.),
|
|
Shape::Line(Segment2d::new(Dir2::from_xy(1., 0.3).unwrap(), 90.)),
|
|
Spin,
|
|
DesiredVolume::Circle,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Transform::from_xyz(0., -OFFSET_Y, 0.),
|
|
Shape::Capsule(Capsule2d::new(25., 50.)),
|
|
Spin,
|
|
DesiredVolume::Aabb,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Transform::from_xyz(OFFSET_X, -OFFSET_Y, 0.),
|
|
Shape::Polygon(RegularPolygon::new(50., 6)),
|
|
Spin,
|
|
DesiredVolume::Circle,
|
|
Intersects::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
Text::default(),
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
bottom: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
fn draw_filled_circle(gizmos: &mut Gizmos, position: Vec2, color: Srgba) {
|
|
for r in [1., 2., 3.] {
|
|
gizmos.circle_2d(position, r, color);
|
|
}
|
|
}
|
|
|
|
fn draw_ray(gizmos: &mut Gizmos, ray: &RayCast2d) {
|
|
gizmos.line_2d(
|
|
ray.ray.origin,
|
|
ray.ray.origin + *ray.ray.direction * ray.max,
|
|
WHITE,
|
|
);
|
|
draw_filled_circle(gizmos, ray.ray.origin, FUCHSIA);
|
|
}
|
|
|
|
fn get_and_draw_ray(gizmos: &mut Gizmos, time: &Time) -> RayCast2d {
|
|
let ray = Vec2::new(ops::cos(time.elapsed_secs()), ops::sin(time.elapsed_secs()));
|
|
let dist = 150. + ops::sin(0.5 * time.elapsed_secs()).abs() * 500.;
|
|
|
|
let aabb_ray = Ray2d {
|
|
origin: ray * 250.,
|
|
direction: Dir2::new_unchecked(-ray),
|
|
};
|
|
let ray_cast = RayCast2d::from_ray(aabb_ray, dist - 20.);
|
|
|
|
draw_ray(gizmos, &ray_cast);
|
|
ray_cast
|
|
}
|
|
|
|
fn ray_cast_system(
|
|
mut gizmos: Gizmos,
|
|
time: Res<Time>,
|
|
mut volumes: Query<(&CurrentVolume, &mut Intersects)>,
|
|
) {
|
|
let ray_cast = get_and_draw_ray(&mut gizmos, &time);
|
|
|
|
for (volume, mut intersects) in volumes.iter_mut() {
|
|
let toi = match volume {
|
|
CurrentVolume::Aabb(a) => ray_cast.aabb_intersection_at(a),
|
|
CurrentVolume::Circle(c) => ray_cast.circle_intersection_at(c),
|
|
};
|
|
**intersects = toi.is_some();
|
|
if let Some(toi) = toi {
|
|
draw_filled_circle(
|
|
&mut gizmos,
|
|
ray_cast.ray.origin + *ray_cast.ray.direction * toi,
|
|
LIME,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn aabb_cast_system(
|
|
mut gizmos: Gizmos,
|
|
time: Res<Time>,
|
|
mut volumes: Query<(&CurrentVolume, &mut Intersects)>,
|
|
) {
|
|
let ray_cast = get_and_draw_ray(&mut gizmos, &time);
|
|
let aabb_cast = AabbCast2d {
|
|
aabb: Aabb2d::new(Vec2::ZERO, Vec2::splat(15.)),
|
|
ray: ray_cast,
|
|
};
|
|
|
|
for (volume, mut intersects) in volumes.iter_mut() {
|
|
let toi = match *volume {
|
|
CurrentVolume::Aabb(a) => aabb_cast.aabb_collision_at(a),
|
|
CurrentVolume::Circle(_) => None,
|
|
};
|
|
|
|
**intersects = toi.is_some();
|
|
if let Some(toi) = toi {
|
|
gizmos.rect_2d(
|
|
aabb_cast.ray.ray.origin + *aabb_cast.ray.ray.direction * toi,
|
|
aabb_cast.aabb.half_size() * 2.,
|
|
LIME,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn bounding_circle_cast_system(
|
|
mut gizmos: Gizmos,
|
|
time: Res<Time>,
|
|
mut volumes: Query<(&CurrentVolume, &mut Intersects)>,
|
|
) {
|
|
let ray_cast = get_and_draw_ray(&mut gizmos, &time);
|
|
let circle_cast = BoundingCircleCast {
|
|
circle: BoundingCircle::new(Vec2::ZERO, 15.),
|
|
ray: ray_cast,
|
|
};
|
|
|
|
for (volume, mut intersects) in volumes.iter_mut() {
|
|
let toi = match *volume {
|
|
CurrentVolume::Aabb(_) => None,
|
|
CurrentVolume::Circle(c) => circle_cast.circle_collision_at(c),
|
|
};
|
|
|
|
**intersects = toi.is_some();
|
|
if let Some(toi) = toi {
|
|
gizmos.circle_2d(
|
|
circle_cast.ray.ray.origin + *circle_cast.ray.ray.direction * toi,
|
|
circle_cast.circle.radius(),
|
|
LIME,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn get_intersection_position(time: &Time) -> Vec2 {
|
|
let x = ops::cos(0.8 * time.elapsed_secs()) * 250.;
|
|
let y = ops::sin(0.4 * time.elapsed_secs()) * 100.;
|
|
Vec2::new(x, y)
|
|
}
|
|
|
|
fn aabb_intersection_system(
|
|
mut gizmos: Gizmos,
|
|
time: Res<Time>,
|
|
mut volumes: Query<(&CurrentVolume, &mut Intersects)>,
|
|
) {
|
|
let center = get_intersection_position(&time);
|
|
let aabb = Aabb2d::new(center, Vec2::splat(50.));
|
|
gizmos.rect_2d(center, aabb.half_size() * 2., YELLOW);
|
|
|
|
for (volume, mut intersects) in volumes.iter_mut() {
|
|
let hit = match volume {
|
|
CurrentVolume::Aabb(a) => aabb.intersects(a),
|
|
CurrentVolume::Circle(c) => aabb.intersects(c),
|
|
};
|
|
|
|
**intersects = hit;
|
|
}
|
|
}
|
|
|
|
fn circle_intersection_system(
|
|
mut gizmos: Gizmos,
|
|
time: Res<Time>,
|
|
mut volumes: Query<(&CurrentVolume, &mut Intersects)>,
|
|
) {
|
|
let center = get_intersection_position(&time);
|
|
let circle = BoundingCircle::new(center, 50.);
|
|
gizmos.circle_2d(center, circle.radius(), YELLOW);
|
|
|
|
for (volume, mut intersects) in volumes.iter_mut() {
|
|
let hit = match volume {
|
|
CurrentVolume::Aabb(a) => circle.intersects(a),
|
|
CurrentVolume::Circle(c) => circle.intersects(c),
|
|
};
|
|
|
|
**intersects = hit;
|
|
}
|
|
}
|