From 2bcb8a2a41fb6455d1c24e6a740ee0f207f3abab Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Wed, 13 May 2020 18:05:18 -0700 Subject: [PATCH] cargo fmt --- crates/bevy_app/src/event/event.rs | 5 +++- crates/bevy_core/src/transform/hierarchy.rs | 6 +++-- .../legion_systems/src/system_fn_types.rs | 4 +--- .../bevy_pbr/src/forward_pbr_render_graph.rs | 11 +++------ crates/bevy_render/src/pass/pass.rs | 2 +- .../src/pipeline/pipeline_compiler.rs | 5 ++-- crates/bevy_render/src/render_graph/graph.rs | 9 +++---- .../nodes/window_swapchain_node.rs | 3 ++- .../render_graph/nodes/window_texture_node.rs | 3 ++- .../bevy_render/src/render_graph/schedule.rs | 3 ++- .../render_resource_assignments.rs | 15 +++++++----- .../src/render_resource/resource_info.rs | 2 +- .../headless_render_resource_context.rs | 14 ++--------- .../src/renderer/render_resource_context.rs | 12 ++-------- crates/bevy_render/src/shader/shader.rs | 10 ++++---- crates/bevy_text/src/lib.rs | 2 +- crates/bevy_ui/src/render/mod.rs | 4 +--- crates/bevy_ui/src/ui_update_system.rs | 2 +- .../wgpu_resource_diagnostics_plugin.rs | 13 ++++++---- .../src/renderer/wgpu_render_context.rs | 2 +- .../renderer/wgpu_render_resource_context.rs | 6 +---- crates/bevy_wgpu/src/wgpu_render_pass.rs | 24 +++++++++---------- examples/ecs/event.rs | 5 +--- examples/input/input_keyboard.rs | 5 +--- examples/shader/shader_custom_material.rs | 3 +-- examples/shader/shader_defs.rs | 3 +-- src/lib.rs | 8 +++---- 27 files changed, 76 insertions(+), 105 deletions(-) diff --git a/crates/bevy_app/src/event/event.rs b/crates/bevy_app/src/event/event.rs index b07486d2a9..10718ab897 100644 --- a/crates/bevy_app/src/event/event.rs +++ b/crates/bevy_app/src/event/event.rs @@ -232,7 +232,10 @@ impl Events { } } - pub fn extend(&mut self, events: I) where I: Iterator { + pub fn extend(&mut self, events: I) + where + I: Iterator, + { for event in events { self.send(event); } diff --git a/crates/bevy_core/src/transform/hierarchy.rs b/crates/bevy_core/src/transform/hierarchy.rs index 2c4d6e659b..5664f26986 100644 --- a/crates/bevy_core/src/transform/hierarchy.rs +++ b/crates/bevy_core/src/transform/hierarchy.rs @@ -80,7 +80,8 @@ pub fn run_on_hierarchy_subworld_mut( input: T, run: &mut dyn FnMut(&mut SubWorld, Entity, T) -> Option, child_result_action: &mut dyn FnMut(T, T) -> T, -) -> Option where +) -> Option +where T: Copy, { // TODO: not a huge fan of this pattern. are there ways to do recursive updates in legion without allocations? @@ -99,7 +100,8 @@ pub fn run_on_hierarchy_subworld_mut( if let Some(mut result) = result { if let Some(children) = children { for child in children { - let child_result = run_on_hierarchy_subworld_mut(world, child, result, run, child_result_action); + let child_result = + run_on_hierarchy_subworld_mut(world, child, result, run, child_result_action); if let Some(child_result) = child_result { result = child_result_action(result, child_result) } diff --git a/crates/bevy_legion/legion_systems/src/system_fn_types.rs b/crates/bevy_legion/legion_systems/src/system_fn_types.rs index 9de267113e..c2576aca1a 100644 --- a/crates/bevy_legion/legion_systems/src/system_fn_types.rs +++ b/crates/bevy_legion/legion_systems/src/system_fn_types.rs @@ -41,9 +41,7 @@ impl<'a, T: 'a> Res<'a, T> { } #[inline(always)] - pub fn map &K>(&self, mut f: F) -> Res<'a, K> { - Res::new(f(&self)) - } + pub fn map &K>(&self, mut f: F) -> Res<'a, K> { Res::new(f(&self)) } } impl<'a, T: 'a> Deref for Res<'a, T> { diff --git a/crates/bevy_pbr/src/forward_pbr_render_graph.rs b/crates/bevy_pbr/src/forward_pbr_render_graph.rs index b7c2a59865..084f1a3a76 100644 --- a/crates/bevy_pbr/src/forward_pbr_render_graph.rs +++ b/crates/bevy_pbr/src/forward_pbr_render_graph.rs @@ -25,19 +25,14 @@ pub trait ForwardPbrRenderGraphBuilder { impl ForwardPbrRenderGraphBuilder for RenderGraph { fn add_pbr_graph(&mut self, resources: &Resources) -> &mut Self { - self.add_system_node( - node::LOCAL_TO_WORLD, - UniformNode::::new(true) - ); + self.add_system_node(node::LOCAL_TO_WORLD, UniformNode::::new(true)); self.add_system_node( node::STANDARD_MATERIAL, - AssetUniformNode::::new(true) + AssetUniformNode::::new(true), ); self.add_system_node(node::LIGHTS, LightsNode::new(10)); let mut shaders = resources.get_mut::>().unwrap(); - let mut pipelines = resources - .get_mut::>() - .unwrap(); + let mut pipelines = resources.get_mut::>().unwrap(); { let main_pass: &mut PassNode = self .get_node_mut(base_render_graph::node::MAIN_PASS) diff --git a/crates/bevy_render/src/pass/pass.rs b/crates/bevy_render/src/pass/pass.rs index 885e053c17..4756b6a592 100644 --- a/crates/bevy_render/src/pass/pass.rs +++ b/crates/bevy_render/src/pass/pass.rs @@ -10,7 +10,7 @@ pub enum TextureAttachment { impl TextureAttachment { pub fn get_resource(&self) -> Option { - if let TextureAttachment::RenderResource(render_resource) = self { + if let TextureAttachment::RenderResource(render_resource) = self { Some(*render_resource) } else { None diff --git a/crates/bevy_render/src/pipeline/pipeline_compiler.rs b/crates/bevy_render/src/pipeline/pipeline_compiler.rs index 80f78a706a..a4025e3079 100644 --- a/crates/bevy_render/src/pipeline/pipeline_compiler.rs +++ b/crates/bevy_render/src/pipeline/pipeline_compiler.rs @@ -213,9 +213,8 @@ pub fn update_shader_assignments(world: &mut World, resources: &Resources) { let mut pipeline_compiler = resources.get_mut::().unwrap(); let mut shaders = resources.get_mut::>().unwrap(); let vertex_buffer_descriptors = resources.get::().unwrap(); - let mut pipeline_descriptor_storage = resources - .get_mut::>() - .unwrap(); + let mut pipeline_descriptor_storage = + resources.get_mut::>().unwrap(); // reset assignments so they are updated every frame shader_pipeline_assignments.assignments = HashMap::new(); diff --git a/crates/bevy_render/src/render_graph/graph.rs b/crates/bevy_render/src/render_graph/graph.rs index 4645c419b0..2227dedf60 100644 --- a/crates/bevy_render/src/render_graph/graph.rs +++ b/crates/bevy_render/src/render_graph/graph.rs @@ -41,11 +41,7 @@ impl RenderGraph { self.add_node_nameless(node) } - pub fn add_system_node( - &mut self, - name: impl Into>, - node: T, - ) -> NodeId + pub fn add_system_node(&mut self, name: impl Into>, node: T) -> NodeId where T: SystemNode + 'static, { @@ -313,7 +309,8 @@ mod tests { use super::RenderGraph; use crate::{ render_graph::{Edge, Node, NodeId, RenderGraphError, ResourceSlotInfo, ResourceSlots}, - renderer::RenderContext, shader::FieldBindType, + renderer::RenderContext, + shader::FieldBindType, }; use legion::prelude::{Resources, World}; use std::{collections::HashSet, iter::FromIterator}; diff --git a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs index ed7d8c0cc1..0e58115bdc 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs @@ -1,6 +1,7 @@ use crate::{ render_graph::{Node, ResourceSlotInfo, ResourceSlots}, - renderer::RenderContext, shader::FieldBindType, + renderer::RenderContext, + shader::FieldBindType, }; use bevy_app::{EventReader, Events}; use bevy_window::{WindowCreated, WindowReference, WindowResized, Windows}; diff --git a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs index 48dd797796..1c72a9a01f 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs @@ -1,7 +1,8 @@ use crate::{ render_graph::{Node, ResourceSlotInfo, ResourceSlots}, renderer::RenderContext, - texture::TextureDescriptor, shader::FieldBindType, + shader::FieldBindType, + texture::TextureDescriptor, }; use bevy_app::{EventReader, Events}; use bevy_window::{WindowCreated, WindowReference, WindowResized, Windows}; diff --git a/crates/bevy_render/src/render_graph/schedule.rs b/crates/bevy_render/src/render_graph/schedule.rs index abf29908b2..e1f7950cb6 100644 --- a/crates/bevy_render/src/render_graph/schedule.rs +++ b/crates/bevy_render/src/render_graph/schedule.rs @@ -264,7 +264,8 @@ mod tests { use super::{DependentNodeStager, OrderedJob, RenderGraphStager, Stage}; use crate::{ render_graph::{Node, NodeId, RenderGraph, ResourceSlotInfo, ResourceSlots}, - renderer::RenderContext, shader::FieldBindType, + renderer::RenderContext, + shader::FieldBindType, }; use legion::prelude::{Resources, World}; diff --git a/crates/bevy_render/src/render_resource/render_resource_assignments.rs b/crates/bevy_render/src/render_resource/render_resource_assignments.rs index a08f29a4ce..bb998d1049 100644 --- a/crates/bevy_render/src/render_resource/render_resource_assignments.rs +++ b/crates/bevy_render/src/render_resource/render_resource_assignments.rs @@ -2,7 +2,8 @@ use super::RenderResource; use crate::pipeline::{BindGroupDescriptor, BindGroupDescriptorId, PipelineSpecialization}; use std::{ collections::{hash_map::DefaultHasher, HashMap, HashSet}, - hash::{Hash, Hasher}, ops::Range, + hash::{Hash, Hasher}, + ops::Range, }; use uuid::Uuid; @@ -39,8 +40,7 @@ pub struct RenderResourceAssignments { pub id: RenderResourceAssignmentsId, render_resources: HashMap, vertex_buffers: HashMap)>, - bind_group_resource_sets: - HashMap, + bind_group_resource_sets: HashMap, dirty_bind_groups: HashSet, pub pipeline_specialization: PipelineSpecialization, } @@ -52,8 +52,7 @@ impl RenderResourceAssignments { pub fn set(&mut self, name: &str, assignment: RenderResourceAssignment) { self.try_set_dirty(name, &assignment); - self.render_resources - .insert(name.to_string(), assignment); + self.render_resources.insert(name.to_string(), assignment); } fn try_set_dirty(&mut self, name: &str, assignment: &RenderResourceAssignment) { @@ -126,7 +125,11 @@ impl RenderResourceAssignments { if let Some(assignment) = self.get(&binding_descriptor.name) { let resource = assignment.get_resource(); resource.hash(&mut hasher); - if let RenderResourceAssignment::Buffer { dynamic_index: Some(index), .. } = assignment { + if let RenderResourceAssignment::Buffer { + dynamic_index: Some(index), + .. + } = assignment + { indices.push(*index); } } else { diff --git a/crates/bevy_render/src/render_resource/resource_info.rs b/crates/bevy_render/src/render_resource/resource_info.rs index c089a86efe..b1f67f3928 100644 --- a/crates/bevy_render/src/render_resource/resource_info.rs +++ b/crates/bevy_render/src/render_resource/resource_info.rs @@ -1,4 +1,4 @@ -use crate::{texture::TextureDescriptor, render_resource::BufferUsage}; +use crate::{render_resource::BufferUsage, texture::TextureDescriptor}; #[derive(Debug, Clone, Eq, PartialEq)] pub struct BufferInfo { diff --git a/crates/bevy_render/src/renderer/headless_render_resource_context.rs b/crates/bevy_render/src/renderer/headless_render_resource_context.rs index 9fdd089f7c..2270e7f526 100644 --- a/crates/bevy_render/src/renderer/headless_render_resource_context.rs +++ b/crates/bevy_render/src/renderer/headless_render_resource_context.rs @@ -65,12 +65,7 @@ impl RenderResourceContext for HeadlessRenderResourceContext { self.add_resource_info(resource, ResourceInfo::Buffer(buffer_info)); resource } - fn create_shader_module( - &self, - _shader_handle: Handle, - _shaders: &Assets, - ) { - } + fn create_shader_module(&self, _shader_handle: Handle, _shaders: &Assets) {} fn remove_buffer(&self, resource: RenderResource) { self.resource_info.write().unwrap().remove(&resource); } @@ -129,10 +124,5 @@ impl RenderResourceContext for HeadlessRenderResourceContext { None } } - fn create_shader_module_from_source( - &self, - _shader_handle: Handle, - _shader: &Shader, - ) { - } + fn create_shader_module_from_source(&self, _shader_handle: Handle, _shader: &Shader) {} } diff --git a/crates/bevy_render/src/renderer/render_resource_context.rs b/crates/bevy_render/src/renderer/render_resource_context.rs index c869ebb54f..615bf41f7a 100644 --- a/crates/bevy_render/src/renderer/render_resource_context.rs +++ b/crates/bevy_render/src/renderer/render_resource_context.rs @@ -40,16 +40,8 @@ pub trait RenderResourceContext: Downcast + Send + Sync + 'static { setup_data: &mut dyn FnMut(&mut [u8], &dyn RenderResourceContext), ) -> RenderResource; fn create_buffer_with_data(&self, buffer_info: BufferInfo, data: &[u8]) -> RenderResource; - fn create_shader_module( - &self, - shader_handle: Handle, - shaders: &Assets, - ); - fn create_shader_module_from_source( - &self, - shader_handle: Handle, - shader: &Shader, - ); + fn create_shader_module(&self, shader_handle: Handle, shaders: &Assets); + fn create_shader_module_from_source(&self, shader_handle: Handle, shader: &Shader); fn remove_buffer(&self, resource: RenderResource); fn remove_texture(&self, resource: RenderResource); fn remove_sampler(&self, resource: RenderResource); diff --git a/crates/bevy_render/src/shader/shader.rs b/crates/bevy_render/src/shader/shader.rs index 09408733be..b93a9ed5a3 100644 --- a/crates/bevy_render/src/shader/shader.rs +++ b/crates/bevy_render/src/shader/shader.rs @@ -62,10 +62,7 @@ pub struct Shader { impl Shader { pub fn new(stage: ShaderStage, source: ShaderSource) -> Shader { - Shader { - stage, - source, - } + Shader { stage, source } } pub fn from_glsl(stage: ShaderStage, glsl: &str) -> Shader { Shader { @@ -90,7 +87,10 @@ impl Shader { pub fn reflect_layout(&self, enforce_bevy_conventions: bool) -> Option { if let ShaderSource::Spirv(ref spirv) = self.source { - Some(ShaderLayout::from_spirv(spirv.as_slice(), enforce_bevy_conventions)) + Some(ShaderLayout::from_spirv( + spirv.as_slice(), + enforce_bevy_conventions, + )) } else { panic!("Cannot reflect layout of non-SpirV shader. Try compiling this shader to SpirV first using self.get_spirv_shader()"); } diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs index 6b305a4028..d5ecb12731 100644 --- a/crates/bevy_text/src/lib.rs +++ b/crates/bevy_text/src/lib.rs @@ -1,4 +1,4 @@ -mod render; mod font; +mod render; pub use font::*; diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index eb9221f347..e8dac024ca 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -76,9 +76,7 @@ impl UiRenderGraphBuilder for RenderGraph { self.add_system_node("rect", UniformNode::::new(false)); self.add_node_edge("rect", base_render_graph::node::MAIN_PASS) .unwrap(); - let mut pipelines = resources - .get_mut::>() - .unwrap(); + let mut pipelines = resources.get_mut::>().unwrap(); let mut shaders = resources.get_mut::>().unwrap(); pipelines.add_with_handle(UI_PIPELINE_HANDLE, build_ui_pipeline(&mut shaders)); let main_pass: &mut PassNode = self diff --git a/crates/bevy_ui/src/ui_update_system.rs b/crates/bevy_ui/src/ui_update_system.rs index c2dc062419..b105576f69 100644 --- a/crates/bevy_ui/src/ui_update_system.rs +++ b/crates/bevy_ui/src/ui_update_system.rs @@ -67,7 +67,7 @@ fn update_node_entity(world: &mut SubWorld, entity: Entity, parent_rect: Rect) - } fn process_child_result(_parent_result: Rect, child_result: Rect) -> Rect { - // "earlier" children are sorted behind "later" children + // "earlier" children are sorted behind "later" children let mut result = child_result.clone(); result.z_index -= UI_Z_STEP; result diff --git a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs index b5583062c5..9349348c2d 100644 --- a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs +++ b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs @@ -182,14 +182,17 @@ impl WgpuResourceDiagnosticsPlugin { ); let mut bind_group_count = 0; - for bind_group in render_resource_context.resources.bind_groups.read().unwrap().values() { + for bind_group in render_resource_context + .resources + .bind_groups + .read() + .unwrap() + .values() + { bind_group_count += bind_group.bind_groups.len(); } - diagnostics.add_measurement( - Self::BIND_GROUPS, - bind_group_count as f64, - ); + diagnostics.add_measurement(Self::BIND_GROUPS, bind_group_count as f64); diagnostics.add_measurement( Self::BIND_GROUP_LAYOUTS, diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs index eb66baf0e2..0527de4d48 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs @@ -6,7 +6,7 @@ use bevy_render::{ PassDescriptor, RenderPass, RenderPassColorAttachmentDescriptor, RenderPassDepthStencilAttachmentDescriptor, TextureAttachment, }, - render_resource::{RenderResource, RenderResourceAssignments, RenderResourceAssignment}, + render_resource::{RenderResource, RenderResourceAssignment, RenderResourceAssignments}, renderer::{RenderContext, RenderResourceContext}, texture::{Extent3d, TextureDescriptor}, }; diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs index 4d68330205..d0473ffe38 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -294,11 +294,7 @@ impl RenderResourceContext for WgpuRenderResourceContext { shader_modules.insert(shader_handle, shader_module); } - fn create_shader_module( - &self, - shader_handle: Handle, - shaders: &Assets, - ) { + fn create_shader_module(&self, shader_handle: Handle, shaders: &Assets) { if self .resources .shader_modules diff --git a/crates/bevy_wgpu/src/wgpu_render_pass.rs b/crates/bevy_wgpu/src/wgpu_render_pass.rs index a0fffc2ab7..9e0502c499 100644 --- a/crates/bevy_wgpu/src/wgpu_render_pass.rs +++ b/crates/bevy_wgpu/src/wgpu_render_pass.rs @@ -29,11 +29,12 @@ impl<'a> RenderPass for WgpuRenderPass<'a> { } fn set_viewport(&mut self, x: f32, y: f32, w: f32, h: f32, min_depth: f32, max_depth: f32) { - self.render_pass.set_viewport(x, y, w, h, min_depth, max_depth); + self.render_pass + .set_viewport(x, y, w, h, min_depth, max_depth); } fn set_stencil_reference(&mut self, reference: u32) { - self.render_pass.set_stencil_reference(reference); + self.render_pass.set_stencil_reference(reference); } fn set_index_buffer(&mut self, resource: RenderResource, offset: u64) { @@ -47,8 +48,7 @@ impl<'a> RenderPass for WgpuRenderPass<'a> { } fn draw(&mut self, vertices: Range, instances: Range) { - self.render_pass - .draw(vertices, instances); + self.render_pass.draw(vertices, instances); } fn set_render_resources( @@ -99,16 +99,16 @@ impl<'a> RenderPass for WgpuRenderPass<'a> { { if let Some(bind_group_info) = self.render_resources.bind_groups.get(&bind_group.id) { - if let Some(wgpu_bind_group) = - bind_group_info.bind_groups.get(&resource_set.id) + if let Some(wgpu_bind_group) = bind_group_info.bind_groups.get(&resource_set.id) { const EMPTY: &'static [u32] = &[]; - let dynamic_uniform_indices = - if let Some(ref dynamic_uniform_indices) = resource_set.dynamic_uniform_indices { - dynamic_uniform_indices.as_slice() - } else { - EMPTY - }; + let dynamic_uniform_indices = if let Some(ref dynamic_uniform_indices) = + resource_set.dynamic_uniform_indices + { + dynamic_uniform_indices.as_slice() + } else { + EMPTY + }; // don't bind bind groups if they are already set // TODO: these checks come at a performance cost. make sure it's worth it! diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs index 0dd5e08718..29bfaff8a9 100644 --- a/examples/ecs/event.rs +++ b/examples/ecs/event.rs @@ -42,10 +42,7 @@ struct EventListenerState { } // prints events as they come in -fn event_listener_system( - mut state: ResMut, - my_events: Res>, -) { +fn event_listener_system(mut state: ResMut, my_events: Res>) { for my_event in state.my_event_reader.iter(&my_events) { println!("{}", my_event.message); } diff --git a/examples/input/input_keyboard.rs b/examples/input/input_keyboard.rs index a697ed5b95..b990d717b6 100644 --- a/examples/input/input_keyboard.rs +++ b/examples/input/input_keyboard.rs @@ -21,10 +21,7 @@ struct State { } /// adjusts move state based on keyboard input -fn collect_input( - mut state: ResMut, - keyboard_input_events: Res>, -) { +fn collect_input(mut state: ResMut, keyboard_input_events: Res>) { for event in state.event_reader.iter(&keyboard_input_events) { match event { KeyboardInput { diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs index 13c6c4b830..231ad9ca80 100644 --- a/examples/shader/shader_custom_material.rs +++ b/examples/shader/shader_custom_material.rs @@ -55,8 +55,7 @@ fn setup( ))), })); - render_graph - .add_system_node("my_material", AssetUniformNode::::new(true)); + render_graph.add_system_node("my_material", AssetUniformNode::::new(true)); let main_pass: &mut PassNode = render_graph.get_node_mut("main_pass").unwrap(); main_pass.add_pipeline( pipeline_handle, diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs index efcfe00821..f8d7fb1498 100644 --- a/examples/shader/shader_defs.rs +++ b/examples/shader/shader_defs.rs @@ -64,8 +64,7 @@ fn setup( "#, ))), })); - render_graph - .add_system_node("my_material", AssetUniformNode::::new(true)); + render_graph.add_system_node("my_material", AssetUniformNode::::new(true)); let main_pass: &mut PassNode = render_graph.get_node_mut("main_pass").unwrap(); main_pass.add_pipeline( pipeline_handle, diff --git a/src/lib.rs b/src/lib.rs index fbd1bd7ea8..c00bd4a415 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -63,17 +63,17 @@ pub use bevy_input as input; pub use bevy_pbr as pbr; #[cfg(feature = "render")] pub use bevy_render as render; -#[cfg(feature = "text")] -pub use bevy_text as text; #[cfg(feature = "serialization")] pub use bevy_serialization as serialization; +#[cfg(feature = "text")] +pub use bevy_text as text; #[cfg(feature = "transform")] pub use bevy_transform as transform; #[cfg(feature = "ui")] pub use bevy_ui as ui; +#[cfg(feature = "wgpu")] +pub use bevy_wgpu as wgpu; #[cfg(feature = "window")] pub use bevy_window as window; #[cfg(feature = "winit")] pub use bevy_winit as winit; -#[cfg(feature = "wgpu")] -pub use bevy_wgpu as wgpu;