 b96193e6ca
			
		
	
	
		b96193e6ca
		
			
		
	
	
	
	
		
			
			# Objective - #11868 changed the lighting system, forcing lights to increase their intensity. The PR fixed most examples, but missed a few. These I later caught in https://github.com/bevyengine/bevy-website/pull/1023. - Related: #11982, #11981. - While there, I noticed that the spotlight example could use a few easy improvements. ## Solution - Increase lighting in `skybox`, `spotlight`, `animated_transform`, and `gltf_skinned_mesh`. - Improve spotlight example. - Make ground plane move with cubes, so they don't phase into each other. - Batch spawn cubes. - Add controls text. - Change controls to allow rotating around spotlights. ## Showcase ### Skybox Before: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/8ba00d74-6d68-4414-97a8-28afb8305570"> After: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/ad15c471-6979-4dda-9889-9189136d8404"> ### Spotlight Before: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/53f966de-acf3-46b8-8299-0005c4cb8da0"> After: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/05c73c1e-0739-4226-83d6-e4249a9105e0"> ### Animated Transform Before: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/6d7d4ea0-e22e-42a5-9905-ea1731d474cf"> After: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/f1ee08d6-d17a-4391-91a6-d903b9fbdc3c"> ### gLTF Skinned Mesh Before: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/547569a6-d13b-4fe0-a8c1-e11f02c4f9a2"> After: <img width="1392" alt="image" src="https://github.com/bevyengine/bevy/assets/59022059/34517aba-09e4-4e9b-982a-a4a8b893c48a"> --- ## Changelog - Increased lighting in `skybox`, `spotlight`, `animated_transform`, and `gltf_skinned_mesh` examples. - Improved usability of `spotlight` example.
		
			
				
	
	
		
			180 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			180 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Create and play an animation defined by code that operates on the [`Transform`] component.
 | |
| 
 | |
| use std::f32::consts::PI;
 | |
| 
 | |
| use bevy::animation::{AnimationTarget, AnimationTargetId};
 | |
| use bevy::prelude::*;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_plugins(DefaultPlugins)
 | |
|         .insert_resource(AmbientLight {
 | |
|             color: LegacyColor::WHITE,
 | |
|             brightness: 150.0,
 | |
|         })
 | |
|         .add_systems(Startup, setup)
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| fn setup(
 | |
|     mut commands: Commands,
 | |
|     mut meshes: ResMut<Assets<Mesh>>,
 | |
|     mut materials: ResMut<Assets<StandardMaterial>>,
 | |
|     mut animations: ResMut<Assets<AnimationClip>>,
 | |
| ) {
 | |
|     // Camera
 | |
|     commands.spawn(Camera3dBundle {
 | |
|         transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // Light
 | |
|     commands.spawn(PointLightBundle {
 | |
|         point_light: PointLight {
 | |
|             intensity: 500_000.0,
 | |
|             ..default()
 | |
|         },
 | |
|         transform: Transform::from_xyz(0.0, 2.5, 0.0),
 | |
|         ..default()
 | |
|     });
 | |
| 
 | |
|     // Let's use the `Name` component to target entities. We can use anything we
 | |
|     // like, but names are convenient.
 | |
|     let planet = Name::new("planet");
 | |
|     let orbit_controller = Name::new("orbit_controller");
 | |
|     let satellite = Name::new("satellite");
 | |
| 
 | |
|     // Creating the animation
 | |
|     let mut animation = AnimationClip::default();
 | |
|     // A curve can modify a single part of a transform, here the translation
 | |
|     let planet_animation_target_id = AnimationTargetId::from_name(&planet);
 | |
|     animation.add_curve_to_target(
 | |
|         planet_animation_target_id,
 | |
|         VariableCurve {
 | |
|             keyframe_timestamps: vec![0.0, 1.0, 2.0, 3.0, 4.0],
 | |
|             keyframes: Keyframes::Translation(vec![
 | |
|                 Vec3::new(1.0, 0.0, 1.0),
 | |
|                 Vec3::new(-1.0, 0.0, 1.0),
 | |
|                 Vec3::new(-1.0, 0.0, -1.0),
 | |
|                 Vec3::new(1.0, 0.0, -1.0),
 | |
|                 // in case seamless looping is wanted, the last keyframe should
 | |
|                 // be the same as the first one
 | |
|                 Vec3::new(1.0, 0.0, 1.0),
 | |
|             ]),
 | |
|             interpolation: Interpolation::Linear,
 | |
|         },
 | |
|     );
 | |
|     // Or it can modify the rotation of the transform.
 | |
|     // To find the entity to modify, the hierarchy will be traversed looking for
 | |
|     // an entity with the right name at each level
 | |
|     let orbit_controller_animation_target_id =
 | |
|         AnimationTargetId::from_names([planet.clone(), orbit_controller.clone()].iter());
 | |
|     animation.add_curve_to_target(
 | |
|         orbit_controller_animation_target_id,
 | |
|         VariableCurve {
 | |
|             keyframe_timestamps: vec![0.0, 1.0, 2.0, 3.0, 4.0],
 | |
|             keyframes: Keyframes::Rotation(vec![
 | |
|                 Quat::IDENTITY,
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2.),
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2. * 2.),
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2. * 3.),
 | |
|                 Quat::IDENTITY,
 | |
|             ]),
 | |
|             interpolation: Interpolation::Linear,
 | |
|         },
 | |
|     );
 | |
|     // If a curve in an animation is shorter than the other, it will not repeat
 | |
|     // until all other curves are finished. In that case, another animation should
 | |
|     // be created for each part that would have a different duration / period
 | |
|     let satellite_animation_target_id = AnimationTargetId::from_names(
 | |
|         [planet.clone(), orbit_controller.clone(), satellite.clone()].iter(),
 | |
|     );
 | |
|     animation.add_curve_to_target(
 | |
|         satellite_animation_target_id,
 | |
|         VariableCurve {
 | |
|             keyframe_timestamps: vec![0.0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0],
 | |
|             keyframes: Keyframes::Scale(vec![
 | |
|                 Vec3::splat(0.8),
 | |
|                 Vec3::splat(1.2),
 | |
|                 Vec3::splat(0.8),
 | |
|                 Vec3::splat(1.2),
 | |
|                 Vec3::splat(0.8),
 | |
|                 Vec3::splat(1.2),
 | |
|                 Vec3::splat(0.8),
 | |
|                 Vec3::splat(1.2),
 | |
|                 Vec3::splat(0.8),
 | |
|             ]),
 | |
|             interpolation: Interpolation::Linear,
 | |
|         },
 | |
|     );
 | |
|     // There can be more than one curve targeting the same entity path
 | |
|     animation.add_curve_to_target(
 | |
|         AnimationTargetId::from_names(
 | |
|             [planet.clone(), orbit_controller.clone(), satellite.clone()].iter(),
 | |
|         ),
 | |
|         VariableCurve {
 | |
|             keyframe_timestamps: vec![0.0, 1.0, 2.0, 3.0, 4.0],
 | |
|             keyframes: Keyframes::Rotation(vec![
 | |
|                 Quat::IDENTITY,
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2.),
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2. * 2.),
 | |
|                 Quat::from_axis_angle(Vec3::Y, PI / 2. * 3.),
 | |
|                 Quat::IDENTITY,
 | |
|             ]),
 | |
|             interpolation: Interpolation::Linear,
 | |
|         },
 | |
|     );
 | |
| 
 | |
|     // Create the animation player, and set it to repeat
 | |
|     let mut player = AnimationPlayer::default();
 | |
|     player.play(animations.add(animation)).repeat();
 | |
| 
 | |
|     // Create the scene that will be animated
 | |
|     // First entity is the planet
 | |
|     let planet_entity = commands
 | |
|         .spawn((
 | |
|             PbrBundle {
 | |
|                 mesh: meshes.add(Sphere::default()),
 | |
|                 material: materials.add(LegacyColor::rgb(0.8, 0.7, 0.6)),
 | |
|                 ..default()
 | |
|             },
 | |
|             // Add the animation player
 | |
|             planet,
 | |
|             player,
 | |
|         ))
 | |
|         .id();
 | |
|     commands
 | |
|         .entity(planet_entity)
 | |
|         .insert(AnimationTarget {
 | |
|             id: planet_animation_target_id,
 | |
|             player: planet_entity,
 | |
|         })
 | |
|         .with_children(|p| {
 | |
|             // This entity is just used for animation, but doesn't display anything
 | |
|             p.spawn((
 | |
|                 SpatialBundle::INHERITED_IDENTITY,
 | |
|                 orbit_controller,
 | |
|                 AnimationTarget {
 | |
|                     id: orbit_controller_animation_target_id,
 | |
|                     player: planet_entity,
 | |
|                 },
 | |
|             ))
 | |
|             .with_children(|p| {
 | |
|                 // The satellite, placed at a distance of the planet
 | |
|                 p.spawn((
 | |
|                     PbrBundle {
 | |
|                         transform: Transform::from_xyz(1.5, 0.0, 0.0),
 | |
|                         mesh: meshes.add(Cuboid::new(0.5, 0.5, 0.5)),
 | |
|                         material: materials.add(LegacyColor::rgb(0.3, 0.9, 0.3)),
 | |
|                         ..default()
 | |
|                     },
 | |
|                     AnimationTarget {
 | |
|                         id: satellite_animation_target_id,
 | |
|                         player: planet_entity,
 | |
|                     },
 | |
|                     satellite,
 | |
|                 ));
 | |
|             });
 | |
|         });
 | |
| }
 |