mirror of
https://github.com/bevyengine/bevy
synced 2024-11-26 06:30:19 +00:00
c2c19e5ae4
**Ready for review. Examples migration progress: 100%.** # Objective - Implement https://github.com/bevyengine/bevy/discussions/15014 ## Solution This implements [cart's proposal](https://github.com/bevyengine/bevy/discussions/15014#discussioncomment-10574459) faithfully except for one change. I separated `TextSpan` from `TextSpan2d` because `TextSpan` needs to require the `GhostNode` component, which is a `bevy_ui` component only usable by UI. Extra changes: - Added `EntityCommands::commands_mut` that returns a mutable reference. This is a blocker for extension methods that return something other than `self`. Note that `sickle_ui`'s `UiBuilder::commands` returns a mutable reference for this reason. ## Testing - [x] Text examples all work. --- ## Showcase TODO: showcase-worthy ## Migration Guide TODO: very breaking ### Accessing text spans by index Text sections are now text sections on different entities in a hierarchy, Use the new `TextReader` and `TextWriter` system parameters to access spans by index. Before: ```rust fn refresh_text(mut query: Query<&mut Text, With<TimeText>>, time: Res<Time>) { let text = query.single_mut(); text.sections[1].value = format_time(time.elapsed()); } ``` After: ```rust fn refresh_text( query: Query<Entity, With<TimeText>>, mut writer: UiTextWriter, time: Res<Time> ) { let entity = query.single(); *writer.text(entity, 1) = format_time(time.elapsed()); } ``` ### Iterating text spans Text spans are now entities in a hierarchy, so the new `UiTextReader` and `UiTextWriter` system parameters provide ways to iterate that hierarchy. The `UiTextReader::iter` method will give you a normal iterator over spans, and `UiTextWriter::for_each` lets you visit each of the spans. --------- Co-authored-by: ickshonpe <david.curthoys@googlemail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
121 lines
3.6 KiB
Rust
121 lines
3.6 KiB
Rust
//! This example illustrates how to load and play an audio file, and control where the sounds seems to come from.
|
|
use bevy::{
|
|
color::palettes::basic::{BLUE, LIME, RED},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, update_positions)
|
|
.add_systems(Update, update_listener)
|
|
.run();
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
// Space between the two ears
|
|
let gap = 4.0;
|
|
|
|
// sound emitter
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Sphere::new(0.2).mesh().uv(32, 18))),
|
|
MeshMaterial3d(materials.add(Color::from(BLUE))),
|
|
Transform::from_xyz(0.0, 0.0, 0.0),
|
|
Emitter::default(),
|
|
AudioPlayer::<AudioSource>(asset_server.load("sounds/Windless Slopes.ogg")),
|
|
PlaybackSettings::LOOP.with_spatial(true),
|
|
));
|
|
|
|
let listener = SpatialListener::new(gap);
|
|
commands
|
|
.spawn((SpatialBundle::default(), listener.clone()))
|
|
.with_children(|parent| {
|
|
// left ear indicator
|
|
parent.spawn((
|
|
Mesh3d(meshes.add(Cuboid::new(0.2, 0.2, 0.2))),
|
|
MeshMaterial3d(materials.add(Color::from(RED))),
|
|
Transform::from_translation(listener.left_ear_offset),
|
|
));
|
|
|
|
// right ear indicator
|
|
parent.spawn((
|
|
Mesh3d(meshes.add(Cuboid::new(0.2, 0.2, 0.2))),
|
|
MeshMaterial3d(materials.add(Color::from(LIME))),
|
|
Transform::from_translation(listener.right_ear_offset),
|
|
));
|
|
});
|
|
|
|
// light
|
|
commands.spawn((
|
|
DirectionalLight::default(),
|
|
Transform::from_xyz(4.0, 8.0, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
));
|
|
|
|
// example instructions
|
|
commands.spawn((
|
|
Text::new("Up/Down/Left/Right: Move Listener\nSpace: Toggle Emitter Movement"),
|
|
Style {
|
|
position_type: PositionType::Absolute,
|
|
bottom: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
));
|
|
|
|
// camera
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Transform::from_xyz(0.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
));
|
|
}
|
|
|
|
#[derive(Component, Default)]
|
|
struct Emitter {
|
|
stopped: bool,
|
|
}
|
|
|
|
fn update_positions(
|
|
time: Res<Time>,
|
|
mut emitters: Query<(&mut Transform, &mut Emitter), With<Emitter>>,
|
|
keyboard: Res<ButtonInput<KeyCode>>,
|
|
) {
|
|
for (mut emitter_transform, mut emitter) in emitters.iter_mut() {
|
|
if keyboard.just_pressed(KeyCode::Space) {
|
|
emitter.stopped = !emitter.stopped;
|
|
}
|
|
|
|
if !emitter.stopped {
|
|
emitter_transform.translation.x = ops::sin(time.elapsed_seconds()) * 3.0;
|
|
emitter_transform.translation.z = ops::cos(time.elapsed_seconds()) * 3.0;
|
|
}
|
|
}
|
|
}
|
|
|
|
fn update_listener(
|
|
keyboard: Res<ButtonInput<KeyCode>>,
|
|
time: Res<Time>,
|
|
mut listeners: Query<&mut Transform, With<SpatialListener>>,
|
|
) {
|
|
let mut transform = listeners.single_mut();
|
|
|
|
let speed = 2.;
|
|
|
|
if keyboard.pressed(KeyCode::ArrowRight) {
|
|
transform.translation.x += speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowLeft) {
|
|
transform.translation.x -= speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowDown) {
|
|
transform.translation.z += speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowUp) {
|
|
transform.translation.z -= speed * time.delta_seconds();
|
|
}
|
|
}
|