update to Bevy 0.16.0-rc.3 (#6)

Author: mockersf

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_streamdeck"
-version = "0.5.0"
+version = "0.6.0-rc.1"
 edition = "2021"
 authors = ["François Mockers <francois.mockers@vleue.com>"]
 description = "Elgato Stream Deck plugin for Bevy"
@@ -12,24 +12,40 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 
 [features]
-default = ["color_compatibility", "image_compatibility", "assets"]
-color_compatibility = ["bevy/bevy_color"]
-image_compatibility = ["bevy/bevy_render", "bevy/png", "images"]
-images = ["image"]
-assets = ["bevy/bevy_asset"]
+default = ["image_compatibility", "assets"]
+image_compatibility = [
+    "dep:bevy_render",
+    "dep:bevy_image",
+    "bevy_image/png",
+    "images",
+]
+images = ["dep:image"]
+assets = ["dep:bevy_asset"]
 
-[dependencies.bevy]
-version = "0.15.0"
-default-features = false
-features = ["multi_threaded"]
+# [dependencies.bevy]
+# version = "0.15.0"
+# default-features = false
+# features = ["multi_threaded"]
 
 [dependencies]
+bevy_ecs = { version = "0.16.0-rc.3", default-features = false }
+bevy_app = { version = "0.16.0-rc.3", default-features = false }
+bevy_input = { version = "0.16.0-rc.3", default-features = false }
+bevy_tasks = { version = "0.16.0-rc.3", default-features = false }
+bevy_color = { version = "0.16.0-rc.3", default-features = false }
+bevy_math = { version = "0.16.0-rc.3" }
+bevy_render = { version = "0.16.0-rc.3", default-features = false, optional = true }
+bevy_asset = { version = "0.16.0-rc.3", default-features = false, optional = true }
+bevy_image = { version = "0.16.0-rc.3", default-features = false, optional = true }
 streamdeck = { version = "0.9", default-features = false }
 crossbeam-channel = "0.5"
 image = { version = "0.25", optional = true }
+log = "0.4"
+glam = { version = "0.29" }
 
 [dev-dependencies]
 rand = "0.8"
+bevy = { version = "0.16.0-rc.3" }
 
 [[example]]
 name = "image"

src/lib.rs

@@ -1,24 +1,20 @@
 use std::time::Duration;
 
-#[cfg(feature = "color_compatibility")]
-pub use bevy::color::{Color, LinearRgba};
-#[cfg(feature = "image_compatibility")]
-use bevy::image::Image;
-use bevy::{
-    app::{App, AppExit, Plugin},
-    color::ColorToComponents,
-    ecs::{
-        event::{EventReader, EventWriter},
-        system::{Commands, Res, ResMut},
-    },
-    input::ButtonInput,
-    log::debug,
-    prelude::{Event, Last, PreStartup, PreUpdate, Resource},
-    tasks::IoTaskPool,
+use bevy_app::{App, AppExit, Last, Plugin, PreStartup, PreUpdate};
+pub use bevy_color::{Color, ColorToComponents, LinearRgba};
+use bevy_ecs::{
+    event::{Event, EventReader, EventWriter},
+    resource::Resource,
+    system::{Commands, Res, ResMut},
 };
+#[cfg(feature = "image_compatibility")]
+use bevy_image::Image;
+use bevy_input::ButtonInput;
+use bevy_tasks::IoTaskPool;
 use crossbeam_channel::{bounded, Receiver, Sender};
 #[cfg(feature = "images")]
 use image::{imageops::FilterType, DynamicImage, ImageBuffer, Pixel, Rgba};
+use log::debug;
 pub use streamdeck::Kind;
 use streamdeck::{Colour, Error};
 
@@ -52,30 +48,6 @@ enum StreamDeckEvent {
     KeyPressed(Vec<u8>),
 }
 
-#[cfg(not(feature = "color_compatibility"))]
-#[derive(Default)]
-pub struct Color {
-    pub r: f32,
-    pub g: f32,
-    pub b: f32,
-}
-#[cfg(not(feature = "color_compatibility"))]
-impl Color {
-    const BLACK: Color = Color {
-        r: 0.0,
-        g: 0.0,
-        b: 0.0,
-    };
-
-    pub const fn rgb(r: f32, g: f32, b: f32) -> Color {
-        Color { r, g, b }
-    }
-
-    fn as_rgba_f32(&self) -> [f32; 4] {
-        [self.r, self.g, self.b, 1.0]
-    }
-}
-
 enum StreamDeckOrder {
     Reset,
     Color(u8, Color),
@@ -177,22 +149,22 @@ fn receiver(
         match from_stream {
             StreamDeckEvent::LostConnection => {
                 streamdeck.kind = None;
-                input_events.send(StreamDeckInput::Disconnected);
+                input_events.write(StreamDeckInput::Disconnected);
             }
             StreamDeckEvent::Connected(kind) => {
                 streamdeck.kind = Some(kind);
-                input_events.send(StreamDeckInput::Connected(kind));
+                input_events.write(StreamDeckInput::Connected(kind));
             }
             StreamDeckEvent::KeyPressed(keys) => {
                 for (k, s) in keys.iter().enumerate() {
                     if *s == 1 && !inputs.pressed(StreamDeckKey(k as u8)) {
                         inputs.press(StreamDeckKey(k as u8));
-                        input_events.send(StreamDeckInput::Press(k as u8));
+                        input_events.write(StreamDeckInput::Press(k as u8));
                     }
 
                     if *s == 0 && inputs.pressed(StreamDeckKey(k as u8)) {
                         inputs.release(StreamDeckKey(k as u8));
-                        input_events.send(StreamDeckInput::Release(k as u8));
+                        input_events.write(StreamDeckInput::Release(k as u8));
                     }
                 }
             }
@@ -230,11 +202,11 @@ impl StreamDeck {
         if let Some(kind) = self.kind {
             // Convert the texture to an image
             let mut dynamic_image = match image.texture_descriptor.format {
-                bevy::render::render_resource::TextureFormat::Rgba8UnormSrgb => {
+                bevy_render::render_resource::TextureFormat::Rgba8UnormSrgb => {
                     ImageBuffer::from_raw(
                         image.texture_descriptor.size.width,
                         image.texture_descriptor.size.height,
-                        image.data.clone(),
+                        image.data.as_ref().unwrap().clone(),
                     )
                     .map(DynamicImage::ImageRgba8)
                 }
@@ -258,7 +230,7 @@ impl StreamDeck {
 
             // Apply a background
             if let Some(background) = image_mode.background {
-                let LinearRgba {
+                let bevy_color::LinearRgba {
                     red, green, blue, ..
                 } = background.to_linear();