From 1db77b2435675150b624a07891804c7fffa69148 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Thu, 16 Jul 2020 17:20:42 -0700 Subject: [PATCH] examples: cleanup imports --- examples/2d/texture_atlas.rs | 8 +++++--- examples/3d/3d_scene.rs | 1 - examples/shader/shader_custom_material.rs | 10 ++++++---- examples/shader/shader_defs.rs | 11 +++++++---- examples/window/multiple_windows.rs | 3 +-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs index de61fb7364..08a813ba93 100644 --- a/examples/2d/texture_atlas.rs +++ b/examples/2d/texture_atlas.rs @@ -1,6 +1,8 @@ -use bevy::prelude::*; -use bevy_asset::{HandleId, LoadState}; -use bevy_sprite::TextureAtlasBuilder; +use bevy::{ + asset::{HandleId, LoadState}, + prelude::*, + sprite::TextureAtlasBuilder, +}; fn main() { App::build() diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs index 8430168bb1..858c0c223b 100644 --- a/examples/3d/3d_scene.rs +++ b/examples/3d/3d_scene.rs @@ -13,7 +13,6 @@ fn setup( mut meshes: ResMut>, mut materials: ResMut>, ) { - // create a cube and a plane mesh let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 })); let plane_handle = meshes.add(Mesh::from(shape::Plane { size: 10.0 })); diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs index 16eb9f4bee..b45e752910 100644 --- a/examples/shader/shader_custom_material.rs +++ b/examples/shader/shader_custom_material.rs @@ -1,7 +1,9 @@ -use bevy::prelude::*; -use bevy_render::{ - base_render_graph, - pipeline::{DynamicBinding, PipelineSpecialization, RenderPipeline}, +use bevy::{ + prelude::*, + render::{ + base_render_graph, + pipeline::{DynamicBinding, PipelineSpecialization, RenderPipeline}, + }, }; fn main() { diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs index e827b4e069..75a24a418a 100644 --- a/examples/shader/shader_defs.rs +++ b/examples/shader/shader_defs.rs @@ -1,7 +1,10 @@ -use bevy::{prelude::*, render::shader}; -use bevy_render::{ - base_render_graph, - pipeline::{DynamicBinding, PipelineSpecialization, RenderPipeline}, +use bevy::{ + prelude::*, + render::{ + base_render_graph, + pipeline::{DynamicBinding, PipelineSpecialization, RenderPipeline}, + shader, + }, }; fn main() { diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs index 04844cc482..8692a8b881 100644 --- a/examples/window/multiple_windows.rs +++ b/examples/window/multiple_windows.rs @@ -2,7 +2,7 @@ use bevy::{ prelude::*, render::{ pass::{ - LoadOp, PassDescriptor, RenderPassColorAttachmentDescriptor, + LoadOp, Operations, PassDescriptor, RenderPassColorAttachmentDescriptor, RenderPassDepthStencilAttachmentDescriptor, TextureAttachment, }, texture::{TextureDescriptor, TextureFormat, TextureUsage}, @@ -10,7 +10,6 @@ use bevy::{ }, window::{CreateWindow, WindowId, WindowReference}, }; -use bevy_render::pass::Operations; fn main() { App::build()