mirror of
https://github.com/bevyengine/bevy
synced 2024-11-23 05:03:47 +00:00
d70595b667
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
296 lines
8.7 KiB
Rust
296 lines
8.7 KiB
Rust
//! Tests how different transforms behave when clipped with `Overflow::Hidden`
|
|
|
|
use bevy::{input::common_conditions::input_just_pressed, prelude::*};
|
|
use std::f32::consts::{FRAC_PI_2, PI, TAU};
|
|
|
|
const CONTAINER_SIZE: f32 = 150.0;
|
|
const HALF_CONTAINER_SIZE: f32 = CONTAINER_SIZE / 2.0;
|
|
const LOOP_LENGTH: f32 = 4.0;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.init_resource::<AnimationState>()
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(
|
|
toggle_overflow.run_if(input_just_pressed(KeyCode::KeyO)),
|
|
next_container_size.run_if(input_just_pressed(KeyCode::KeyS)),
|
|
update_transform::<Move>,
|
|
update_transform::<Scale>,
|
|
update_transform::<Rotate>,
|
|
update_animation,
|
|
),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Instructions;
|
|
|
|
#[derive(Resource, Default)]
|
|
struct AnimationState {
|
|
playing: bool,
|
|
paused_at: f32,
|
|
paused_total: f32,
|
|
t: f32,
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Container(u8);
|
|
|
|
trait UpdateTransform {
|
|
fn update(&self, t: f32, transform: &mut Transform);
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Move;
|
|
|
|
impl UpdateTransform for Move {
|
|
fn update(&self, t: f32, transform: &mut Transform) {
|
|
transform.translation.x = ops::sin(t * TAU - FRAC_PI_2) * HALF_CONTAINER_SIZE;
|
|
transform.translation.y = -ops::cos(t * TAU - FRAC_PI_2) * HALF_CONTAINER_SIZE;
|
|
}
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Scale;
|
|
|
|
impl UpdateTransform for Scale {
|
|
fn update(&self, t: f32, transform: &mut Transform) {
|
|
transform.scale.x = 1.0 + 0.5 * ops::cos(t * TAU).max(0.0);
|
|
transform.scale.y = 1.0 + 0.5 * ops::cos(t * TAU + PI).max(0.0);
|
|
}
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Rotate;
|
|
|
|
impl UpdateTransform for Rotate {
|
|
fn update(&self, t: f32, transform: &mut Transform) {
|
|
transform.rotation =
|
|
Quat::from_axis_angle(Vec3::Z, (ops::cos(t * TAU) * 45.0).to_radians());
|
|
}
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
// Camera
|
|
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
// Instructions
|
|
|
|
let text_style = TextStyle::default();
|
|
|
|
commands.spawn((
|
|
TextBundle::from_sections([
|
|
TextSection::new(
|
|
"Next Overflow Setting (O)\nNext Container Size (S)\nToggle Animation (space)\n\n",
|
|
text_style.clone(),
|
|
),
|
|
TextSection::new(format!("{:?}", Overflow::clip()), text_style.clone()),
|
|
])
|
|
.with_style(Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
}),
|
|
Instructions,
|
|
));
|
|
|
|
// Overflow Debug
|
|
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
width: Val::Percent(100.),
|
|
height: Val::Percent(100.),
|
|
justify_content: JustifyContent::Center,
|
|
align_items: AlignItems::Center,
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
display: Display::Grid,
|
|
grid_template_columns: RepeatedGridTrack::px(3, CONTAINER_SIZE),
|
|
grid_template_rows: RepeatedGridTrack::px(2, CONTAINER_SIZE),
|
|
row_gap: Val::Px(80.),
|
|
column_gap: Val::Px(80.),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
spawn_image(parent, &asset_server, Move);
|
|
spawn_image(parent, &asset_server, Scale);
|
|
spawn_image(parent, &asset_server, Rotate);
|
|
|
|
spawn_text(parent, &asset_server, Move);
|
|
spawn_text(parent, &asset_server, Scale);
|
|
spawn_text(parent, &asset_server, Rotate);
|
|
});
|
|
});
|
|
}
|
|
|
|
fn spawn_image(
|
|
parent: &mut ChildBuilder,
|
|
asset_server: &Res<AssetServer>,
|
|
update_transform: impl UpdateTransform + Component,
|
|
) {
|
|
spawn_container(parent, update_transform, |parent| {
|
|
parent.spawn(ImageBundle {
|
|
image: UiImage::new(asset_server.load("branding/bevy_logo_dark_big.png")),
|
|
style: Style {
|
|
height: Val::Px(100.),
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(-50.),
|
|
left: Val::Px(-200.),
|
|
..default()
|
|
},
|
|
..default()
|
|
});
|
|
});
|
|
}
|
|
|
|
fn spawn_text(
|
|
parent: &mut ChildBuilder,
|
|
asset_server: &Res<AssetServer>,
|
|
update_transform: impl UpdateTransform + Component,
|
|
) {
|
|
spawn_container(parent, update_transform, |parent| {
|
|
parent.spawn(TextBundle::from_section(
|
|
"Bevy",
|
|
TextStyle {
|
|
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
|
|
font_size: 100.0,
|
|
..default()
|
|
},
|
|
));
|
|
});
|
|
}
|
|
|
|
fn spawn_container(
|
|
parent: &mut ChildBuilder,
|
|
update_transform: impl UpdateTransform + Component,
|
|
spawn_children: impl FnOnce(&mut ChildBuilder),
|
|
) {
|
|
let mut transform = Transform::default();
|
|
|
|
update_transform.update(0.0, &mut transform);
|
|
|
|
parent
|
|
.spawn((
|
|
NodeBundle {
|
|
style: Style {
|
|
width: Val::Percent(100.),
|
|
height: Val::Percent(100.),
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
overflow: Overflow::clip(),
|
|
..default()
|
|
},
|
|
background_color: Color::srgb(0.25, 0.25, 0.25).into(),
|
|
..default()
|
|
},
|
|
Container(0),
|
|
))
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn((
|
|
NodeBundle {
|
|
style: Style {
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
top: Val::Px(transform.translation.x),
|
|
left: Val::Px(transform.translation.y),
|
|
..default()
|
|
},
|
|
transform,
|
|
..default()
|
|
},
|
|
update_transform,
|
|
))
|
|
.with_children(spawn_children);
|
|
});
|
|
}
|
|
|
|
fn update_animation(
|
|
mut animation: ResMut<AnimationState>,
|
|
time: Res<Time>,
|
|
keys: Res<ButtonInput<KeyCode>>,
|
|
) {
|
|
let delta = time.elapsed_seconds();
|
|
|
|
if keys.just_pressed(KeyCode::Space) {
|
|
animation.playing = !animation.playing;
|
|
|
|
if !animation.playing {
|
|
animation.paused_at = delta;
|
|
} else {
|
|
animation.paused_total += delta - animation.paused_at;
|
|
}
|
|
}
|
|
|
|
if animation.playing {
|
|
animation.t = (delta - animation.paused_total) % LOOP_LENGTH / LOOP_LENGTH;
|
|
}
|
|
}
|
|
|
|
fn update_transform<T: UpdateTransform + Component>(
|
|
animation: Res<AnimationState>,
|
|
mut containers: Query<(&mut Transform, &mut Style, &T)>,
|
|
) {
|
|
for (mut transform, mut style, update_transform) in &mut containers {
|
|
update_transform.update(animation.t, &mut transform);
|
|
|
|
style.left = Val::Px(transform.translation.x);
|
|
style.top = Val::Px(transform.translation.y);
|
|
}
|
|
}
|
|
|
|
fn toggle_overflow(
|
|
mut containers: Query<&mut Style, With<Container>>,
|
|
mut instructions: Query<&mut Text, With<Instructions>>,
|
|
) {
|
|
for mut style in &mut containers {
|
|
style.overflow = match style.overflow {
|
|
Overflow {
|
|
x: OverflowAxis::Visible,
|
|
y: OverflowAxis::Visible,
|
|
} => Overflow::clip_y(),
|
|
Overflow {
|
|
x: OverflowAxis::Visible,
|
|
y: OverflowAxis::Clip,
|
|
} => Overflow::clip_x(),
|
|
Overflow {
|
|
x: OverflowAxis::Clip,
|
|
y: OverflowAxis::Visible,
|
|
} => Overflow::clip(),
|
|
_ => Overflow::visible(),
|
|
};
|
|
|
|
let mut text = instructions.single_mut();
|
|
text.sections[1].value = format!("{:?}", style.overflow);
|
|
}
|
|
}
|
|
|
|
fn next_container_size(mut containers: Query<(&mut Style, &mut Container)>) {
|
|
for (mut style, mut container) in &mut containers {
|
|
container.0 = (container.0 + 1) % 3;
|
|
|
|
style.width = match container.0 {
|
|
2 => Val::Percent(30.),
|
|
_ => Val::Percent(100.),
|
|
};
|
|
style.height = match container.0 {
|
|
1 => Val::Percent(30.),
|
|
_ => Val::Percent(100.),
|
|
};
|
|
}
|
|
}
|