 25bfa80e60
			
		
	
	
		25bfa80e60
		
			
		
	
	
	
	
		
			
			# 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.
		
			
				
	
	
		
			76 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			76 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! A shader that samples a texture with view-independent UV coordinates.
 | |
| 
 | |
| use bevy::{
 | |
|     prelude::*,
 | |
|     reflect::TypePath,
 | |
|     render::render_resource::{AsBindGroup, ShaderRef},
 | |
| };
 | |
| 
 | |
| /// This example uses a shader source file from the assets subdirectory
 | |
| const SHADER_ASSET_PATH: &str = "shaders/custom_material_screenspace_texture.wgsl";
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins((DefaultPlugins, MaterialPlugin::<CustomMaterial>::default()))
 | |
|         .add_systems(Startup, setup)
 | |
|         .add_systems(Update, rotate_camera)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Component)]
 | |
| struct MainCamera;
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     asset_server: Res<AssetServer>,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut custom_materials: ResMut<Assets<CustomMaterial>>,
 | |
|     mut standard_materials: ResMut<Assets<StandardMaterial>>,
 | |
| ) {
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
 | |
|         MeshMaterial3d(standard_materials.add(Color::srgb(0.3, 0.5, 0.3))),
 | |
|     ));
 | |
|     commands.spawn((PointLight::default(), Transform::from_xyz(4.0, 8.0, 4.0)));
 | |
| 
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Cuboid::default())),
 | |
|         MeshMaterial3d(custom_materials.add(CustomMaterial {
 | |
|             texture: asset_server.load(
 | |
|                 "models/FlightHelmet/FlightHelmet_Materials_LensesMat_OcclusionRoughMetal.png",
 | |
|             ),
 | |
|         })),
 | |
|         Transform::from_xyz(0.0, 0.5, 0.0),
 | |
|     ));
 | |
| 
 | |
|     // camera
 | |
|     commands.spawn((
 | |
|         Camera3d::default(),
 | |
|         Transform::from_xyz(4.0, 2.5, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         MainCamera,
 | |
|     ));
 | |
| }
 | |
| 
 | |
| fn rotate_camera(mut camera: Query<&mut Transform, With<MainCamera>>, time: Res<Time>) {
 | |
|     let cam_transform = camera.single_mut().into_inner();
 | |
| 
 | |
|     cam_transform.rotate_around(
 | |
|         Vec3::ZERO,
 | |
|         Quat::from_axis_angle(Vec3::Y, 45f32.to_radians() * time.delta_seconds()),
 | |
|     );
 | |
|     cam_transform.look_at(Vec3::ZERO, Vec3::Y);
 | |
| }
 | |
| 
 | |
| #[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 | |
| struct CustomMaterial {
 | |
|     #[texture(0)]
 | |
|     #[sampler(1)]
 | |
|     texture: Handle<Image>,
 | |
| }
 | |
| 
 | |
| impl Material for CustomMaterial {
 | |
|     fn fragment_shader() -> ShaderRef {
 | |
|         SHADER_ASSET_PATH.into()
 | |
|     }
 | |
| }
 |