 54006b107b
			
		
	
	
		54006b107b
		
			
		
	
	
	
	
		
			
			# Objective A big step in the migration to required components: meshes and materials! ## Solution As per the [selected proposal](https://hackmd.io/@bevy/required_components/%2Fj9-PnF-2QKK0on1KQ29UWQ): - Deprecate `MaterialMesh2dBundle`, `MaterialMeshBundle`, and `PbrBundle`. - Add `Mesh2d` and `Mesh3d` components, which wrap a `Handle<Mesh>`. - Add `MeshMaterial2d<M: Material2d>` and `MeshMaterial3d<M: Material>`, which wrap a `Handle<M>`. - Meshes *without* a mesh material should be rendered with a default material. The existence of a material is determined by `HasMaterial2d`/`HasMaterial3d`, which is required by `MeshMaterial2d`/`MeshMaterial3d`. This gets around problems with the generics. Previously: ```rust commands.spawn(MaterialMesh2dBundle { mesh: meshes.add(Circle::new(100.0)).into(), material: materials.add(Color::srgb(7.5, 0.0, 7.5)), transform: Transform::from_translation(Vec3::new(-200., 0., 0.)), ..default() }); ``` Now: ```rust commands.spawn(( Mesh2d(meshes.add(Circle::new(100.0))), MeshMaterial2d(materials.add(Color::srgb(7.5, 0.0, 7.5))), Transform::from_translation(Vec3::new(-200., 0., 0.)), )); ``` If the mesh material is missing, previously nothing was rendered. Now, it renders a white default `ColorMaterial` in 2D and a `StandardMaterial` in 3D (this can be overridden). Below, only every other entity has a material:   Why white? This is still open for discussion, but I think white makes sense for a *default* material, while *invalid* asset handles pointing to nothing should have something like a pink material to indicate that something is broken (I don't handle that in this PR yet). This is kind of a mix of Godot and Unity: Godot just renders a white material for non-existent materials, while Unity renders nothing when no materials exist, but renders pink for invalid materials. I can also change the default material to pink if that is preferable though. ## Testing I ran some 2D and 3D examples to test if anything changed visually. I have not tested all examples or features yet however. If anyone wants to test more extensively, it would be appreciated! ## Implementation Notes - The relationship between `bevy_render` and `bevy_pbr` is weird here. `bevy_render` needs `Mesh3d` for its own systems, but `bevy_pbr` has all of the material logic, and `bevy_render` doesn't depend on it. I feel like the two crates should be refactored in some way, but I think that's out of scope for this PR. - I didn't migrate meshlets to required components yet. That can probably be done in a follow-up, as this is already a huge PR. - It is becoming increasingly clear to me that we really, *really* want to disallow raw asset handles as components. They caused me a *ton* of headache here already, and it took me a long time to find every place that queried for them or inserted them directly on entities, since there were no compiler errors for it. If we don't remove the `Component` derive, I expect raw asset handles to be a *huge* footgun for users as we transition to wrapper components, especially as handles as components have been the norm so far. I personally consider this to be a blocker for 0.15: we need to migrate to wrapper components for asset handles everywhere, and remove the `Component` derive. Also see https://github.com/bevyengine/bevy/issues/14124. --- ## Migration Guide Asset handles for meshes and mesh materials must now be wrapped in the `Mesh2d` and `MeshMaterial2d` or `Mesh3d` and `MeshMaterial3d` components for 2D and 3D respectively. Raw handles as components no longer render meshes. Additionally, `MaterialMesh2dBundle`, `MaterialMeshBundle`, and `PbrBundle` have been deprecated. Instead, use the mesh and material components directly. Previously: ```rust commands.spawn(MaterialMesh2dBundle { mesh: meshes.add(Circle::new(100.0)).into(), material: materials.add(Color::srgb(7.5, 0.0, 7.5)), transform: Transform::from_translation(Vec3::new(-200., 0., 0.)), ..default() }); ``` Now: ```rust commands.spawn(( Mesh2d(meshes.add(Circle::new(100.0))), MeshMaterial2d(materials.add(Color::srgb(7.5, 0.0, 7.5))), Transform::from_translation(Vec3::new(-200., 0., 0.)), )); ``` If the mesh material is missing, a white default material is now used. Previously, nothing was rendered if the material was missing. The `WithMesh2d` and `WithMesh3d` query filter type aliases have also been removed. Simply use `With<Mesh2d>` or `With<Mesh3d>`. --------- Co-authored-by: Tim Blackbird <justthecooldude@gmail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			94 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Renders a glTF mesh in 2D with a custom vertex attribute.
 | |
| 
 | |
| use bevy::{
 | |
|     gltf::GltfPlugin,
 | |
|     prelude::*,
 | |
|     reflect::TypePath,
 | |
|     render::{
 | |
|         mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef},
 | |
|         render_resource::*,
 | |
|     },
 | |
|     sprite::{Material2d, Material2dKey, Material2dPlugin},
 | |
| };
 | |
| 
 | |
| /// This example uses a shader source file from the assets subdirectory
 | |
| const SHADER_ASSET_PATH: &str = "shaders/custom_gltf_2d.wgsl";
 | |
| 
 | |
| /// This vertex attribute supplies barycentric coordinates for each triangle.
 | |
| ///
 | |
| /// Each component of the vector corresponds to one corner of a triangle. It's
 | |
| /// equal to 1.0 in that corner and 0.0 in the other two. Hence, its value in
 | |
| /// the fragment shader indicates proximity to a corner or the opposite edge.
 | |
| const ATTRIBUTE_BARYCENTRIC: MeshVertexAttribute =
 | |
|     MeshVertexAttribute::new("Barycentric", 2137464976, VertexFormat::Float32x3);
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .insert_resource(AmbientLight {
 | |
|             color: Color::WHITE,
 | |
|             brightness: 1.0 / 5.0f32,
 | |
|         })
 | |
|         .add_plugins((
 | |
|             DefaultPlugins.set(
 | |
|                 GltfPlugin::default()
 | |
|                     // Map a custom glTF attribute name to a `MeshVertexAttribute`.
 | |
|                     .add_custom_vertex_attribute("_BARYCENTRIC", ATTRIBUTE_BARYCENTRIC),
 | |
|             ),
 | |
|             Material2dPlugin::<CustomMaterial>::default(),
 | |
|         ))
 | |
|         .add_systems(Startup, setup)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     asset_server: Res<AssetServer>,
 | |
|     mut materials: ResMut<Assets<CustomMaterial>>,
 | |
| ) {
 | |
|     // Add a mesh loaded from a glTF file. This mesh has data for `ATTRIBUTE_BARYCENTRIC`.
 | |
|     let mesh = asset_server.load(
 | |
|         GltfAssetLabel::Primitive {
 | |
|             mesh: 0,
 | |
|             primitive: 0,
 | |
|         }
 | |
|         .from_asset("models/barycentric/barycentric.gltf"),
 | |
|     );
 | |
|     commands.spawn((
 | |
|         Mesh2d(mesh),
 | |
|         MeshMaterial2d(materials.add(CustomMaterial {})),
 | |
|         Transform::from_scale(150.0 * Vec3::ONE),
 | |
|     ));
 | |
| 
 | |
|     // Add a camera
 | |
|     commands.spawn(Camera2dBundle { ..default() });
 | |
| }
 | |
| 
 | |
| /// This custom material uses barycentric coordinates from
 | |
| /// `ATTRIBUTE_BARYCENTRIC` to shade a white border around each triangle. The
 | |
| /// thickness of the border is animated using the global time shader uniform.
 | |
| #[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 | |
| struct CustomMaterial {}
 | |
| 
 | |
| impl Material2d for CustomMaterial {
 | |
|     fn vertex_shader() -> ShaderRef {
 | |
|         SHADER_ASSET_PATH.into()
 | |
|     }
 | |
|     fn fragment_shader() -> ShaderRef {
 | |
|         SHADER_ASSET_PATH.into()
 | |
|     }
 | |
| 
 | |
|     fn specialize(
 | |
|         descriptor: &mut RenderPipelineDescriptor,
 | |
|         layout: &MeshVertexBufferLayoutRef,
 | |
|         _key: Material2dKey<Self>,
 | |
|     ) -> Result<(), SpecializedMeshPipelineError> {
 | |
|         let vertex_layout = layout.0.get_layout(&[
 | |
|             Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
 | |
|             Mesh::ATTRIBUTE_COLOR.at_shader_location(1),
 | |
|             ATTRIBUTE_BARYCENTRIC.at_shader_location(2),
 | |
|         ])?;
 | |
|         descriptor.vertex.buffers = vec![vertex_layout];
 | |
|         Ok(())
 | |
|     }
 | |
| }
 |