# 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.
		
			
				
	
	
		
			121 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			121 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
//! This example illustrates how to override the window scale factor imposed by the
 | 
						|
//! operating system.
 | 
						|
 | 
						|
use bevy::{prelude::*, window::WindowResolution};
 | 
						|
 | 
						|
#[derive(Component)]
 | 
						|
struct CustomText;
 | 
						|
 | 
						|
fn main() {
 | 
						|
    App::new()
 | 
						|
        .add_plugins(DefaultPlugins.set(WindowPlugin {
 | 
						|
            primary_window: Some(Window {
 | 
						|
                resolution: WindowResolution::new(500., 300.).with_scale_factor_override(1.0),
 | 
						|
                ..default()
 | 
						|
            }),
 | 
						|
            ..default()
 | 
						|
        }))
 | 
						|
        .add_systems(Startup, setup)
 | 
						|
        .add_systems(
 | 
						|
            Update,
 | 
						|
            (display_override, toggle_override, change_scale_factor),
 | 
						|
        )
 | 
						|
        .run();
 | 
						|
}
 | 
						|
 | 
						|
fn setup(mut commands: Commands) {
 | 
						|
    // camera
 | 
						|
    commands.spawn(Camera2d);
 | 
						|
    // root node
 | 
						|
    commands
 | 
						|
        .spawn(NodeBundle {
 | 
						|
            style: Style {
 | 
						|
                width: Val::Percent(100.0),
 | 
						|
                height: Val::Percent(100.0),
 | 
						|
                justify_content: JustifyContent::SpaceBetween,
 | 
						|
                ..default()
 | 
						|
            },
 | 
						|
            ..default()
 | 
						|
        })
 | 
						|
        .with_children(|parent| {
 | 
						|
            // left vertical fill (border)
 | 
						|
            parent
 | 
						|
                .spawn(NodeBundle {
 | 
						|
                    style: Style {
 | 
						|
                        width: Val::Px(300.0),
 | 
						|
                        height: Val::Percent(100.0),
 | 
						|
                        border: UiRect::all(Val::Px(2.0)),
 | 
						|
                        ..default()
 | 
						|
                    },
 | 
						|
                    background_color: Color::srgb(0.65, 0.65, 0.65).into(),
 | 
						|
                    ..default()
 | 
						|
                })
 | 
						|
                .with_children(|parent| {
 | 
						|
                    parent.spawn((
 | 
						|
                        CustomText,
 | 
						|
                        TextBundle::from_section(
 | 
						|
                            "Example text",
 | 
						|
                            TextStyle {
 | 
						|
                                font_size: 25.0,
 | 
						|
                                ..default()
 | 
						|
                            },
 | 
						|
                        )
 | 
						|
                        .with_style(Style {
 | 
						|
                            align_self: AlignSelf::FlexEnd,
 | 
						|
                            ..default()
 | 
						|
                        }),
 | 
						|
                    ));
 | 
						|
                });
 | 
						|
        });
 | 
						|
}
 | 
						|
 | 
						|
/// Set the title of the window to the current override
 | 
						|
fn display_override(
 | 
						|
    mut windows: Query<&mut Window>,
 | 
						|
    mut custom_text: Query<&mut Text, With<CustomText>>,
 | 
						|
) {
 | 
						|
    let mut window = windows.single_mut();
 | 
						|
 | 
						|
    let text = format!(
 | 
						|
        "Scale factor: {:.1} {}",
 | 
						|
        window.scale_factor(),
 | 
						|
        if window.resolution.scale_factor_override().is_some() {
 | 
						|
            "(overridden)"
 | 
						|
        } else {
 | 
						|
            "(default)"
 | 
						|
        }
 | 
						|
    );
 | 
						|
 | 
						|
    window.title.clone_from(&text);
 | 
						|
 | 
						|
    let mut custom_text = custom_text.single_mut();
 | 
						|
    custom_text.sections[0].value = text;
 | 
						|
}
 | 
						|
 | 
						|
/// This system toggles scale factor overrides when enter is pressed
 | 
						|
fn toggle_override(input: Res<ButtonInput<KeyCode>>, mut windows: Query<&mut Window>) {
 | 
						|
    let mut window = windows.single_mut();
 | 
						|
 | 
						|
    if input.just_pressed(KeyCode::Enter) {
 | 
						|
        let scale_factor_override = window.resolution.scale_factor_override();
 | 
						|
        window
 | 
						|
            .resolution
 | 
						|
            .set_scale_factor_override(scale_factor_override.xor(Some(1.0)));
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
/// This system changes the scale factor override when up or down is pressed
 | 
						|
fn change_scale_factor(input: Res<ButtonInput<KeyCode>>, mut windows: Query<&mut Window>) {
 | 
						|
    let mut window = windows.single_mut();
 | 
						|
    let scale_factor_override = window.resolution.scale_factor_override();
 | 
						|
    if input.just_pressed(KeyCode::ArrowUp) {
 | 
						|
        window
 | 
						|
            .resolution
 | 
						|
            .set_scale_factor_override(scale_factor_override.map(|n| n + 1.0));
 | 
						|
    } else if input.just_pressed(KeyCode::ArrowDown) {
 | 
						|
        window
 | 
						|
            .resolution
 | 
						|
            .set_scale_factor_override(scale_factor_override.map(|n| (n - 1.0).max(1.0)));
 | 
						|
    }
 | 
						|
}
 |