Midi working

Author: catilac

Cargo.lock

@@ -25,12 +25,10 @@ bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" }
 processing = { path = "." }
 processing_pyo3 = { path = "crates/processing_pyo3" }
 processing_render = { path = "crates/processing_render" }
-processing_midi = { path = "crates/processing_midi" }
 
 [dependencies]
 bevy = { workspace = true }
 processing_render = { workspace = true }
-processing_midi = { workspace = true }
 
 [dev-dependencies]
 glfw = "0.60.0"

Cargo.toml

@@ -20,7 +20,7 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 half = "2.7"
 crossbeam-channel = "0.5"
-processing_midi = { workspace = true }
+bevy_midi = { git = "https://github.com/BlackPhlox/bevy_midi", branch = "latest" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2 = { version = "0.6", default-features = false }

crates/processing_midi/Cargo.toml

@@ -6,6 +6,7 @@ mod graphics;
 pub mod image;
 pub mod light;
 pub mod material;
+pub mod midi;
 pub mod render;
 pub mod sketch;
 mod surface;
@@ -36,8 +37,6 @@ use crate::{
     surface::SurfacePlugin,
 };
 
-use processing_midi::MidiPlugin;
-
 static IS_INIT: OnceLock<()> = OnceLock::new();
 
 thread_local! {
@@ -281,7 +280,7 @@ fn create_app(config: Config) -> App {
         geometry::GeometryPlugin,
         LightPlugin,
         material::MaterialPlugin,
-        MidiPlugin,
+        midi::MidiPlugin,
     ));
     app.add_systems(First, (clear_transient_meshes, activate_cameras))
         .add_systems(
@@ -1394,3 +1393,29 @@ pub fn gltf_light(gltf_entity: Entity, index: usize) -> error::Result<Entity> {
             .unwrap()
     })
 }
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn midi_refresh_ports() -> error::Result<()> {
+    app_mut(|app| {
+        let world = app.world_mut();
+        world.run_system_cached(midi::refresh_ports).unwrap()
+    })
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn midi_connect(port: usize) -> error::Result<()> {
+    app_mut(|app| {
+        let world = app.world_mut();
+        world.run_system_cached_with(midi::connect, port).unwrap()
+    })
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn midi_play_notes(note: u8) -> error::Result<()> {
+    app_mut(|app| {
+        let world = app.world_mut();
+        world
+            .run_system_cached_with(midi::play_notes, note)
+            .unwrap()
+    })
+}

crates/processing_midi/src/lib.rs

@@ -0,0 +1,42 @@
+use crate::error::Result;
+use bevy::prelude::*;
+
+use bevy_midi::prelude::*;
+
+pub struct MidiPlugin;
+
+impl Plugin for MidiPlugin {
+    fn build(&self, app: &mut App) {
+        // TODO: Update `bevy_midi` to treat connections as entities
+        // in order to support hot-plugging
+        app.insert_resource(MidiOutputSettings {
+            port_name: "output",
+        });
+
+        app.add_plugins(MidiOutputPlugin);
+    }
+}
+
+pub fn connect(In(port): In<usize>, output: Res<MidiOutput>) -> Result<()> {
+    if let Some((_, port)) = output.ports().get(port) {
+        output.connect(port.clone());
+    }
+    Ok(())
+}
+
+pub fn disconnect() -> Result<()> {
+    Ok(())
+}
+
+pub fn refresh_ports(output: Res<MidiOutput>) -> Result<()> {
+    output.refresh_ports();
+    Ok(())
+}
+
+pub fn play_notes(In(note): In<u8>, output: Res<MidiOutput>) -> Result<()> {
+    output.send([0b1001_0000, note, 127].into()); // Note on, channel 1, max velocity
+
+    // output.send([0b1000_0000, note, 127].into()); // Note on, channel 1, max velocity
+
+    Ok(())
+}

crates/processing_render/Cargo.toml

@@ -28,7 +28,9 @@ fn sketch() -> error::Result<()> {
     let surface = glfw_ctx.create_surface(width, height, scale_factor)?;
     let graphics = graphics_create(surface, width, height, TextureFormat::Rgba16Float)?;
 
-    processing_midi::connect(0);
+    midi_refresh_ports()?;
+    midi_connect(0)?;
+    midi_play_notes(60)?;
 
     while glfw_ctx.poll_events() {
         graphics_begin_draw(graphics)?;
@@ -45,6 +47,8 @@ fn sketch() -> error::Result<()> {
         )?;
 
         graphics_end_draw(graphics)?;
+
+        midi_play_notes(60)?;
     }
     Ok(())
 }