mirror of
https://github.com/bevyengine/bevy.git
synced 2026-07-01 00:05:45 -04:00
13877fa84d
# Objective - Allow the `Val`-helper functions to accept more types besides just `f32` Fixes #20549 ## Solution - Adds a new trait that can be implemented for numbers - That trait has a method that converts `self` to `f32` ## Testing - I tested it using Rust's testing framework (although I didn't leave the tests in, as I don't deem them important enough) <details> <summary>Rust test</summary> ```rust #[cfg(test)] mod tests { use super::*; #[test] fn test_val_helpers_work() { let p = px(10_u8); assert_eq!(p, Val::Px(10.0)); let p = px(10_u16); assert_eq!(p, Val::Px(10.0)); let p = px(10_u32); assert_eq!(p, Val::Px(10.0)); let p = px(10_u64); assert_eq!(p, Val::Px(10.0)); let p = px(10_u128); assert_eq!(p, Val::Px(10.0)); let p = px(10_i8); assert_eq!(p, Val::Px(10.0)); let p = px(10_i16); assert_eq!(p, Val::Px(10.0)); let p = px(10_i32); assert_eq!(p, Val::Px(10.0)); let p = px(10_i64); assert_eq!(p, Val::Px(10.0)); let p = px(10_i128); assert_eq!(p, Val::Px(10.0)); let p = px(10.3_f32); assert_eq!(p, Val::Px(10.3)); let p = px(10.6_f64); assert_eq!(p, Val::Px(10.6)); } } ``` </details> --- ## Showcase ```rust // Same as Val::Px(10.) px(10); px(10_u8); px(10.0); ```
114 lines
2.8 KiB
Rust
114 lines
2.8 KiB
Rust
//! This example illustrates how to load and play an audio file, and control how it's played.
|
|
|
|
use bevy::{math::ops, prelude::*};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(update_progress_text, update_speed, pause, mute, volume),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn((
|
|
AudioPlayer::new(asset_server.load("sounds/Windless Slopes.ogg")),
|
|
MyMusic,
|
|
));
|
|
|
|
commands.spawn((
|
|
Text::new(""),
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
top: px(12),
|
|
left: px(12),
|
|
..default()
|
|
},
|
|
ProgressText,
|
|
));
|
|
|
|
// example instructions
|
|
commands.spawn((
|
|
Text::new("-/=: Volume Down/Up\nSpace: Toggle Playback\nM: Toggle Mute"),
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
bottom: px(12),
|
|
left: px(12),
|
|
..default()
|
|
},
|
|
));
|
|
|
|
// camera
|
|
commands.spawn(Camera3d::default());
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct MyMusic;
|
|
|
|
#[derive(Component)]
|
|
struct ProgressText;
|
|
|
|
fn update_progress_text(
|
|
music_controller: Single<&AudioSink, With<MyMusic>>,
|
|
mut progress_text: Single<&mut Text, With<ProgressText>>,
|
|
) {
|
|
progress_text.0 = format!("Progress: {}s", music_controller.position().as_secs_f32());
|
|
}
|
|
|
|
fn update_speed(music_controller: Query<&AudioSink, With<MyMusic>>, time: Res<Time>) {
|
|
let Ok(sink) = music_controller.single() else {
|
|
return;
|
|
};
|
|
if sink.is_paused() {
|
|
return;
|
|
}
|
|
|
|
sink.set_speed((ops::sin(time.elapsed_secs() / 5.0) + 1.0).max(0.1));
|
|
}
|
|
|
|
fn pause(
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
music_controller: Query<&AudioSink, With<MyMusic>>,
|
|
) {
|
|
let Ok(sink) = music_controller.single() else {
|
|
return;
|
|
};
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Space) {
|
|
sink.toggle_playback();
|
|
}
|
|
}
|
|
|
|
fn mute(
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
mut music_controller: Query<&mut AudioSink, With<MyMusic>>,
|
|
) {
|
|
let Ok(mut sink) = music_controller.single_mut() else {
|
|
return;
|
|
};
|
|
|
|
if keyboard_input.just_pressed(KeyCode::KeyM) {
|
|
sink.toggle_mute();
|
|
}
|
|
}
|
|
|
|
fn volume(
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
mut music_controller: Query<&mut AudioSink, With<MyMusic>>,
|
|
) {
|
|
let Ok(mut sink) = music_controller.single_mut() else {
|
|
return;
|
|
};
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Equal) {
|
|
let current_volume = sink.volume();
|
|
sink.set_volume(current_volume.increase_by_percentage(10.0));
|
|
} else if keyboard_input.just_pressed(KeyCode::Minus) {
|
|
let current_volume = sink.volume();
|
|
sink.set_volume(current_volume.increase_by_percentage(-10.0));
|
|
}
|
|
}
|