
# Objective #11431 and #11688 implemented meshing support for Bevy's new geometric primitives. The next step is to deprecate the shapes in `bevy_render::mesh::shape` and to later remove them completely for 0.14. ## Solution Deprecate the shapes and reduce code duplication by utilizing the primitive meshing API for the old shapes where possible. Note that some shapes have behavior that can't be exactly reproduced with the new primitives yet: - `Box` is more of an AABB with min/max extents - `Plane` supports a subdivision count - `Quad` has a `flipped` property These types have not been changed to utilize the new primitives yet. --- ## Changelog - Deprecated all shapes in `bevy_render::mesh::shape` - Changed all examples to use new primitives for meshing ## Migration Guide Bevy has previously used rendering-specific types like `UVSphere` and `Quad` for primitive mesh shapes. These have now been deprecated to use the geometric primitives newly introduced in version 0.13. Some examples: ```rust let before = meshes.add(shape::Box::new(5.0, 0.15, 5.0)); let after = meshes.add(Cuboid::new(5.0, 0.15, 5.0)); let before = meshes.add(shape::Quad::default()); let after = meshes.add(Rectangle::default()); let before = meshes.add(shape::Plane::from_size(5.0)); // The surface normal can now also be specified when using `new` let after = meshes.add(Plane3d::default().mesh().size(5.0, 5.0)); let before = meshes.add( Mesh::try_from(shape::Icosphere { radius: 0.5, subdivisions: 5, }) .unwrap(), ); let after = meshes.add(Sphere::new(0.5).mesh().ico(5).unwrap()); ```
160 lines
4.8 KiB
Rust
160 lines
4.8 KiB
Rust
//! Plays animations from a skinned glTF.
|
|
|
|
use std::f32::consts::PI;
|
|
use std::time::Duration;
|
|
|
|
use bevy::{animation::RepeatAnimation, pbr::CascadeShadowConfigBuilder, prelude::*};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.insert_resource(AmbientLight {
|
|
color: Color::WHITE,
|
|
brightness: 150.0,
|
|
})
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(setup_scene_once_loaded, keyboard_animation_control),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Resource)]
|
|
struct Animations(Vec<Handle<AnimationClip>>);
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
// Insert a resource with the current scene information
|
|
commands.insert_resource(Animations(vec![
|
|
asset_server.load("models/animated/Fox.glb#Animation2"),
|
|
asset_server.load("models/animated/Fox.glb#Animation1"),
|
|
asset_server.load("models/animated/Fox.glb#Animation0"),
|
|
]));
|
|
|
|
// Camera
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(100.0, 100.0, 150.0)
|
|
.looking_at(Vec3::new(0.0, 20.0, 0.0), Vec3::Y),
|
|
..default()
|
|
});
|
|
|
|
// Plane
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Plane3d::default().mesh().size(500000.0, 500000.0)),
|
|
material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
|
|
..default()
|
|
});
|
|
|
|
// Light
|
|
commands.spawn(DirectionalLightBundle {
|
|
transform: Transform::from_rotation(Quat::from_euler(EulerRot::ZYX, 0.0, 1.0, -PI / 4.)),
|
|
directional_light: DirectionalLight {
|
|
illuminance: 2000.0,
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
cascade_shadow_config: CascadeShadowConfigBuilder {
|
|
first_cascade_far_bound: 200.0,
|
|
maximum_distance: 400.0,
|
|
..default()
|
|
}
|
|
.into(),
|
|
..default()
|
|
});
|
|
|
|
// Fox
|
|
commands.spawn(SceneBundle {
|
|
scene: asset_server.load("models/animated/Fox.glb#Scene0"),
|
|
..default()
|
|
});
|
|
|
|
println!("Animation controls:");
|
|
println!(" - spacebar: play / pause");
|
|
println!(" - arrow up / down: speed up / slow down animation playback");
|
|
println!(" - arrow left / right: seek backward / forward");
|
|
println!(" - digit 1 / 3 / 5: play the animation <digit> times");
|
|
println!(" - L: loop the animation forever");
|
|
println!(" - return: change animation");
|
|
}
|
|
|
|
// Once the scene is loaded, start the animation
|
|
fn setup_scene_once_loaded(
|
|
animations: Res<Animations>,
|
|
mut players: Query<&mut AnimationPlayer, Added<AnimationPlayer>>,
|
|
) {
|
|
for mut player in &mut players {
|
|
player.play(animations.0[0].clone_weak()).repeat();
|
|
}
|
|
}
|
|
|
|
fn keyboard_animation_control(
|
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
|
mut animation_players: Query<&mut AnimationPlayer>,
|
|
animations: Res<Animations>,
|
|
mut current_animation: Local<usize>,
|
|
) {
|
|
for mut player in &mut animation_players {
|
|
if keyboard_input.just_pressed(KeyCode::Space) {
|
|
if player.is_paused() {
|
|
player.resume();
|
|
} else {
|
|
player.pause();
|
|
}
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::ArrowUp) {
|
|
let speed = player.speed();
|
|
player.set_speed(speed * 1.2);
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::ArrowDown) {
|
|
let speed = player.speed();
|
|
player.set_speed(speed * 0.8);
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::ArrowLeft) {
|
|
let elapsed = player.seek_time();
|
|
player.seek_to(elapsed - 0.1);
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::ArrowRight) {
|
|
let elapsed = player.seek_time();
|
|
player.seek_to(elapsed + 0.1);
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Enter) {
|
|
*current_animation = (*current_animation + 1) % animations.0.len();
|
|
player
|
|
.play_with_transition(
|
|
animations.0[*current_animation].clone_weak(),
|
|
Duration::from_millis(250),
|
|
)
|
|
.repeat();
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Digit1) {
|
|
player.set_repeat(RepeatAnimation::Count(1));
|
|
player.replay();
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Digit3) {
|
|
player.set_repeat(RepeatAnimation::Count(3));
|
|
player.replay();
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::Digit5) {
|
|
player.set_repeat(RepeatAnimation::Count(5));
|
|
player.replay();
|
|
}
|
|
|
|
if keyboard_input.just_pressed(KeyCode::KeyL) {
|
|
player.set_repeat(RepeatAnimation::Forever);
|
|
}
|
|
}
|
|
}
|