From 70f122b92aa78a35f4cc4d2dfcc7af4306e3ca11 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Wed, 13 May 2020 16:42:27 -0700 Subject: [PATCH] Rename AssetStorage to Assets --- crates/bevy_asset/src/lib.rs | 16 +++++----- .../bevy_pbr/src/forward_pbr_render_graph.rs | 6 ++-- crates/bevy_pbr/src/pipelines/forward/mod.rs | 4 +-- crates/bevy_render/src/mesh.rs | 8 ++--- crates/bevy_render/src/pipeline/pipeline.rs | 4 +-- .../src/pipeline/pipeline_compiler.rs | 30 +++++++++---------- .../src/render_graph/nodes/pass_node.rs | 12 ++++---- .../src/render_graph/nodes/uniform_node.rs | 12 ++++---- .../headless_render_resource_context.rs | 6 ++-- .../src/renderer/render_resource_context.rs | 6 ++-- crates/bevy_render/src/shader/uniform.rs | 6 ++-- crates/bevy_ui/src/lib.rs | 6 ++-- crates/bevy_ui/src/render/mod.rs | 8 ++--- crates/bevy_ui/src/sprite.rs | 6 ++-- crates/bevy_wgpu/src/renderer/systems.rs | 4 +-- .../renderer/wgpu_render_resource_context.rs | 8 ++--- examples/2d/sprite.rs | 6 ++-- examples/3d/load_model.rs | 10 +++---- examples/3d/parenting.rs | 6 ++-- examples/3d/scene.rs | 14 ++++----- examples/3d/spawner.rs | 18 +++++------ examples/3d/texture.rs | 16 +++++----- .../example_plugin/src/lib.rs | 10 +++---- examples/input/input_keyboard.rs | 10 +++---- examples/shader/shader_custom_material.rs | 12 ++++---- examples/shader/shader_defs.rs | 14 ++++----- examples/ui/text.rs | 6 ++-- examples/ui/ui.rs | 6 ++-- examples/ui/ui_bench.rs | 4 +-- src/prelude.rs | 2 +- 30 files changed, 138 insertions(+), 138 deletions(-) diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index e3072d807f..c1db51b0df 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -10,15 +10,15 @@ pub enum AssetEvent { Created { handle: Handle }, } -pub struct AssetStorage { +pub struct Assets { assets: HashMap, names: HashMap>, events: Events>, } -impl Default for AssetStorage { +impl Default for Assets { fn default() -> Self { - AssetStorage { + Assets { assets: HashMap::default(), names: HashMap::default(), events: Events::default(), @@ -26,7 +26,7 @@ impl Default for AssetStorage { } } -impl AssetStorage { +impl Assets { pub fn get_named(&mut self, name: &str) -> Option> { self.names.get(name).map(|handle| *handle) } @@ -77,9 +77,9 @@ impl AssetStorage { pub fn asset_event_system( mut events: ResourceMut>>, - mut storage: ResourceMut>, + mut assets: ResourceMut>, ) { - events.extend(storage.events.drain()) + events.extend(assets.events.drain()) } } @@ -104,10 +104,10 @@ impl AddAsset for AppBuilder { where T: Send + Sync + 'static, { - self.init_resource::>() + self.init_resource::>() .add_system_to_stage( stage::EVENT_UPDATE, - AssetStorage::::asset_event_system.system(), + Assets::::asset_event_system.system(), ) .add_event::>() } diff --git a/crates/bevy_pbr/src/forward_pbr_render_graph.rs b/crates/bevy_pbr/src/forward_pbr_render_graph.rs index c6a8b2dee7..e554a2d89e 100644 --- a/crates/bevy_pbr/src/forward_pbr_render_graph.rs +++ b/crates/bevy_pbr/src/forward_pbr_render_graph.rs @@ -1,5 +1,5 @@ use crate::{material::StandardMaterial, nodes::LightsNode, pipelines::build_forward_pipeline}; -use bevy_asset::AssetStorage; +use bevy_asset::Assets; use bevy_render::{ base_render_graph, draw_target::AssignedMeshesDrawTarget, @@ -36,9 +36,9 @@ impl ForwardPbrRenderGraphBuilder for RenderGraph { resources, ); self.add_system_node_named(node::LIGHTS, LightsNode::new(10), resources); - let mut shaders = resources.get_mut::>().unwrap(); + let mut shaders = resources.get_mut::>().unwrap(); let mut pipelines = resources - .get_mut::>() + .get_mut::>() .unwrap(); { let main_pass: &mut PassNode = self diff --git a/crates/bevy_pbr/src/pipelines/forward/mod.rs b/crates/bevy_pbr/src/pipelines/forward/mod.rs index 4b60c8f9b7..8de884189a 100644 --- a/crates/bevy_pbr/src/pipelines/forward/mod.rs +++ b/crates/bevy_pbr/src/pipelines/forward/mod.rs @@ -1,4 +1,4 @@ -use bevy_asset::AssetStorage; +use bevy_asset::Assets; use bevy_render::{ pipeline::{ state_descriptors::{ @@ -12,7 +12,7 @@ use bevy_render::{ texture::TextureFormat, }; -pub fn build_forward_pipeline(shaders: &mut AssetStorage) -> PipelineDescriptor { +pub fn build_forward_pipeline(shaders: &mut Assets) -> PipelineDescriptor { PipelineDescriptor { rasterization_state: Some(RasterizationStateDescriptor { front_face: FrontFace::Ccw, diff --git a/crates/bevy_render/src/mesh.rs b/crates/bevy_render/src/mesh.rs index 63ff28b80b..05f393c3cb 100644 --- a/crates/bevy_render/src/mesh.rs +++ b/crates/bevy_render/src/mesh.rs @@ -8,7 +8,7 @@ use crate::{ shader::AsUniforms, Renderable, Vertex, }; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use glam::*; use legion::prelude::*; use std::borrow::Cow; @@ -312,7 +312,7 @@ pub mod shape { pub fn mesh_specializer_system() -> Box { SystemBuilder::new("mesh_specializer") - .read_resource::>() + .read_resource::>() .with_query( <(Read>, Write)>::query() .filter(changed::>() | changed::()), @@ -333,7 +333,7 @@ fn setup_mesh_resource( render_resource_assignments: &mut RenderResourceAssignments, vertex_buffer_descriptor: &VertexBufferDescriptor, handle: Handle, - meshes: &AssetStorage, + meshes: &Assets, ) { log::trace!("setup mesh for {:?}", render_resource_assignments.id); let index_format = IndexFormat::Uint16; @@ -381,7 +381,7 @@ pub fn mesh_resource_provider_system(resources: &mut Resources) -> Box() - .read_resource::>() + .read_resource::>() .with_query(<(Read>, Write)>::query()) .build( move |_, world, (render_resource_context, meshes /* asset_batchers*/), query| { diff --git a/crates/bevy_render/src/pipeline/pipeline.rs b/crates/bevy_render/src/pipeline/pipeline.rs index e3e94cf53b..1aed1ebe10 100644 --- a/crates/bevy_render/src/pipeline/pipeline.rs +++ b/crates/bevy_render/src/pipeline/pipeline.rs @@ -11,7 +11,7 @@ use crate::{ shader::{Shader, ShaderStages}, texture::TextureFormat, }; -use bevy_asset::AssetStorage; +use bevy_asset::Assets; // TODO: consider removing this in favor of Option #[derive(Clone, Debug)] @@ -145,7 +145,7 @@ impl PipelineDescriptor { /// render resource. pub fn reflect_layout( &mut self, - shaders: &AssetStorage, + shaders: &Assets, bevy_conventions: bool, vertex_buffer_descriptors: Option<&VertexBufferDescriptors>, render_resource_assignments: Option<&RenderResourceAssignments>, diff --git a/crates/bevy_render/src/pipeline/pipeline_compiler.rs b/crates/bevy_render/src/pipeline/pipeline_compiler.rs index e3c5a82df0..80f78a706a 100644 --- a/crates/bevy_render/src/pipeline/pipeline_compiler.rs +++ b/crates/bevy_render/src/pipeline/pipeline_compiler.rs @@ -4,7 +4,7 @@ use crate::{ shader::{Shader, ShaderSource}, Renderable, }; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use std::collections::{HashMap, HashSet}; use legion::prelude::*; @@ -34,7 +34,7 @@ pub struct PipelineCompiler { impl PipelineCompiler { fn compile_shader( &mut self, - shader_storage: &mut AssetStorage, + shaders: &mut Assets, shader_handle: &Handle, shader_specialization: &ShaderSpecialization, ) -> Handle { @@ -43,7 +43,7 @@ impl PipelineCompiler { .entry(*shader_handle) .or_insert_with(|| Vec::new()); - let shader = shader_storage.get(shader_handle).unwrap(); + let shader = shaders.get(shader_handle).unwrap(); // don't produce new shader if the input source is already spirv if let ShaderSource::Spirv(_) = shader.source { @@ -67,7 +67,7 @@ impl PipelineCompiler { .cloned() .collect::>(); let compiled_shader = shader.get_spirv_shader(Some(&shader_def_vec)); - let compiled_handle = shader_storage.add(compiled_shader); + let compiled_handle = shaders.add(compiled_shader); compiled_shaders.push((shader_specialization.clone(), compiled_handle)); compiled_handle } @@ -76,7 +76,7 @@ impl PipelineCompiler { fn compile_pipeline( &mut self, vertex_buffer_descriptors: &VertexBufferDescriptors, - shaders: &mut AssetStorage, + shaders: &mut Assets, pipeline_descriptor: &PipelineDescriptor, render_resource_assignments: &RenderResourceAssignments, ) -> PipelineDescriptor { @@ -120,12 +120,12 @@ impl PipelineCompiler { &mut self, vertex_buffer_descriptors: &VertexBufferDescriptors, shader_pipeline_assignments: &mut PipelineAssignments, - pipeline_storage: &mut AssetStorage, - shader_storage: &mut AssetStorage, - pipelines: &[Handle], + pipelines: &mut Assets, + shaders: &mut Assets, + pipeline_handles: &[Handle], render_resource_assignments: &RenderResourceAssignments, ) { - for pipeline_handle in pipelines.iter() { + for pipeline_handle in pipeline_handles.iter() { if let None = self.pipeline_source_to_compiled.get(pipeline_handle) { self.pipeline_source_to_compiled .insert(*pipeline_handle, Vec::new()); @@ -141,14 +141,14 @@ impl PipelineCompiler { }) { *macroed_pipeline_handle } else { - let pipeline_descriptor = pipeline_storage.get(pipeline_handle).unwrap(); + let pipeline_descriptor = pipelines.get(pipeline_handle).unwrap(); let compiled_pipeline = self.compile_pipeline( vertex_buffer_descriptors, - shader_storage, + shaders, pipeline_descriptor, render_resource_assignments, ); - let compiled_pipeline_handle = pipeline_storage.add(compiled_pipeline); + let compiled_pipeline_handle = pipelines.add(compiled_pipeline); let macro_pipelines = self .pipeline_source_to_compiled @@ -211,10 +211,10 @@ pub fn update_shader_assignments(world: &mut World, resources: &Resources) { { let mut shader_pipeline_assignments = resources.get_mut::().unwrap(); let mut pipeline_compiler = resources.get_mut::().unwrap(); - let mut shader_storage = 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::>() + .get_mut::>() .unwrap(); // reset assignments so they are updated every frame @@ -231,7 +231,7 @@ pub fn update_shader_assignments(world: &mut World, resources: &Resources) { &vertex_buffer_descriptors, &mut shader_pipeline_assignments, &mut pipeline_descriptor_storage, - &mut shader_storage, + &mut shaders, &renderable.pipelines, &renderable.render_resource_assignments, ); diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs index fb30856d28..cfdbb3cfb9 100644 --- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs @@ -7,7 +7,7 @@ use crate::{ renderer::RenderContext, shader::{FieldBindType, Shader}, }; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use legion::prelude::*; pub struct PassNode { @@ -77,7 +77,7 @@ impl Node for PassNode { _output: &mut ResourceSlots, ) { let pipeline_compiler = resources.get::().unwrap(); - let pipeline_storage = resources.get::>().unwrap(); + let pipelines = resources.get::>().unwrap(); for (i, color_attachment) in self.descriptor.color_attachments.iter_mut().enumerate() { if let Some(input_index) = self.color_attachment_input_indices[i] { @@ -94,14 +94,14 @@ impl Node for PassNode { .attachment = TextureAttachment::RenderResource(input.get(input_index).unwrap()); } - let shader_storage = resources.get::>().unwrap(); + let shaders = resources.get::>().unwrap(); for (pipeline_handle, draw_targets) in self.pipelines.iter_mut() { if let Some(compiled_pipelines_iter) = pipeline_compiler.iter_compiled_pipelines(*pipeline_handle) { for compiled_pipeline_handle in compiled_pipelines_iter { let compiled_pipeline_descriptor = - pipeline_storage.get(compiled_pipeline_handle).unwrap(); + pipelines.get(compiled_pipeline_handle).unwrap(); let pipeline_layout = compiled_pipeline_descriptor.get_layout().unwrap(); { @@ -117,7 +117,7 @@ impl Node for PassNode { render_context.resources().create_render_pipeline( *compiled_pipeline_handle, &compiled_pipeline_descriptor, - &shader_storage, + &shaders, ); for draw_target in draw_targets.iter_mut() { draw_target.setup( @@ -143,7 +143,7 @@ impl Node for PassNode { { for compiled_pipeline_handle in compiled_pipelines_iter { let compiled_pipeline_descriptor = - pipeline_storage.get(compiled_pipeline_handle).unwrap(); + pipelines.get(compiled_pipeline_handle).unwrap(); render_pass.set_pipeline(*compiled_pipeline_handle); for draw_target in draw_targets.iter() { draw_target.draw( diff --git a/crates/bevy_render/src/render_graph/nodes/uniform_node.rs b/crates/bevy_render/src/render_graph/nodes/uniform_node.rs index 09834bbe06..81f2938783 100644 --- a/crates/bevy_render/src/render_graph/nodes/uniform_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/uniform_node.rs @@ -10,7 +10,7 @@ use crate::{ texture, Renderable, }; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use legion::prelude::*; use std::{collections::HashMap, marker::PhantomData}; use texture::{SamplerDescriptor, Texture, TextureDescriptor}; @@ -400,7 +400,7 @@ where "uniform_resource_provider::<{}>", std::any::type_name::() )) - .read_resource::>() + .read_resource::>() .read_resource::() // TODO: this write on RenderResourceAssignments will prevent this system from running in parallel with other systems that do the same .with_query(<(Read, Read)>::query()) @@ -555,8 +555,8 @@ where initialize_vertex_buffer_descriptor::(&mut vertex_buffer_descriptors); // TODO: maybe run "update" here SystemBuilder::new("uniform_resource_provider") - .read_resource::>() - .read_resource::>() + .read_resource::>() + .read_resource::>() .read_resource::() // TODO: this write on RenderResourceAssignments will prevent this system from running in parallel with other systems that do the same .with_query(<(Read>, Read)>::query()) @@ -689,7 +689,7 @@ where fn setup_uniform_texture_resources( uniforms: &T, command_queue: &mut CommandQueue, - texture_storage: &AssetStorage, + textures: &Assets, render_resource_context: &dyn RenderResourceContext, render_resource_assignments: &mut RenderResourceAssignments, ) where @@ -712,7 +712,7 @@ fn setup_uniform_texture_resources( .unwrap(), ), None => { - let texture = texture_storage.get(&texture_handle).unwrap(); + let texture = textures.get(&texture_handle).unwrap(); let texture_descriptor: TextureDescriptor = texture.into(); let texture_resource = 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 7cd9d980a6..9fdd089f7c 100644 --- a/crates/bevy_render/src/renderer/headless_render_resource_context.rs +++ b/crates/bevy_render/src/renderer/headless_render_resource_context.rs @@ -7,7 +7,7 @@ use crate::{ shader::Shader, texture::{SamplerDescriptor, TextureDescriptor}, }; -use bevy_asset::{AssetStorage, Handle, HandleUntyped}; +use bevy_asset::{Assets, Handle, HandleUntyped}; use bevy_window::{Window, WindowId}; use std::{ collections::HashMap, @@ -68,7 +68,7 @@ impl RenderResourceContext for HeadlessRenderResourceContext { fn create_shader_module( &self, _shader_handle: Handle, - _shader_storage: &AssetStorage, + _shaders: &Assets, ) { } fn remove_buffer(&self, resource: RenderResource) { @@ -113,7 +113,7 @@ impl RenderResourceContext for HeadlessRenderResourceContext { &self, _pipeline_handle: Handle, _pipeline_descriptor: &PipelineDescriptor, - _shader_storage: &AssetStorage, + _shaders: &Assets, ) { } fn create_bind_group( diff --git a/crates/bevy_render/src/renderer/render_resource_context.rs b/crates/bevy_render/src/renderer/render_resource_context.rs index 253d2409de..c869ebb54f 100644 --- a/crates/bevy_render/src/renderer/render_resource_context.rs +++ b/crates/bevy_render/src/renderer/render_resource_context.rs @@ -6,7 +6,7 @@ use crate::{ shader::Shader, texture::{SamplerDescriptor, TextureDescriptor}, }; -use bevy_asset::{AssetStorage, Handle, HandleUntyped}; +use bevy_asset::{Assets, Handle, HandleUntyped}; use bevy_window::{Window, WindowId}; use downcast_rs::{impl_downcast, Downcast}; @@ -43,7 +43,7 @@ pub trait RenderResourceContext: Downcast + Send + Sync + 'static { fn create_shader_module( &self, shader_handle: Handle, - shader_storage: &AssetStorage, + shaders: &Assets, ); fn create_shader_module_from_source( &self, @@ -73,7 +73,7 @@ pub trait RenderResourceContext: Downcast + Send + Sync + 'static { &self, pipeline_handle: Handle, pipeline_descriptor: &PipelineDescriptor, - shader_storage: &AssetStorage, + shaders: &Assets, ); fn create_bind_group( &self, diff --git a/crates/bevy_render/src/shader/uniform.rs b/crates/bevy_render/src/shader/uniform.rs index 88f06af77a..a7221ceb39 100644 --- a/crates/bevy_render/src/shader/uniform.rs +++ b/crates/bevy_render/src/shader/uniform.rs @@ -5,7 +5,7 @@ use crate::{ Renderable, }; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use bevy_core::bytes::GetBytes; use legion::prelude::*; @@ -34,7 +34,7 @@ where } pub fn asset_handle_shader_def_system( - asset_storage: Resource>, + assets: Resource>, asset_handle: Ref>, mut renderable: RefMut, ) where @@ -44,7 +44,7 @@ pub fn asset_handle_shader_def_system( return; } - let uniforms = asset_storage.get(&asset_handle).unwrap(); + let uniforms = assets.get(&asset_handle).unwrap(); if let Some(shader_defs) = uniforms.get_shader_defs() { renderable .render_resource_assignments diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index dc2e70012e..e069fff132 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -18,7 +18,7 @@ pub use sprite::*; pub use ui_update_system::*; use bevy_app::{stage, AppBuilder, AppPlugin}; -use bevy_asset::{AddAsset, AssetStorage, Handle}; +use bevy_asset::{AddAsset, Assets, Handle}; use bevy_render::{ mesh::{shape::Quad, Mesh}, render_graph::RenderGraph, @@ -47,7 +47,7 @@ impl AppPlugin for UiPlugin { let mut render_graph = resources.get_mut::().unwrap(); render_graph.add_ui_graph(resources); - let mut meshes = resources.get_mut::>().unwrap(); + let mut meshes = resources.get_mut::>().unwrap(); meshes.add_with_handle( QUAD_HANDLE, Mesh::from(Quad { @@ -55,7 +55,7 @@ impl AppPlugin for UiPlugin { }), ); - let mut color_materials = resources.get_mut::>().unwrap(); + let mut color_materials = resources.get_mut::>().unwrap(); color_materials.add_default(ColorMaterial::default()); } } diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 2a6d9a6d24..91299dcf77 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -1,5 +1,5 @@ use crate::{ColorMaterial, Rect}; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use bevy_render::{ base_render_graph, draw_target::AssignedMeshesDrawTarget, @@ -16,7 +16,7 @@ use legion::prelude::Resources; pub const UI_PIPELINE_HANDLE: Handle = Handle::from_u128(323432002226399387835192542539754486265); -pub fn build_ui_pipeline(shaders: &mut AssetStorage) -> PipelineDescriptor { +pub fn build_ui_pipeline(shaders: &mut Assets) -> PipelineDescriptor { PipelineDescriptor { rasterization_state: Some(RasterizationStateDescriptor { front_face: FrontFace::Ccw, @@ -78,9 +78,9 @@ impl UiRenderGraphBuilder for RenderGraph { self.add_node_edge("rect", base_render_graph::node::MAIN_PASS) .unwrap(); let mut pipelines = resources - .get_mut::>() + .get_mut::>() .unwrap(); - let mut shaders = 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 .get_node_mut(base_render_graph::node::MAIN_PASS) diff --git a/crates/bevy_ui/src/sprite.rs b/crates/bevy_ui/src/sprite.rs index dc7083b273..2cf56bf547 100644 --- a/crates/bevy_ui/src/sprite.rs +++ b/crates/bevy_ui/src/sprite.rs @@ -1,5 +1,5 @@ use crate::{ColorMaterial, Rect}; -use bevy_asset::{AssetStorage, Handle}; +use bevy_asset::{Assets, Handle}; use bevy_render::texture::Texture; pub use legion::prelude::*; pub struct Sprite { @@ -14,8 +14,8 @@ impl Default for Sprite { pub fn sprite_system() -> Box { SystemBuilder::new("sprite_system") - .read_resource::>() - .read_resource::>() + .read_resource::>() + .read_resource::>() .with_query( <(Read, Read>, Write)>::query().filter( changed::() | changed::() | changed::>(), diff --git a/crates/bevy_wgpu/src/renderer/systems.rs b/crates/bevy_wgpu/src/renderer/systems.rs index 165e161c7c..212db4b86e 100644 --- a/crates/bevy_wgpu/src/renderer/systems.rs +++ b/crates/bevy_wgpu/src/renderer/systems.rs @@ -1,4 +1,4 @@ -use bevy_asset::AssetStorage; +use bevy_asset::Assets; use bevy_render::{ pipeline::{PipelineAssignments, PipelineCompiler, PipelineDescriptor}, render_resource::EntityRenderResourceAssignments, @@ -8,7 +8,7 @@ use legion::prelude::*; pub fn render_resource_sets_system() -> Box { SystemBuilder::new("update_render_resource_sets") - .read_resource::>() + .read_resource::>() .read_resource::() .read_resource::() .read_resource::() 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 c1c1def19d..4d68330205 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -3,7 +3,7 @@ use crate::{ WgpuBindGroupInfo, WgpuResources, }; -use bevy_asset::{AssetStorage, Handle, HandleUntyped}; +use bevy_asset::{Assets, Handle, HandleUntyped}; use bevy_render::{ pipeline::{BindGroupDescriptor, PipelineDescriptor}, render_resource::{ @@ -297,7 +297,7 @@ impl RenderResourceContext for WgpuRenderResourceContext { fn create_shader_module( &self, shader_handle: Handle, - shader_storage: &AssetStorage, + shaders: &Assets, ) { if self .resources @@ -309,7 +309,7 @@ impl RenderResourceContext for WgpuRenderResourceContext { { return; } - let shader = shader_storage.get(&shader_handle).unwrap(); + let shader = shaders.get(&shader_handle).unwrap(); self.create_shader_module_from_source(shader_handle, shader); } @@ -374,7 +374,7 @@ impl RenderResourceContext for WgpuRenderResourceContext { &self, pipeline_handle: Handle, pipeline_descriptor: &PipelineDescriptor, - shaders: &AssetStorage, + shaders: &Assets, ) { if self .resources diff --git a/examples/2d/sprite.rs b/examples/2d/sprite.rs index 0dcfbe8690..7891fff09a 100644 --- a/examples/2d/sprite.rs +++ b/examples/2d/sprite.rs @@ -8,11 +8,11 @@ fn main() { } fn setup(world: &mut World, resources: &mut Resources) { - let mut texture_storage = resources.get_mut::>().unwrap(); + let mut textures = resources.get_mut::>().unwrap(); let texture_path = concat!(env!("CARGO_MANIFEST_DIR"), "/assets/branding/icon.png"); let texture = Texture::load(TextureType::Png(texture_path.to_string())); - let texture_handle = texture_storage.add(texture); - let mut color_materials = resources.get_mut::>().unwrap(); + let texture_handle = textures.add(texture); + let mut color_materials = resources.get_mut::>().unwrap(); world .build() diff --git a/examples/3d/load_model.rs b/examples/3d/load_model.rs index 36d6de2b9e..98c2b62f82 100644 --- a/examples/3d/load_model.rs +++ b/examples/3d/load_model.rs @@ -11,14 +11,14 @@ fn setup(world: &mut World, resources: &mut Resources) { // load the mesh let model_path = concat!(env!("CARGO_MANIFEST_DIR"), "/assets/models/Monkey.gltf"); let mesh = gltf::load_gltf(&model_path).unwrap().unwrap(); - let mut mesh_storage = resources.get_mut::>().unwrap(); - let mesh_handle = mesh_storage.add(mesh); + let mut meshes = resources.get_mut::>().unwrap(); + let mesh_handle = meshes.add(mesh); // create a material for the mesh - let mut material_storage = resources - .get_mut::>() + let mut materials = resources + .get_mut::>() .unwrap(); - let material_handle = material_storage.add(StandardMaterial { + let material_handle = materials.add(StandardMaterial { albedo: Color::rgb(0.5, 0.4, 0.3), ..Default::default() }); diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs index 115c66be52..60ad35c068 100644 --- a/examples/3d/parenting.rs +++ b/examples/3d/parenting.rs @@ -17,12 +17,12 @@ fn rotator_system(time: Resource