mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 07:04:33 +00:00
dd619a1087
# Objective After adding configurable exposure, we set the default ev100 value to `7` (indoor). This brought us out of sync with Blender's configuration and defaults. This PR changes the default to `9.7` (bright indoor or very overcast outdoors), as I calibrated in #11577. This feels like a very reasonable default. The other changes generally center around tweaking Bevy's lighting defaults and examples to play nicely with this number, alongside a few other tweaks and improvements. Note that for artistic reasons I have reverted some examples, which changed to directional lights in #11581, back to point lights. Fixes #11577 --- ## Changelog - Changed `Exposure::ev100` from `7` to `9.7` to better match Blender - Renamed `ExposureSettings` to `Exposure` - `Camera3dBundle` now includes `Exposure` for discoverability - Bumped `FULL_DAYLIGHT ` and `DIRECT_SUNLIGHT` to represent the middle-to-top of those ranges instead of near the bottom - Added new `AMBIENT_DAYLIGHT` constant and set that as the new `DirectionalLight` default illuminance. - `PointLight` and `SpotLight` now have a default `intensity` of 1,000,000 lumens. This makes them actually useful in the context of the new "semi-outdoor" exposure and puts them in the "cinema lighting" category instead of the "common household light" category. They are also reasonably close to the Blender default. - `AmbientLight` default has been bumped from `20` to `80`. ## Migration Guide - The increased `Exposure::ev100` means that all existing 3D lighting will need to be adjusted to match (DirectionalLights, PointLights, SpotLights, EnvironmentMapLights, etc). Or alternatively, you can adjust the `Exposure::ev100` on your cameras to work nicely with your current lighting values. If you are currently relying on default intensity values, you might need to change the intensity to achieve the same effect. Note that in Bevy 0.12, point/spot lights had a different hard coded ev100 value than directional lights. In Bevy 0.13, they use the same ev100, so if you have both in your scene, the _scale_ between these light types has changed and you will likely need to adjust one or both of them.
131 lines
3.9 KiB
Rust
131 lines
3.9 KiB
Rust
//! This example illustrates how to load and play an audio file, and control where the sounds seems to come from.
|
|
use bevy::prelude::*;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, update_positions)
|
|
.add_systems(Update, update_listener)
|
|
.run();
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
// Space between the two ears
|
|
let gap = 4.0;
|
|
|
|
// sound emitter
|
|
commands.spawn((
|
|
PbrBundle {
|
|
mesh: meshes.add(Sphere::new(0.2).mesh().uv(32, 18)),
|
|
material: materials.add(Color::BLUE),
|
|
transform: Transform::from_xyz(0.0, 0.0, 0.0),
|
|
..default()
|
|
},
|
|
Emitter::default(),
|
|
AudioBundle {
|
|
source: asset_server.load("sounds/Windless Slopes.ogg"),
|
|
settings: PlaybackSettings::LOOP.with_spatial(true),
|
|
},
|
|
));
|
|
|
|
let listener = SpatialListener::new(gap);
|
|
commands
|
|
.spawn((SpatialBundle::default(), listener.clone()))
|
|
.with_children(|parent| {
|
|
// left ear indicator
|
|
parent.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(0.2, 0.2, 0.2)),
|
|
material: materials.add(Color::RED),
|
|
transform: Transform::from_translation(listener.left_ear_offset),
|
|
..default()
|
|
});
|
|
|
|
// right ear indicator
|
|
parent.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(0.2, 0.2, 0.2)),
|
|
material: materials.add(Color::GREEN),
|
|
transform: Transform::from_translation(listener.right_ear_offset),
|
|
..default()
|
|
});
|
|
});
|
|
|
|
// light
|
|
commands.spawn(DirectionalLightBundle {
|
|
transform: Transform::from_xyz(4.0, 8.0, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
|
|
// example instructions
|
|
commands.spawn(
|
|
TextBundle::from_section(
|
|
"Up/Down/Left/Right: Move Listener\nSpace: Toggle Emitter Movement",
|
|
TextStyle {
|
|
font_size: 20.0,
|
|
..default()
|
|
},
|
|
)
|
|
.with_style(Style {
|
|
position_type: PositionType::Absolute,
|
|
bottom: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
}),
|
|
);
|
|
|
|
// camera
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(0.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
#[derive(Component, Default)]
|
|
struct Emitter {
|
|
stopped: bool,
|
|
}
|
|
|
|
fn update_positions(
|
|
time: Res<Time>,
|
|
mut emitters: Query<(&mut Transform, &mut Emitter), With<Emitter>>,
|
|
keyboard: Res<ButtonInput<KeyCode>>,
|
|
) {
|
|
for (mut emitter_transform, mut emitter) in emitters.iter_mut() {
|
|
if keyboard.just_pressed(KeyCode::Space) {
|
|
emitter.stopped = !emitter.stopped;
|
|
}
|
|
|
|
if !emitter.stopped {
|
|
emitter_transform.translation.x = time.elapsed_seconds().sin() * 3.0;
|
|
emitter_transform.translation.z = time.elapsed_seconds().cos() * 3.0;
|
|
}
|
|
}
|
|
}
|
|
|
|
fn update_listener(
|
|
keyboard: Res<ButtonInput<KeyCode>>,
|
|
time: Res<Time>,
|
|
mut listeners: Query<&mut Transform, With<SpatialListener>>,
|
|
) {
|
|
let mut transform = listeners.single_mut();
|
|
|
|
let speed = 2.;
|
|
|
|
if keyboard.pressed(KeyCode::ArrowRight) {
|
|
transform.translation.x += speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowLeft) {
|
|
transform.translation.x -= speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowDown) {
|
|
transform.translation.z += speed * time.delta_seconds();
|
|
}
|
|
if keyboard.pressed(KeyCode::ArrowUp) {
|
|
transform.translation.z -= speed * time.delta_seconds();
|
|
}
|
|
}
|