dc9b486650
# Objective Fix https://github.com/bevyengine/bevy/issues/11577. ## Solution Fix the examples, add a few constants to make setting light values easier, and change the default lighting settings to be more realistic. (Now designed for an overcast day instead of an indoor environment) --- I did not include any example-related changes in here. ## Changelogs (not including breaking changes) ### bevy_pbr - Added `light_consts` module (included in prelude), which contains common lux and lumen values for lights. - Added `AmbientLight::NONE` constant, which is an ambient light with a brightness of 0. - Added non-EV100 variants for `ExposureSettings`'s EV100 constants, which allow easier construction of an `ExposureSettings` from a EV100 constant. ## Breaking changes ### bevy_pbr The several default lighting values were changed: - `PointLight`'s default `intensity` is now `2000.0` - `SpotLight`'s default `intensity` is now `2000.0` - `DirectionalLight`'s default `illuminance` is now `light_consts::lux::OVERCAST_DAY` (`1000.`) - `AmbientLight`'s default `brightness` is now `20.0`
88 lines
2.9 KiB
Rust
88 lines
2.9 KiB
Rust
//! Demonstrates using a custom extension to the `StandardMaterial` to modify the results of the builtin pbr shader.
|
|
|
|
use bevy::{
|
|
pbr::{ExtendedMaterial, MaterialExtension, OpaqueRendererMethod},
|
|
prelude::*,
|
|
render::render_resource::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_plugins(MaterialPlugin::<
|
|
ExtendedMaterial<StandardMaterial, MyExtension>,
|
|
>::default())
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, rotate_things)
|
|
.run();
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, MyExtension>>>,
|
|
) {
|
|
// sphere
|
|
commands.spawn(MaterialMeshBundle {
|
|
mesh: meshes.add(Sphere::new(1.0)),
|
|
transform: Transform::from_xyz(0.0, 0.5, 0.0),
|
|
material: materials.add(ExtendedMaterial {
|
|
base: StandardMaterial {
|
|
base_color: Color::RED,
|
|
// can be used in forward or deferred mode.
|
|
opaque_render_method: OpaqueRendererMethod::Auto,
|
|
// in deferred mode, only the PbrInput can be modified (uvs, color and other material properties),
|
|
// in forward mode, the output can also be modified after lighting is applied.
|
|
// see the fragment shader `extended_material.wgsl` for more info.
|
|
// Note: to run in deferred mode, you must also add a `DeferredPrepass` component to the camera and either
|
|
// change the above to `OpaqueRendererMethod::Deferred` or add the `DefaultOpaqueRendererMethod` resource.
|
|
..Default::default()
|
|
},
|
|
extension: MyExtension { quantize_steps: 3 },
|
|
}),
|
|
..default()
|
|
});
|
|
|
|
// light
|
|
commands.spawn((
|
|
DirectionalLightBundle {
|
|
transform: Transform::from_xyz(1.0, 1.0, 1.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
},
|
|
Rotate,
|
|
));
|
|
|
|
// camera
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct Rotate;
|
|
|
|
fn rotate_things(mut q: Query<&mut Transform, With<Rotate>>, time: Res<Time>) {
|
|
for mut t in &mut q {
|
|
t.rotate_y(time.delta_seconds());
|
|
}
|
|
}
|
|
|
|
#[derive(Asset, AsBindGroup, Reflect, Debug, Clone)]
|
|
struct MyExtension {
|
|
// We need to ensure that the bindings of the base material and the extension do not conflict,
|
|
// so we start from binding slot 100, leaving slots 0-99 for the base material.
|
|
#[uniform(100)]
|
|
quantize_steps: u32,
|
|
}
|
|
|
|
impl MaterialExtension for MyExtension {
|
|
fn fragment_shader() -> ShaderRef {
|
|
"shaders/extended_material.wgsl".into()
|
|
}
|
|
|
|
fn deferred_fragment_shader() -> ShaderRef {
|
|
"shaders/extended_material.wgsl".into()
|
|
}
|
|
}
|