2022-09-24 13:21:01 +00:00
|
|
|
//! Shows a visualization of gamepad buttons, sticks, and triggers
|
|
|
|
|
|
|
|
use std::f32::consts::PI;
|
|
|
|
|
|
|
|
use bevy::{
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
input::gamepad::{
|
|
|
|
GamepadAxisChangedEvent, GamepadButton, GamepadButtonChangedEvent, GamepadSettings,
|
|
|
|
},
|
2022-09-24 13:21:01 +00:00
|
|
|
prelude::*,
|
Remove VerticalAlign from TextAlignment (#6807)
# Objective
Remove the `VerticalAlign` enum.
Text's alignment field should only affect the text's internal text alignment, not its position. The only way to control a `TextBundle`'s position and bounds should be through the manipulation of the constraints in the `Style` components of the nodes in the Bevy UI's layout tree.
`Text2dBundle` should have a separate `Anchor` component that sets its position relative to its transform.
Related issues: #676, #1490, #5502, #5513, #5834, #6717, #6724, #6741, #6748
## Changelog
* Changed `TextAlignment` into an enum with `Left`, `Center`, and `Right` variants.
* Removed the `HorizontalAlign` and `VerticalAlign` types.
* Added an `Anchor` component to `Text2dBundle`
* Added `Component` derive to `Anchor`
* Use `f32::INFINITY` instead of `f32::MAX` to represent unbounded text in Text2dBounds
## Migration Guide
The `alignment` field of `Text` now only affects the text's internal alignment.
### Change `TextAlignment` to TextAlignment` which is now an enum. Replace:
* `TextAlignment::TOP_LEFT`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_LEFT` with `TextAlignment::Left`
* `TextAlignment::TOP_CENTER`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_CENTER` with `TextAlignment::Center`
* `TextAlignment::TOP_RIGHT`, `TextAlignment::CENTER_RIGHT`, `TextAlignment::BOTTOM_RIGHT` with `TextAlignment::Right`
### Changes for `Text2dBundle`
`Text2dBundle` has a new field 'text_anchor' that takes an `Anchor` component that controls its position relative to its transform.
2023-01-18 02:19:17 +00:00
|
|
|
sprite::{Anchor, MaterialMesh2dBundle, Mesh2dHandle},
|
2022-09-24 13:21:01 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const BUTTON_RADIUS: f32 = 25.;
|
|
|
|
const BUTTON_CLUSTER_RADIUS: f32 = 50.;
|
|
|
|
const START_SIZE: Vec2 = Vec2::new(30., 15.);
|
|
|
|
const TRIGGER_SIZE: Vec2 = Vec2::new(70., 20.);
|
|
|
|
const STICK_BOUNDS_SIZE: f32 = 100.;
|
|
|
|
|
|
|
|
const BUTTONS_X: f32 = 150.;
|
|
|
|
const BUTTONS_Y: f32 = 80.;
|
|
|
|
const STICKS_X: f32 = 150.;
|
|
|
|
const STICKS_Y: f32 = -135.;
|
|
|
|
|
|
|
|
const NORMAL_BUTTON_COLOR: Color = Color::rgb(0.2, 0.2, 0.2);
|
|
|
|
const ACTIVE_BUTTON_COLOR: Color = Color::PURPLE;
|
|
|
|
const LIVE_COLOR: Color = Color::rgb(0.4, 0.4, 0.4);
|
|
|
|
const DEAD_COLOR: Color = Color::rgb(0.3, 0.3, 0.3);
|
|
|
|
const EXTENT_COLOR: Color = Color::rgb(0.3, 0.3, 0.3);
|
|
|
|
const TEXT_COLOR: Color = Color::WHITE;
|
|
|
|
|
|
|
|
#[derive(Component, Deref)]
|
|
|
|
struct ReactTo(GamepadButtonType);
|
|
|
|
#[derive(Component)]
|
|
|
|
struct MoveWithAxes {
|
|
|
|
x_axis: GamepadAxisType,
|
|
|
|
y_axis: GamepadAxisType,
|
|
|
|
scale: f32,
|
|
|
|
}
|
|
|
|
#[derive(Component)]
|
|
|
|
struct TextWithAxes {
|
|
|
|
x_axis: GamepadAxisType,
|
|
|
|
y_axis: GamepadAxisType,
|
|
|
|
}
|
|
|
|
#[derive(Component, Deref)]
|
|
|
|
struct TextWithButtonValue(GamepadButtonType);
|
|
|
|
|
|
|
|
#[derive(Component)]
|
|
|
|
struct ConnectedGamepadsText;
|
|
|
|
|
|
|
|
#[derive(Resource)]
|
|
|
|
struct ButtonMaterials {
|
|
|
|
normal: Handle<ColorMaterial>,
|
|
|
|
active: Handle<ColorMaterial>,
|
|
|
|
}
|
|
|
|
impl FromWorld for ButtonMaterials {
|
|
|
|
fn from_world(world: &mut World) -> Self {
|
|
|
|
let mut materials = world.resource_mut::<Assets<ColorMaterial>>();
|
|
|
|
Self {
|
|
|
|
normal: materials.add(ColorMaterial::from(NORMAL_BUTTON_COLOR)),
|
|
|
|
active: materials.add(ColorMaterial::from(ACTIVE_BUTTON_COLOR)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[derive(Resource)]
|
|
|
|
struct ButtonMeshes {
|
|
|
|
circle: Mesh2dHandle,
|
|
|
|
triangle: Mesh2dHandle,
|
|
|
|
start_pause: Mesh2dHandle,
|
|
|
|
trigger: Mesh2dHandle,
|
|
|
|
}
|
|
|
|
impl FromWorld for ButtonMeshes {
|
|
|
|
fn from_world(world: &mut World) -> Self {
|
|
|
|
let mut meshes = world.resource_mut::<Assets<Mesh>>();
|
|
|
|
Self {
|
|
|
|
circle: meshes.add(shape::Circle::new(BUTTON_RADIUS).into()).into(),
|
|
|
|
triangle: meshes
|
|
|
|
.add(shape::RegularPolygon::new(BUTTON_RADIUS, 3).into())
|
|
|
|
.into(),
|
|
|
|
start_pause: meshes.add(shape::Quad::new(START_SIZE).into()).into(),
|
|
|
|
trigger: meshes.add(shape::Quad::new(TRIGGER_SIZE).into()).into(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-06 13:33:29 +00:00
|
|
|
#[derive(Bundle)]
|
|
|
|
struct GamepadButtonBundle {
|
|
|
|
mesh_bundle: MaterialMesh2dBundle<ColorMaterial>,
|
|
|
|
react_to: ReactTo,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl GamepadButtonBundle {
|
|
|
|
pub fn new(
|
|
|
|
button_type: GamepadButtonType,
|
|
|
|
mesh: Mesh2dHandle,
|
|
|
|
material: Handle<ColorMaterial>,
|
|
|
|
x: f32,
|
|
|
|
y: f32,
|
|
|
|
) -> Self {
|
|
|
|
Self {
|
|
|
|
mesh_bundle: MaterialMesh2dBundle {
|
|
|
|
mesh,
|
|
|
|
material,
|
|
|
|
transform: Transform::from_xyz(x, y, 0.),
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
react_to: ReactTo(button_type),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn with_rotation(mut self, angle: f32) -> Self {
|
|
|
|
self.mesh_bundle.transform.rotation = Quat::from_rotation_z(angle);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-24 13:21:01 +00:00
|
|
|
fn main() {
|
|
|
|
App::new()
|
|
|
|
.add_plugins(DefaultPlugins)
|
|
|
|
.init_resource::<ButtonMaterials>()
|
|
|
|
.init_resource::<ButtonMeshes>()
|
2023-03-18 01:45:34 +00:00
|
|
|
.add_systems(
|
|
|
|
Startup,
|
|
|
|
(setup, setup_sticks, setup_triggers, setup_connected),
|
|
|
|
)
|
|
|
|
.add_systems(
|
|
|
|
Update,
|
|
|
|
(
|
|
|
|
update_buttons,
|
|
|
|
update_button_values,
|
|
|
|
update_axes,
|
|
|
|
update_connected,
|
|
|
|
),
|
|
|
|
)
|
2022-09-24 13:21:01 +00:00
|
|
|
.run();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn setup(mut commands: Commands, meshes: Res<ButtonMeshes>, materials: Res<ButtonMaterials>) {
|
|
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
|
|
|
|
// Buttons
|
|
|
|
|
|
|
|
commands
|
|
|
|
.spawn(SpatialBundle {
|
|
|
|
transform: Transform::from_xyz(BUTTONS_X, BUTTONS_Y, 0.),
|
|
|
|
..default()
|
|
|
|
})
|
|
|
|
.with_children(|parent| {
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::North,
|
|
|
|
meshes.circle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
0.,
|
|
|
|
BUTTON_CLUSTER_RADIUS,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::South,
|
|
|
|
meshes.circle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
0.,
|
|
|
|
-BUTTON_CLUSTER_RADIUS,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::West,
|
|
|
|
meshes.circle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
-BUTTON_CLUSTER_RADIUS,
|
|
|
|
0.,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::East,
|
|
|
|
meshes.circle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
BUTTON_CLUSTER_RADIUS,
|
|
|
|
0.,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
|
|
|
});
|
|
|
|
|
|
|
|
// Start and Pause
|
|
|
|
|
2022-10-06 13:33:29 +00:00
|
|
|
commands.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::Select,
|
|
|
|
meshes.start_pause.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
-30.,
|
|
|
|
BUTTONS_Y,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
|
|
|
|
2022-10-06 13:33:29 +00:00
|
|
|
commands.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::Start,
|
|
|
|
meshes.start_pause.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
30.,
|
|
|
|
BUTTONS_Y,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
|
|
|
|
|
|
|
// D-Pad
|
|
|
|
|
|
|
|
commands
|
|
|
|
.spawn(SpatialBundle {
|
|
|
|
transform: Transform::from_xyz(-BUTTONS_X, BUTTONS_Y, 0.),
|
|
|
|
..default()
|
|
|
|
})
|
|
|
|
.with_children(|parent| {
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::DPadUp,
|
|
|
|
meshes.triangle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
0.,
|
|
|
|
BUTTON_CLUSTER_RADIUS,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
2022-10-06 13:33:29 +00:00
|
|
|
parent.spawn(
|
|
|
|
GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::DPadDown,
|
|
|
|
meshes.triangle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
0.,
|
|
|
|
-BUTTON_CLUSTER_RADIUS,
|
|
|
|
)
|
|
|
|
.with_rotation(PI),
|
|
|
|
);
|
|
|
|
parent.spawn(
|
|
|
|
GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::DPadLeft,
|
|
|
|
meshes.triangle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
-BUTTON_CLUSTER_RADIUS,
|
|
|
|
0.,
|
|
|
|
)
|
|
|
|
.with_rotation(PI / 2.),
|
|
|
|
);
|
|
|
|
parent.spawn(
|
|
|
|
GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::DPadRight,
|
|
|
|
meshes.triangle.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
BUTTON_CLUSTER_RADIUS,
|
|
|
|
0.,
|
|
|
|
)
|
|
|
|
.with_rotation(-PI / 2.),
|
|
|
|
);
|
2022-09-24 13:21:01 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
// Triggers
|
|
|
|
|
2022-10-06 13:33:29 +00:00
|
|
|
commands.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::LeftTrigger,
|
|
|
|
meshes.trigger.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
-BUTTONS_X,
|
|
|
|
BUTTONS_Y + 115.,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
|
|
|
|
2022-10-06 13:33:29 +00:00
|
|
|
commands.spawn(GamepadButtonBundle::new(
|
|
|
|
GamepadButtonType::RightTrigger,
|
|
|
|
meshes.trigger.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
BUTTONS_X,
|
|
|
|
BUTTONS_Y + 115.,
|
2022-09-24 13:21:01 +00:00
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn setup_sticks(
|
|
|
|
mut commands: Commands,
|
|
|
|
meshes: Res<ButtonMeshes>,
|
|
|
|
materials: Res<ButtonMaterials>,
|
|
|
|
gamepad_settings: Res<GamepadSettings>,
|
|
|
|
) {
|
2022-10-17 14:38:55 +00:00
|
|
|
let dead_upper =
|
|
|
|
STICK_BOUNDS_SIZE * gamepad_settings.default_axis_settings.deadzone_upperbound();
|
|
|
|
let dead_lower =
|
|
|
|
STICK_BOUNDS_SIZE * gamepad_settings.default_axis_settings.deadzone_lowerbound();
|
2022-09-24 13:21:01 +00:00
|
|
|
let dead_size = dead_lower.abs() + dead_upper.abs();
|
|
|
|
let dead_mid = (dead_lower + dead_upper) / 2.0;
|
|
|
|
|
2022-10-17 14:38:55 +00:00
|
|
|
let live_upper =
|
|
|
|
STICK_BOUNDS_SIZE * gamepad_settings.default_axis_settings.livezone_upperbound();
|
|
|
|
let live_lower =
|
|
|
|
STICK_BOUNDS_SIZE * gamepad_settings.default_axis_settings.livezone_lowerbound();
|
2022-09-24 13:21:01 +00:00
|
|
|
let live_size = live_lower.abs() + live_upper.abs();
|
|
|
|
let live_mid = (live_lower + live_upper) / 2.0;
|
|
|
|
|
|
|
|
let mut spawn_stick = |x_pos, y_pos, x_axis, y_axis, button| {
|
|
|
|
commands
|
|
|
|
.spawn(SpatialBundle {
|
|
|
|
transform: Transform::from_xyz(x_pos, y_pos, 0.),
|
|
|
|
..default()
|
|
|
|
})
|
|
|
|
.with_children(|parent| {
|
|
|
|
// full extent
|
|
|
|
parent.spawn(SpriteBundle {
|
|
|
|
sprite: Sprite {
|
|
|
|
custom_size: Some(Vec2::splat(STICK_BOUNDS_SIZE * 2.)),
|
|
|
|
color: EXTENT_COLOR,
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
// live zone
|
|
|
|
parent.spawn(SpriteBundle {
|
|
|
|
transform: Transform::from_xyz(live_mid, live_mid, 2.),
|
|
|
|
sprite: Sprite {
|
|
|
|
custom_size: Some(Vec2::new(live_size, live_size)),
|
|
|
|
color: LIVE_COLOR,
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
// dead zone
|
|
|
|
parent.spawn(SpriteBundle {
|
|
|
|
transform: Transform::from_xyz(dead_mid, dead_mid, 3.),
|
|
|
|
sprite: Sprite {
|
|
|
|
custom_size: Some(Vec2::new(dead_size, dead_size)),
|
|
|
|
color: DEAD_COLOR,
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
// text
|
|
|
|
let style = TextStyle {
|
|
|
|
font_size: 16.,
|
|
|
|
color: TEXT_COLOR,
|
2023-04-21 22:30:18 +00:00
|
|
|
..default()
|
2022-09-24 13:21:01 +00:00
|
|
|
};
|
|
|
|
parent.spawn((
|
|
|
|
Text2dBundle {
|
|
|
|
transform: Transform::from_xyz(0., STICK_BOUNDS_SIZE + 2., 4.),
|
|
|
|
text: Text::from_sections([
|
|
|
|
TextSection {
|
|
|
|
value: format!("{:.3}", 0.),
|
|
|
|
style: style.clone(),
|
|
|
|
},
|
|
|
|
TextSection {
|
|
|
|
value: ", ".to_string(),
|
|
|
|
style: style.clone(),
|
|
|
|
},
|
|
|
|
TextSection {
|
|
|
|
value: format!("{:.3}", 0.),
|
|
|
|
style,
|
|
|
|
},
|
Remove VerticalAlign from TextAlignment (#6807)
# Objective
Remove the `VerticalAlign` enum.
Text's alignment field should only affect the text's internal text alignment, not its position. The only way to control a `TextBundle`'s position and bounds should be through the manipulation of the constraints in the `Style` components of the nodes in the Bevy UI's layout tree.
`Text2dBundle` should have a separate `Anchor` component that sets its position relative to its transform.
Related issues: #676, #1490, #5502, #5513, #5834, #6717, #6724, #6741, #6748
## Changelog
* Changed `TextAlignment` into an enum with `Left`, `Center`, and `Right` variants.
* Removed the `HorizontalAlign` and `VerticalAlign` types.
* Added an `Anchor` component to `Text2dBundle`
* Added `Component` derive to `Anchor`
* Use `f32::INFINITY` instead of `f32::MAX` to represent unbounded text in Text2dBounds
## Migration Guide
The `alignment` field of `Text` now only affects the text's internal alignment.
### Change `TextAlignment` to TextAlignment` which is now an enum. Replace:
* `TextAlignment::TOP_LEFT`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_LEFT` with `TextAlignment::Left`
* `TextAlignment::TOP_CENTER`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_CENTER` with `TextAlignment::Center`
* `TextAlignment::TOP_RIGHT`, `TextAlignment::CENTER_RIGHT`, `TextAlignment::BOTTOM_RIGHT` with `TextAlignment::Right`
### Changes for `Text2dBundle`
`Text2dBundle` has a new field 'text_anchor' that takes an `Anchor` component that controls its position relative to its transform.
2023-01-18 02:19:17 +00:00
|
|
|
]),
|
|
|
|
text_anchor: Anchor::BottomCenter,
|
2022-09-24 13:21:01 +00:00
|
|
|
..default()
|
|
|
|
},
|
|
|
|
TextWithAxes { x_axis, y_axis },
|
|
|
|
));
|
|
|
|
// cursor
|
|
|
|
parent.spawn((
|
|
|
|
MaterialMesh2dBundle {
|
|
|
|
mesh: meshes.circle.clone(),
|
|
|
|
material: materials.normal.clone(),
|
|
|
|
transform: Transform::from_xyz(0., 0., 5.)
|
|
|
|
.with_scale(Vec2::splat(0.2).extend(1.)),
|
|
|
|
..default()
|
|
|
|
},
|
|
|
|
MoveWithAxes {
|
|
|
|
x_axis,
|
|
|
|
y_axis,
|
|
|
|
scale: STICK_BOUNDS_SIZE,
|
|
|
|
},
|
|
|
|
ReactTo(button),
|
|
|
|
));
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
spawn_stick(
|
|
|
|
-STICKS_X,
|
|
|
|
STICKS_Y,
|
|
|
|
GamepadAxisType::LeftStickX,
|
|
|
|
GamepadAxisType::LeftStickY,
|
|
|
|
GamepadButtonType::LeftThumb,
|
|
|
|
);
|
|
|
|
spawn_stick(
|
|
|
|
STICKS_X,
|
|
|
|
STICKS_Y,
|
|
|
|
GamepadAxisType::RightStickX,
|
|
|
|
GamepadAxisType::RightStickY,
|
|
|
|
GamepadButtonType::RightThumb,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn setup_triggers(
|
|
|
|
mut commands: Commands,
|
|
|
|
meshes: Res<ButtonMeshes>,
|
|
|
|
materials: Res<ButtonMaterials>,
|
|
|
|
) {
|
|
|
|
let mut spawn_trigger = |x, y, button_type| {
|
|
|
|
commands
|
2022-10-06 13:33:29 +00:00
|
|
|
.spawn(GamepadButtonBundle::new(
|
|
|
|
button_type,
|
|
|
|
meshes.trigger.clone(),
|
|
|
|
materials.normal.clone(),
|
|
|
|
x,
|
|
|
|
y,
|
2022-09-24 13:21:01 +00:00
|
|
|
))
|
|
|
|
.with_children(|parent| {
|
|
|
|
parent.spawn((
|
|
|
|
Text2dBundle {
|
|
|
|
transform: Transform::from_xyz(0., 0., 1.),
|
|
|
|
text: Text::from_section(
|
|
|
|
format!("{:.3}", 0.),
|
|
|
|
TextStyle {
|
|
|
|
font_size: 16.,
|
|
|
|
color: TEXT_COLOR,
|
2023-04-21 22:30:18 +00:00
|
|
|
..default()
|
2022-09-24 13:21:01 +00:00
|
|
|
},
|
Remove VerticalAlign from TextAlignment (#6807)
# Objective
Remove the `VerticalAlign` enum.
Text's alignment field should only affect the text's internal text alignment, not its position. The only way to control a `TextBundle`'s position and bounds should be through the manipulation of the constraints in the `Style` components of the nodes in the Bevy UI's layout tree.
`Text2dBundle` should have a separate `Anchor` component that sets its position relative to its transform.
Related issues: #676, #1490, #5502, #5513, #5834, #6717, #6724, #6741, #6748
## Changelog
* Changed `TextAlignment` into an enum with `Left`, `Center`, and `Right` variants.
* Removed the `HorizontalAlign` and `VerticalAlign` types.
* Added an `Anchor` component to `Text2dBundle`
* Added `Component` derive to `Anchor`
* Use `f32::INFINITY` instead of `f32::MAX` to represent unbounded text in Text2dBounds
## Migration Guide
The `alignment` field of `Text` now only affects the text's internal alignment.
### Change `TextAlignment` to TextAlignment` which is now an enum. Replace:
* `TextAlignment::TOP_LEFT`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_LEFT` with `TextAlignment::Left`
* `TextAlignment::TOP_CENTER`, `TextAlignment::CENTER_LEFT`, `TextAlignment::BOTTOM_CENTER` with `TextAlignment::Center`
* `TextAlignment::TOP_RIGHT`, `TextAlignment::CENTER_RIGHT`, `TextAlignment::BOTTOM_RIGHT` with `TextAlignment::Right`
### Changes for `Text2dBundle`
`Text2dBundle` has a new field 'text_anchor' that takes an `Anchor` component that controls its position relative to its transform.
2023-01-18 02:19:17 +00:00
|
|
|
),
|
2022-09-24 13:21:01 +00:00
|
|
|
..default()
|
|
|
|
},
|
|
|
|
TextWithButtonValue(button_type),
|
|
|
|
));
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
spawn_trigger(
|
|
|
|
-BUTTONS_X,
|
|
|
|
BUTTONS_Y + 145.,
|
|
|
|
GamepadButtonType::LeftTrigger2,
|
|
|
|
);
|
|
|
|
spawn_trigger(
|
|
|
|
BUTTONS_X,
|
|
|
|
BUTTONS_Y + 145.,
|
|
|
|
GamepadButtonType::RightTrigger2,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2023-04-21 22:30:18 +00:00
|
|
|
fn setup_connected(mut commands: Commands) {
|
2022-09-24 13:21:01 +00:00
|
|
|
let style = TextStyle {
|
|
|
|
color: TEXT_COLOR,
|
|
|
|
font_size: 30.,
|
2023-04-21 22:30:18 +00:00
|
|
|
..default()
|
2022-09-24 13:21:01 +00:00
|
|
|
};
|
|
|
|
commands.spawn((
|
|
|
|
TextBundle::from_sections([
|
|
|
|
TextSection {
|
2022-10-24 14:33:50 +00:00
|
|
|
value: "Connected Gamepads:\n".to_string(),
|
2022-09-24 13:21:01 +00:00
|
|
|
style: style.clone(),
|
|
|
|
},
|
|
|
|
TextSection {
|
|
|
|
value: "None".to_string(),
|
|
|
|
style,
|
|
|
|
},
|
|
|
|
]),
|
|
|
|
ConnectedGamepadsText,
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_buttons(
|
|
|
|
gamepads: Res<Gamepads>,
|
|
|
|
button_inputs: Res<Input<GamepadButton>>,
|
|
|
|
materials: Res<ButtonMaterials>,
|
|
|
|
mut query: Query<(&mut Handle<ColorMaterial>, &ReactTo)>,
|
|
|
|
) {
|
|
|
|
for gamepad in gamepads.iter() {
|
|
|
|
for (mut handle, react_to) in query.iter_mut() {
|
|
|
|
if button_inputs.just_pressed(GamepadButton::new(gamepad, **react_to)) {
|
|
|
|
*handle = materials.active.clone();
|
|
|
|
}
|
|
|
|
if button_inputs.just_released(GamepadButton::new(gamepad, **react_to)) {
|
|
|
|
*handle = materials.normal.clone();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_button_values(
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
mut events: EventReader<GamepadButtonChangedEvent>,
|
2022-09-24 13:21:01 +00:00
|
|
|
mut query: Query<(&mut Text, &TextWithButtonValue)>,
|
|
|
|
) {
|
2023-08-30 14:20:03 +00:00
|
|
|
for button_event in events.read() {
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
for (mut text, text_with_button_value) in query.iter_mut() {
|
|
|
|
if button_event.button_type == **text_with_button_value {
|
|
|
|
text.sections[0].value = format!("{:.3}", button_event.value);
|
2022-09-24 13:21:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_axes(
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
mut axis_events: EventReader<GamepadAxisChangedEvent>,
|
2022-09-24 13:21:01 +00:00
|
|
|
mut query: Query<(&mut Transform, &MoveWithAxes)>,
|
|
|
|
mut text_query: Query<(&mut Text, &TextWithAxes)>,
|
|
|
|
) {
|
2023-08-30 14:20:03 +00:00
|
|
|
for axis_event in axis_events.read() {
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
let axis_type = axis_event.axis_type;
|
|
|
|
let value = axis_event.value;
|
|
|
|
for (mut transform, move_with) in query.iter_mut() {
|
|
|
|
if axis_type == move_with.x_axis {
|
|
|
|
transform.translation.x = value * move_with.scale;
|
2022-09-24 13:21:01 +00:00
|
|
|
}
|
Gamepad events refactor (#6965)
# Objective
- Remove redundant gamepad events
- Simplify consuming gamepad events.
- Refactor: Separate handling of gamepad events into multiple systems.
## Solution
- Removed `GamepadEventRaw`, and `GamepadEventType`.
- Added bespoke `GamepadConnectionEvent`, `GamepadAxisChangedEvent`, and `GamepadButtonChangedEvent`.
- Refactored `gamepad_event_system`.
- Added `gamepad_button_event_system`, `gamepad_axis_event_system`, and `gamepad_connection_system`, which update the `Input` and `Axis` resources using their corresponding event type.
Gamepad events are now handled in their own systems and have their own types.
This allows for querying for gamepad events without having to match on `GamepadEventType` and makes creating handlers for specific gamepad event types, like a `GamepadConnectionEvent` or `GamepadButtonChangedEvent` possible.
We remove `GamepadEventRaw` by filtering the gamepad events, using `GamepadSettings`, _at the source_, in `bevy_gilrs`. This way we can create `GamepadEvent`s directly and avoid creating `GamepadEventRaw` which do not pass the user defined filters.
We expose ordered `GamepadEvent`s and we can respond to individual gamepad event types.
## Migration Guide
- Replace `GamepadEvent` and `GamepadEventRaw` types with their specific gamepad event type.
2023-01-09 19:24:52 +00:00
|
|
|
if axis_type == move_with.y_axis {
|
|
|
|
transform.translation.y = value * move_with.scale;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (mut text, text_with_axes) in text_query.iter_mut() {
|
|
|
|
if axis_type == text_with_axes.x_axis {
|
|
|
|
text.sections[0].value = format!("{value:.3}");
|
|
|
|
}
|
|
|
|
if axis_type == text_with_axes.y_axis {
|
|
|
|
text.sections[2].value = format!("{value:.3}");
|
2022-09-24 13:21:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_connected(
|
|
|
|
gamepads: Res<Gamepads>,
|
|
|
|
mut query: Query<&mut Text, With<ConnectedGamepadsText>>,
|
|
|
|
) {
|
|
|
|
if !gamepads.is_changed() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut text = query.single_mut();
|
|
|
|
|
|
|
|
let formatted = gamepads
|
|
|
|
.iter()
|
2022-10-24 14:33:50 +00:00
|
|
|
.map(|g| format!("- {}", gamepads.name(g).unwrap()))
|
2022-09-24 13:21:01 +00:00
|
|
|
.collect::<Vec<_>>()
|
|
|
|
.join("\n");
|
|
|
|
|
|
|
|
text.sections[1].value = if !formatted.is_empty() {
|
|
|
|
formatted
|
|
|
|
} else {
|
|
|
|
"None".to_string()
|
|
|
|
}
|
|
|
|
}
|