 f18f28874a
			
		
	
	
		f18f28874a
		
			
		
	
	
	
	
		
			
			# Objective - Better consistency with `add_systems`. - Deprecating `add_plugin` in favor of a more powerful `add_plugins`. - Allow passing `Plugin` to `add_plugins`. - Allow passing tuples to `add_plugins`. ## Solution - `App::add_plugins` now takes an `impl Plugins` parameter. - `App::add_plugin` is deprecated. - `Plugins` is a new sealed trait that is only implemented for `Plugin`, `PluginGroup` and tuples over `Plugins`. - All examples, benchmarks and tests are changed to use `add_plugins`, using tuples where appropriate. --- ## Changelog ### Changed - `App::add_plugins` now accepts all types that implement `Plugins`, which is implemented for: - Types that implement `Plugin`. - Types that implement `PluginGroup`. - Tuples (up to 16 elements) over types that implement `Plugins`. - Deprecated `App::add_plugin` in favor of `App::add_plugins`. ## Migration Guide - Replace `app.add_plugin(plugin)` calls with `app.add_plugins(plugin)`. --------- Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			122 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Create a custom material to draw basic lines in 3D
 | |
| 
 | |
| use bevy::{
 | |
|     pbr::{MaterialPipeline, MaterialPipelineKey},
 | |
|     prelude::*,
 | |
|     reflect::{TypePath, TypeUuid},
 | |
|     render::{
 | |
|         mesh::{MeshVertexBufferLayout, PrimitiveTopology},
 | |
|         render_resource::{
 | |
|             AsBindGroup, PolygonMode, RenderPipelineDescriptor, ShaderRef,
 | |
|             SpecializedMeshPipelineError,
 | |
|         },
 | |
|     },
 | |
| };
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins((DefaultPlugins, MaterialPlugin::<LineMaterial>::default()))
 | |
|         .add_systems(Startup, setup)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<LineMaterial>>,
 | |
| ) {
 | |
|     // Spawn a list of lines with start and end points for each lines
 | |
|     commands.spawn(MaterialMeshBundle {
 | |
|         mesh: meshes.add(Mesh::from(LineList {
 | |
|             lines: vec![
 | |
|                 (Vec3::ZERO, Vec3::new(1.0, 1.0, 0.0)),
 | |
|                 (Vec3::new(1.0, 1.0, 0.0), Vec3::new(1.0, 0.0, 0.0)),
 | |
|             ],
 | |
|         })),
 | |
|         transform: Transform::from_xyz(-1.5, 0.0, 0.0),
 | |
|         material: materials.add(LineMaterial {
 | |
|             color: Color::GREEN,
 | |
|         }),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // Spawn a line strip that goes from point to point
 | |
|     commands.spawn(MaterialMeshBundle {
 | |
|         mesh: meshes.add(Mesh::from(LineStrip {
 | |
|             points: vec![
 | |
|                 Vec3::ZERO,
 | |
|                 Vec3::new(1.0, 1.0, 0.0),
 | |
|                 Vec3::new(1.0, 0.0, 0.0),
 | |
|             ],
 | |
|         })),
 | |
|         transform: Transform::from_xyz(0.5, 0.0, 0.0),
 | |
|         material: materials.add(LineMaterial { color: Color::BLUE }),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // camera
 | |
|     commands.spawn(Camera3dBundle {
 | |
|         transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         ..default()
 | |
|     });
 | |
| }
 | |
| 
 | |
| #[derive(Default, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 | |
| #[uuid = "050ce6ac-080a-4d8c-b6b5-b5bab7560d8f"]
 | |
| struct LineMaterial {
 | |
|     #[uniform(0)]
 | |
|     color: Color,
 | |
| }
 | |
| 
 | |
| impl Material for LineMaterial {
 | |
|     fn fragment_shader() -> ShaderRef {
 | |
|         "shaders/line_material.wgsl".into()
 | |
|     }
 | |
| 
 | |
|     fn specialize(
 | |
|         _pipeline: &MaterialPipeline<Self>,
 | |
|         descriptor: &mut RenderPipelineDescriptor,
 | |
|         _layout: &MeshVertexBufferLayout,
 | |
|         _key: MaterialPipelineKey<Self>,
 | |
|     ) -> Result<(), SpecializedMeshPipelineError> {
 | |
|         // This is the important part to tell bevy to render this material as a line between vertices
 | |
|         descriptor.primitive.polygon_mode = PolygonMode::Line;
 | |
|         Ok(())
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// A list of lines with a start and end position
 | |
| #[derive(Debug, Clone)]
 | |
| pub struct LineList {
 | |
|     pub lines: Vec<(Vec3, Vec3)>,
 | |
| }
 | |
| 
 | |
| impl From<LineList> for Mesh {
 | |
|     fn from(line: LineList) -> Self {
 | |
|         // This tells wgpu that the positions are list of lines
 | |
|         // where every pair is a start and end point
 | |
|         let mut mesh = Mesh::new(PrimitiveTopology::LineList);
 | |
| 
 | |
|         let vertices: Vec<_> = line.lines.into_iter().flat_map(|(a, b)| [a, b]).collect();
 | |
|         mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
 | |
|         mesh
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// A list of points that will have a line drawn between each consecutive points
 | |
| #[derive(Debug, Clone)]
 | |
| pub struct LineStrip {
 | |
|     pub points: Vec<Vec3>,
 | |
| }
 | |
| 
 | |
| impl From<LineStrip> for Mesh {
 | |
|     fn from(line: LineStrip) -> Self {
 | |
|         // This tells wgpu that the positions are a list of points
 | |
|         // where a line will be drawn between each consecutive point
 | |
|         let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
 | |
| 
 | |
|         mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, line.points);
 | |
|         mesh
 | |
|     }
 | |
| }
 |