 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.
		
			
				
	
	
		
			159 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			159 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! A test to confirm that `bevy` allows setting the window to arbitrary small sizes
 | |
| //! This is run in CI to ensure that this doesn't regress again.
 | |
| 
 | |
| use bevy::{prelude::*, window::WindowResolution};
 | |
| 
 | |
| // The smallest size reached is 1x1, as X11 doesn't support windows with a 0 dimension
 | |
| // TODO: Add a check for platforms other than X11 for 0xk and kx0, despite those currently unsupported on CI.
 | |
| const MAX_WIDTH: u16 = 401;
 | |
| const MAX_HEIGHT: u16 = 401;
 | |
| const MIN_WIDTH: u16 = 1;
 | |
| const MIN_HEIGHT: u16 = 1;
 | |
| const RESIZE_STEP: u16 = 4;
 | |
| 
 | |
| #[derive(Resource)]
 | |
| struct Dimensions {
 | |
|     width: u16,
 | |
|     height: u16,
 | |
| }
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(
 | |
|             DefaultPlugins.set(WindowPlugin {
 | |
|                 primary_window: Some(Window {
 | |
|                     resolution: WindowResolution::new(MAX_WIDTH as f32, MAX_HEIGHT as f32)
 | |
|                         .with_scale_factor_override(1.0),
 | |
|                     title: "Resizing".into(),
 | |
|                     ..default()
 | |
|                 }),
 | |
|                 ..default()
 | |
|             }),
 | |
|         )
 | |
|         .insert_resource(Dimensions {
 | |
|             width: MAX_WIDTH,
 | |
|             height: MAX_HEIGHT,
 | |
|         })
 | |
|         .insert_resource(ContractingY)
 | |
|         .add_systems(Startup, (setup_3d, setup_2d))
 | |
|         .add_systems(Update, (change_window_size, sync_dimensions))
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Resource)]
 | |
| enum Phase {
 | |
|     ContractingY,
 | |
|     ContractingX,
 | |
|     ExpandingY,
 | |
|     ExpandingX,
 | |
| }
 | |
| 
 | |
| use Phase::*;
 | |
| 
 | |
| fn change_window_size(
 | |
|     mut windows: ResMut<Dimensions>,
 | |
|     mut phase: ResMut<Phase>,
 | |
|     mut first_complete: Local<bool>,
 | |
| ) {
 | |
|     // Put off rendering for one frame, as currently for a frame where
 | |
|     // resizing happens, nothing is presented.
 | |
|     // TODO: Debug and fix this if feasible
 | |
|     if !*first_complete {
 | |
|         *first_complete = true;
 | |
|         return;
 | |
|     }
 | |
|     let height = windows.height;
 | |
|     let width = windows.width;
 | |
|     match *phase {
 | |
|         ContractingY => {
 | |
|             if height <= MIN_HEIGHT {
 | |
|                 *phase = ContractingX;
 | |
|             } else {
 | |
|                 windows.height -= RESIZE_STEP;
 | |
|             }
 | |
|         }
 | |
|         ContractingX => {
 | |
|             if width <= MIN_WIDTH {
 | |
|                 *phase = ExpandingY;
 | |
|             } else {
 | |
|                 windows.width -= RESIZE_STEP;
 | |
|             }
 | |
|         }
 | |
|         ExpandingY => {
 | |
|             if height >= MAX_HEIGHT {
 | |
|                 *phase = ExpandingX;
 | |
|             } else {
 | |
|                 windows.height += RESIZE_STEP;
 | |
|             }
 | |
|         }
 | |
|         ExpandingX => {
 | |
|             if width >= MAX_WIDTH {
 | |
|                 *phase = ContractingY;
 | |
|             } else {
 | |
|                 windows.width += RESIZE_STEP;
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn sync_dimensions(dim: Res<Dimensions>, mut windows: Query<&mut Window>) {
 | |
|     if dim.is_changed() {
 | |
|         let mut window = windows.single_mut();
 | |
|         window.resolution.set(dim.width as f32, dim.height as f32);
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// A simple 3d scene, taken from the `3d_scene` example
 | |
| fn setup_3d(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<StandardMaterial>>,
 | |
| ) {
 | |
|     // plane
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
 | |
|         MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
 | |
|     ));
 | |
|     // cube
 | |
|     commands.spawn((
 | |
|         Mesh3d(meshes.add(Cuboid::default())),
 | |
|         MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
 | |
|         Transform::from_xyz(0.0, 0.5, 0.0),
 | |
|     ));
 | |
|     // light
 | |
|     commands.spawn((
 | |
|         PointLight {
 | |
|             shadows_enabled: true,
 | |
|             ..default()
 | |
|         },
 | |
|         Transform::from_xyz(4.0, 8.0, 4.0),
 | |
|     ));
 | |
|     // camera
 | |
|     commands.spawn((
 | |
|         Camera3d::default(),
 | |
|         Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|     ));
 | |
| }
 | |
| 
 | |
| /// A simple 2d scene, taken from the `rect` example
 | |
| fn setup_2d(mut commands: Commands) {
 | |
|     commands.spawn((
 | |
|         Camera2d,
 | |
|         Camera {
 | |
|             // render the 2d camera after the 3d camera
 | |
|             order: 1,
 | |
|             // do not use a clear color
 | |
|             clear_color: ClearColorConfig::None,
 | |
|             ..default()
 | |
|         },
 | |
|     ));
 | |
|     commands.spawn(SpriteBundle {
 | |
|         sprite: Sprite {
 | |
|             color: Color::srgb(0.25, 0.25, 0.75),
 | |
|             custom_size: Some(Vec2::new(50.0, 50.0)),
 | |
|             ..default()
 | |
|         },
 | |
|         ..default()
 | |
|     });
 | |
| }
 |