Skip to content

Commit

Permalink
switch to generic renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
tasgon committed Aug 9, 2023
1 parent c9d43fb commit f34a7f0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ bevy_utils = "0.11"
bevy_window = "0.11"

iced_core = "0.10"
iced_graphics = "0.9"
iced_runtime = "0.1"
iced_wgpu = "0.11"
iced_widget = "0.1"
iced_renderer = { version = "0.1", features = ["wgpu"] }

[dev-dependencies]
bevy = "0.11"
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ use bevy_render::{ExtractSchedule, RenderApp};
use bevy_utils::HashMap;
use bevy_window::{PrimaryWindow, Window};
use iced_core::mouse::Cursor;
use iced_graphics::backend::Text;
use iced_graphics::Viewport;
use iced_widget::graphics::backend::Text;
use iced_widget::graphics::Viewport;
use iced_runtime::user_interface::UserInterface;

/// Basic re-exports for all Iced-related stuff.
Expand All @@ -65,7 +65,7 @@ mod utils;
use systems::IcedEventQueue;

/// The default renderer.
pub type Renderer = iced_wgpu::Renderer<iced::Theme>;
pub type Renderer = iced_renderer::Renderer<iced::Theme>;

/// The main feature of `bevy_iced`.
/// Add this to your [`App`] by calling `app.add_plugin(bevy_iced::IcedPlugin::default())`.
Expand Down Expand Up @@ -127,7 +127,7 @@ impl IcedProps {
}

Self {
renderer: iced_wgpu::Renderer::new(backend),
renderer: Renderer::Wgpu(iced_wgpu::Renderer::new(backend)),
debug: iced_runtime::Debug::new(),
clipboard: iced_core::clipboard::Null,
}
Expand Down
3 changes: 2 additions & 1 deletion src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use bevy_render::{
};
use bevy_window::Window;
use iced_core::Size;
use iced_graphics::Viewport;
use iced_widget::graphics::Viewport;
use iced_wgpu::wgpu::util::StagingBelt;
use std::sync::Mutex;

Expand Down Expand Up @@ -89,6 +89,7 @@ impl Node for IcedNode {
let IcedProps {
renderer, debug, ..
} = &mut *world.resource::<IcedResource>().lock().unwrap();
let crate::Renderer::Wgpu(renderer) = renderer else { return Ok(()) };
let render_device = world.resource::<RenderDevice>().wgpu_device();
let render_queue = world.resource::<RenderQueue>();
let viewport = world.resource::<ViewportResource>();
Expand Down

0 comments on commit f34a7f0

Please sign in to comment.