# Objective Yet another PR for migrating stuff to required components. This time, cameras! ## Solution As per the [selected proposal](https://hackmd.io/tsYID4CGRiWxzsgawzxG_g#Combined-Proposal-1-Selected), deprecate `Camera2dBundle` and `Camera3dBundle` in favor of `Camera2d` and `Camera3d`. Adding a `Camera` without `Camera2d` or `Camera3d` now logs a warning, as suggested by Cart [on Discord](https://discord.com/channels/691052431525675048/1264881140007702558/1291506402832945273). I would personally like cameras to work a bit differently and be split into a few more components, to avoid some footguns and confusing semantics, but that is more controversial, and shouldn't block this core migration. ## Testing I ran a few 2D and 3D examples, and tried cameras with and without render graphs. --- ## Migration Guide `Camera2dBundle` and `Camera3dBundle` have been deprecated in favor of `Camera2d` and `Camera3d`. Inserting them will now also insert the other components required by them automatically.
		
			
				
	
	
		
			102 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
//! A shader that uses "shaders defs", which selectively toggle parts of a shader.
 | 
						|
 | 
						|
use bevy::{
 | 
						|
    pbr::{MaterialPipeline, MaterialPipelineKey},
 | 
						|
    prelude::*,
 | 
						|
    reflect::TypePath,
 | 
						|
    render::{
 | 
						|
        mesh::MeshVertexBufferLayoutRef,
 | 
						|
        render_resource::{
 | 
						|
            AsBindGroup, RenderPipelineDescriptor, ShaderRef, SpecializedMeshPipelineError,
 | 
						|
        },
 | 
						|
    },
 | 
						|
};
 | 
						|
 | 
						|
/// This example uses a shader source file from the assets subdirectory
 | 
						|
const SHADER_ASSET_PATH: &str = "shaders/shader_defs.wgsl";
 | 
						|
 | 
						|
fn main() {
 | 
						|
    App::new()
 | 
						|
        .add_plugins((DefaultPlugins, MaterialPlugin::<CustomMaterial>::default()))
 | 
						|
        .add_systems(Startup, setup)
 | 
						|
        .run();
 | 
						|
}
 | 
						|
 | 
						|
/// set up a simple 3D scene
 | 
						|
fn setup(
 | 
						|
    mut commands: Commands,
 | 
						|
    mut meshes: ResMut<Assets<Mesh>>,
 | 
						|
    mut materials: ResMut<Assets<CustomMaterial>>,
 | 
						|
) {
 | 
						|
    // blue cube
 | 
						|
    commands.spawn((
 | 
						|
        Mesh3d(meshes.add(Cuboid::default())),
 | 
						|
        MeshMaterial3d(materials.add(CustomMaterial {
 | 
						|
            color: LinearRgba::BLUE,
 | 
						|
            is_red: false,
 | 
						|
        })),
 | 
						|
        Transform::from_xyz(-1.0, 0.5, 0.0),
 | 
						|
    ));
 | 
						|
 | 
						|
    // red cube (with green color overridden by the IS_RED "shader def")
 | 
						|
    commands.spawn((
 | 
						|
        Mesh3d(meshes.add(Cuboid::default())),
 | 
						|
        MeshMaterial3d(materials.add(CustomMaterial {
 | 
						|
            color: LinearRgba::GREEN,
 | 
						|
            is_red: true,
 | 
						|
        })),
 | 
						|
        Transform::from_xyz(1.0, 0.5, 0.0),
 | 
						|
    ));
 | 
						|
 | 
						|
    // camera
 | 
						|
    commands.spawn((
 | 
						|
        Camera3d::default(),
 | 
						|
        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | 
						|
    ));
 | 
						|
}
 | 
						|
 | 
						|
impl Material for CustomMaterial {
 | 
						|
    fn fragment_shader() -> ShaderRef {
 | 
						|
        SHADER_ASSET_PATH.into()
 | 
						|
    }
 | 
						|
 | 
						|
    fn specialize(
 | 
						|
        _pipeline: &MaterialPipeline<Self>,
 | 
						|
        descriptor: &mut RenderPipelineDescriptor,
 | 
						|
        _layout: &MeshVertexBufferLayoutRef,
 | 
						|
        key: MaterialPipelineKey<Self>,
 | 
						|
    ) -> Result<(), SpecializedMeshPipelineError> {
 | 
						|
        if key.bind_group_data.is_red {
 | 
						|
            let fragment = descriptor.fragment.as_mut().unwrap();
 | 
						|
            fragment.shader_defs.push("IS_RED".into());
 | 
						|
        }
 | 
						|
        Ok(())
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
// This is the struct that will be passed to your shader
 | 
						|
#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 | 
						|
#[bind_group_data(CustomMaterialKey)]
 | 
						|
struct CustomMaterial {
 | 
						|
    #[uniform(0)]
 | 
						|
    color: LinearRgba,
 | 
						|
    is_red: bool,
 | 
						|
}
 | 
						|
 | 
						|
// This key is used to identify a specific permutation of this material pipeline.
 | 
						|
// In this case, we specialize on whether or not to configure the "IS_RED" shader def.
 | 
						|
// Specialization keys should be kept as small / cheap to hash as possible,
 | 
						|
// as they will be used to look up the pipeline for each drawn entity with this material type.
 | 
						|
#[derive(Eq, PartialEq, Hash, Clone)]
 | 
						|
struct CustomMaterialKey {
 | 
						|
    is_red: bool,
 | 
						|
}
 | 
						|
 | 
						|
impl From<&CustomMaterial> for CustomMaterialKey {
 | 
						|
    fn from(material: &CustomMaterial) -> Self {
 | 
						|
        Self {
 | 
						|
            is_red: material.is_red,
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 |