alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-09 12:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

with_bevy: Update to bevy 0.11 release.

Browse source 
* Use `add_plugins` as `add_plugin` is deprecated.
* Use `world.resource` instead of unwrapping `world.get_resource`
  as it gives better error messages.
* Add the `VelloRenderer` to the render app in the `finish` method
  as the `Renderer` is async and may not have initialized by the
  time that the Vello plugin is being set up.
This commit is contained in:
Bruce Mitchener 2023-07-10 13:05:33 +07:00
parent 929d727380
commit 3b3d369508
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/with_bevy/Cargo.toml
View file

@ -10,5 +10,5 @@ repository.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", rev = "4d54ce14aaee8d7432380df37c41c03c28594b27" } bevy = "0.11"
vello = { path = "../../" } vello = { path = "../../" }

14
examples/with_bevy/src/main.rs
View file

@ -21,8 +21,8 @@ struct VelloRenderer(Renderer);
impl FromWorld for VelloRenderer { impl FromWorld for VelloRenderer {
fn from_world(world: &mut World) -> Self { fn from_world(world: &mut World) -> Self {
let device = world.get_resource::<RenderDevice>().unwrap(); let device = world.resource::<RenderDevice>();
let queue = world.get_resource::<RenderQueue>().unwrap(); let queue = world.resource::<RenderQueue>();
VelloRenderer( VelloRenderer(
Renderer::new( Renderer::new(
@ -42,10 +42,14 @@ struct VelloPlugin;
impl Plugin for VelloPlugin { impl Plugin for VelloPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { return }; let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { return };
render_app.init_resource::<VelloRenderer>();
// This should probably use the render graph, but working out the dependencies there is awkward // This should probably use the render graph, but working out the dependencies there is awkward
render_app.add_systems(Render, render_scenes.in_set(RenderSet::Render)); render_app.add_systems(Render, render_scenes.in_set(RenderSet::Render));
} }
fn finish(&self, app: &mut App) {
let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { return };
render_app.init_resource::<VelloRenderer>();
}
} }
fn render_scenes( fn render_scenes(
@ -78,11 +82,11 @@ fn render_scenes(
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugin(VelloPlugin) .add_plugins(VelloPlugin)
.add_systems(Startup, setup) .add_systems(Startup, setup)
.add_systems(Update, bevy::window::close_on_esc) .add_systems(Update, bevy::window::close_on_esc)
.add_systems(Update, cube_rotator_system) .add_systems(Update, cube_rotator_system)
.add_plugin(ExtractComponentPlugin::<VelloScene>::default()) .add_plugins(ExtractComponentPlugin::<VelloScene>::default())
.add_systems(Update, render_fragment) .add_systems(Update, render_fragment)
.run() .run()
} }