Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bevy 0.11 update #32

Merged
merged 5 commits into from
Nov 11, 2023
Merged

Bevy 0.11 update #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4367db7
update library, dependencies to bevy 0.11
masonium Oct 24, 2023
88d09cc
update input, output examples
masonium Oct 24, 2023
ba0ce3c
update egui example
masonium Oct 24, 2023
0d2b1a9
update piano example
masonium Oct 24, 2023
6c09eca
Merge branch 'bevy_0.12' into bevy-0.11-update
BlackPhlox Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ name = "bevy_midi"

[dependencies]
midir = "0.9"
crossbeam-channel = "0.5.6"
crossbeam-channel = "0.5.8"

[dev-dependencies]
bevy_egui = { version = "0.20", features = ["immutable_ctx"]}
strum = { version = "0.25.0", features = ["derive"] }
bevy_mod_picking = "0.14.0"
bevy_egui = { version = "0.22", features = ["immutable_ctx"]}
strum = { version = "0.24", features = ["derive"] }
bevy_mod_picking = "0.15"

[dependencies.bevy]
version = "0.11.0"
version = "0.11"
default-features = false

[dev-dependencies.bevy]
version = "0.11.0"
features = ["bevy_core_pipeline","bevy_asset", "bevy_scene", "bevy_render", "bevy_winit", "bevy_gltf", "bevy_ui", "bevy_text"]
version = "0.11"
features = ["bevy_core_pipeline","bevy_asset", "bevy_scene", "bevy_render", "bevy_winit", "bevy_gltf", "bevy_ui", "bevy_text", "zstd", "tonemapping_luts", "ktx2", "hdr"]
default-features = false

[target.'cfg(target_os = "linux")'.dev-dependencies.bevy]
version = "0.11.0"
version = "0.11"
features = ["x11", "wayland"]
default-features = false
17 changes: 11 additions & 6 deletions examples/egui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

use bevy::prelude::*;
use bevy_egui::{
egui::{self, Color32, ColorImage, ImageButton, Key, TextureHandle, TextureOptions, Ui},
egui::{
self, load::SizedTexture, Color32, ColorImage, ImageButton, Key, TextureHandle,
TextureOptions, Ui,
},
EguiContext, EguiPlugin,
};
use bevy_midi::prelude::*;
Expand All @@ -14,10 +17,10 @@
fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin(EguiPlugin)
.add_plugins(EguiPlugin)
// Systems that create Egui widgets should be run during the `CoreStage::Update` stage,
// or after the `EguiSystem::BeginFrame` system (which belongs to the `CoreStage::PreUpdate` stage).
.add_system(ui_example)
.add_systems(Update, ui_example)
.init_resource::<PianoRoll>()
.run();
}
Expand Down Expand Up @@ -183,7 +186,7 @@
}

fn update_key_states(&mut self, ui: &mut Ui) {
let input = ui.input(|i| i.key_pressed(egui::Key::A));

Check warning on line 189 in examples/egui.rs

View workflow job for this annotation

GitHub Actions / Test Suite 

unused variable: `input`
let next_keys = std::array::from_fn(|index| ui.input(|i| i.key_down(KEYS[index])));

self.key_states
Expand Down Expand Up @@ -214,7 +217,6 @@
});

self.key_states = next_keys;
drop(input);
}

fn get_key_texture_tint(&self, note: NoteName, index: usize) -> Color32 {
Expand Down Expand Up @@ -257,6 +259,7 @@
)
})
.id();

// Draw the actual piano keys for clicking
ui.vertical(|ui| {
ui.spacing_mut().item_spacing = bevy_egui::egui::Vec2 {
Expand All @@ -271,7 +274,8 @@
all_notes_iter.for_each(|(index, (note, _octave))| {
let color = self.get_key_texture_tint(note, index);

let button_top = ImageButton::new(texture_id, TOP_KEY_SIZE).tint(color);
let button_top =
ImageButton::new(SizedTexture::new(texture_id, TOP_KEY_SIZE)).tint(color);
if ui.add(button_top).clicked() {
//sync.trigger_note(index, selected_instrument);
println!("Pressed {}{}", KEY_RANGE[index % 12], index / 12);
Expand All @@ -291,7 +295,8 @@
let tint = self.get_key_texture_tint(note, index);

let button_bottom =
ImageButton::new(texture_id, BOTTOM_KEY_SIZE).tint(tint);
ImageButton::new(SizedTexture::new(texture_id, BOTTOM_KEY_SIZE))
.tint(tint);

if ui.add(button_bottom).clicked() {
//sync.trigger_note(index, selected_instrument);
Expand Down
21 changes: 13 additions & 8 deletions examples/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,19 @@ fn main() {
level: Level::WARN,
filter: "bevy_midi=debug".to_string(),
}))
.add_plugin(MidiInputPlugin)
.add_system(refresh_ports)
.add_system(connect)
.add_system(disconnect)
.add_system(show_ports)
.add_system(show_connection)
.add_system(show_last_message)
.add_startup_system(setup)
.add_plugins(MidiInputPlugin)
.add_systems(
Update,
(
refresh_ports,
connect,
disconnect,
show_ports,
show_connection,
show_last_message,
),
)
.add_systems(Startup, setup)
.run();
}

Expand Down
21 changes: 13 additions & 8 deletions examples/output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@ fn main() {
.insert_resource(MidiOutputSettings {
port_name: "output",
})
.add_plugin(MidiOutputPlugin)
.add_system(refresh_ports)
.add_system(connect)
.add_system(disconnect)
.add_system(play_notes)
.add_system(show_ports)
.add_system(show_connection)
.add_startup_system(setup)
.add_plugins(MidiOutputPlugin)
.add_systems(
Update,
(
refresh_ports,
connect,
disconnect,
play_notes,
show_ports,
show_connection,
),
)
.add_systems(Startup, setup)
.run();
}

Expand Down
68 changes: 27 additions & 41 deletions examples/piano.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ use bevy::{
prelude::*,
};
use bevy_midi::prelude::*;
use bevy_mod_picking::{
DefaultPickingPlugins, HoverEvent, PickableBundle, PickingCameraBundle, PickingEvent,
SelectionEvent,
};
use bevy_mod_picking::prelude::*;

fn main() {
App::new()
Expand All @@ -21,17 +18,21 @@ fn main() {
filter: "bevy_midi=debug".to_string(),
}))
.add_plugins(DefaultPickingPlugins)
.add_plugin(MidiInputPlugin)
.add_plugins(MidiInputPlugin)
.init_resource::<MidiInputSettings>()
.add_plugin(MidiOutputPlugin)
.add_plugins(MidiOutputPlugin)
.init_resource::<MidiOutputSettings>()
.add_startup_system(setup)
.add_system(handle_midi_input)
.add_system(connect_to_first_input_port)
.add_system(connect_to_first_output_port)
.add_system(print_events.in_base_set(CoreSet::PostUpdate))
.add_system(display_press)
.add_system(display_release)
.add_systems(Startup, setup)
.add_systems(
Update,
(
handle_midi_input,
connect_to_first_input_port,
connect_to_first_output_port,
display_press,
display_release,
),
)
.run();
}

Expand All @@ -41,28 +42,6 @@ struct Key {
y_reset: f32,
}

pub fn print_events(
mut events: EventReader<PickingEvent>,
mut commands: Commands,
mouse_button_input: Res<Input<MouseButton>>,
) {
for event in events.iter() {
let entity = match event {
PickingEvent::Selection(SelectionEvent::JustSelected(e)) => e,
PickingEvent::Selection(SelectionEvent::JustDeselected(e)) => e,
PickingEvent::Hover(HoverEvent::JustEntered(e)) => e,
PickingEvent::Hover(HoverEvent::JustLeft(e)) => e,
PickingEvent::Clicked(e) => e,
};

if mouse_button_input.pressed(MouseButton::Left) {
commands.entity(*entity).insert(PressedKey);
} else {
commands.entity(*entity).remove::<PressedKey>();
}
}
}

#[derive(Component)]
struct PressedKey;

Expand All @@ -86,7 +65,7 @@ fn setup(
transform: Transform::from_xyz(8., 5., mid).looking_at(Vec3::new(0., 0., mid), Vec3::Y),
..Default::default()
},
PickingCameraBundle::default(),
RaycastPickCamera::default(),
));

let pos: Vec3 = Vec3::new(0., 0., 0.);
Expand All @@ -103,16 +82,16 @@ fn setup(

for i in 0..8 {
spawn_note(&mut commands, &w_mat, 0.00, pos, &mut white_key_0, i, "C");
spawn_note(&mut commands, &b_mat, 0.15, pos_black, &mut black_key, i, "C#");
spawn_note(&mut commands, &b_mat, 0.15, pos_black, &mut black_key, i, "C#/Db");
spawn_note(&mut commands, &w_mat, 0.27, pos, &mut white_key_1, i, "D");
spawn_note(&mut commands, &b_mat, 0.39, pos_black, &mut black_key, i, "D#");
spawn_note(&mut commands, &b_mat, 0.39, pos_black, &mut black_key, i, "D#/Eb");
spawn_note(&mut commands, &w_mat, 0.54, pos, &mut white_key_2, i, "E");
spawn_note(&mut commands, &w_mat, 0.69, pos, &mut white_key_0, i, "F");
spawn_note(&mut commands, &b_mat, 0.85, pos_black, &mut black_key, i, "F#");
spawn_note(&mut commands, &b_mat, 0.85, pos_black, &mut black_key, i, "F#/Gb");
spawn_note(&mut commands, &w_mat, 0.96, pos, &mut white_key_1, i, "G");
spawn_note(&mut commands, &b_mat, 1.08, pos_black, &mut black_key, i, "G#");
spawn_note(&mut commands, &b_mat, 1.08, pos_black, &mut black_key, i, "G#/Ab");
spawn_note(&mut commands, &w_mat, 1.19, pos, &mut white_key_1, i, "A");
spawn_note(&mut commands, &b_mat, 1.31, pos_black, &mut black_key, i, "A#");
spawn_note(&mut commands, &b_mat, 1.31, pos_black, &mut black_key, i, "A#/Bb");
spawn_note(&mut commands, &w_mat, 1.46, pos, &mut white_key_2, i, "B");
}
}
Expand Down Expand Up @@ -142,6 +121,13 @@ fn spawn_note(
y_reset: pos.y,
},
PickableBundle::default(),
RaycastPickTarget::default(),
On::<Pointer<Down>>::target_commands_mut(|_click, entity_commands| {
entity_commands.insert(PressedKey);
}),
On::<Pointer<Up>>::target_commands_mut(|_click, entity_commands| {
entity_commands.remove::<PressedKey>();
}),
));
}

Expand Down
9 changes: 6 additions & 3 deletions src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ impl Plugin for MidiInputPlugin {
.init_resource::<MidiInputConnection>()
.add_event::<MidiInputError>()
.add_event::<MidiData>()
.add_startup_system(setup)
.add_system(reply.in_base_set(CoreSet::PreUpdate))
.add_system(debug);
.add_systems(Startup, setup)
.add_systems(PreUpdate, reply)
.add_systems(Update, debug);
}
}

Expand Down Expand Up @@ -113,6 +113,8 @@ pub struct MidiData {
pub message: MidiMessage,
}

impl bevy::prelude::Event for MidiData {}

/// The [`Error`] type for midi input operations, accessible as an [`Event`](bevy::ecs::event::Event).
#[derive(Clone, Debug)]
pub enum MidiInputError {
Expand All @@ -121,6 +123,7 @@ pub enum MidiInputError {
}

impl Error for MidiInputError {}
impl Event for MidiInputError {}
impl Display for MidiInputError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
match self {
Expand Down
5 changes: 3 additions & 2 deletions src/output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ impl Plugin for MidiOutputPlugin {
app.init_resource::<MidiOutputSettings>()
.init_resource::<MidiOutputConnection>()
.add_event::<MidiOutputError>()
.add_startup_system(setup)
.add_system(reply.in_base_set(CoreSet::PreUpdate));
.add_systems(Startup, setup)
.add_systems(PreUpdate, reply);
}
}

Expand Down Expand Up @@ -107,6 +107,7 @@ pub enum MidiOutputError {
}

impl Error for MidiOutputError {}
impl Event for MidiOutputError {}
impl Display for MidiOutputError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
match self {
Expand Down
Loading