2021-06-02 02:59:17 +00:00
|
|
|
use bevy::{
|
|
|
|
core::Time,
|
|
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
|
|
ecs::prelude::*,
|
|
|
|
input::Input,
|
2021-07-01 23:48:55 +00:00
|
|
|
math::{Quat, Vec3},
|
2021-07-08 02:49:33 +00:00
|
|
|
pbr2::{
|
|
|
|
AmbientLight, DirectionalLight, DirectionalLightBundle, PbrBundle, PointLight,
|
|
|
|
PointLightBundle, StandardMaterial,
|
|
|
|
},
|
2021-07-01 23:48:55 +00:00
|
|
|
prelude::{App, Assets, BuildChildren, KeyCode, Transform},
|
2021-06-02 02:59:17 +00:00
|
|
|
render2::{
|
2021-07-08 02:49:33 +00:00
|
|
|
camera::{OrthographicProjection, PerspectiveCameraBundle},
|
2021-06-02 02:59:17 +00:00
|
|
|
color::Color,
|
|
|
|
mesh::{shape, Mesh},
|
|
|
|
},
|
|
|
|
PipelinedDefaultPlugins,
|
|
|
|
};
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
App::new()
|
|
|
|
.add_plugins(PipelinedDefaultPlugins)
|
|
|
|
.add_plugin(FrameTimeDiagnosticsPlugin::default())
|
|
|
|
.add_plugin(LogDiagnosticsPlugin::default())
|
2021-07-26 23:44:23 +00:00
|
|
|
.add_startup_system(setup)
|
|
|
|
.add_system(movement)
|
|
|
|
.add_system(animate_light_direction)
|
2021-06-02 02:59:17 +00:00
|
|
|
.run();
|
|
|
|
}
|
|
|
|
|
2021-11-22 23:16:36 +00:00
|
|
|
#[derive(Component)]
|
2021-06-02 02:59:17 +00:00
|
|
|
struct Movable;
|
|
|
|
|
|
|
|
/// set up a simple 3D scene
|
|
|
|
fn setup(
|
|
|
|
mut commands: Commands,
|
|
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
|
|
) {
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// ground plane
|
2021-06-02 02:59:17 +00:00
|
|
|
commands.spawn_bundle(PbrBundle {
|
2021-07-08 02:49:33 +00:00
|
|
|
mesh: meshes.add(Mesh::from(shape::Plane { size: 10.0 })),
|
2021-06-18 18:21:18 +00:00
|
|
|
material: materials.add(StandardMaterial {
|
2021-07-08 02:49:33 +00:00
|
|
|
base_color: Color::WHITE,
|
2021-06-27 23:10:23 +00:00
|
|
|
perceptual_roughness: 1.0,
|
2021-06-18 18:21:18 +00:00
|
|
|
..Default::default()
|
|
|
|
}),
|
2021-06-02 02:59:17 +00:00
|
|
|
..Default::default()
|
|
|
|
});
|
2021-07-01 23:48:55 +00:00
|
|
|
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// left wall
|
2021-07-01 23:48:55 +00:00
|
|
|
let mut transform = Transform::from_xyz(2.5, 2.5, 0.0);
|
|
|
|
transform.rotate(Quat::from_rotation_z(std::f32::consts::FRAC_PI_2));
|
|
|
|
commands.spawn_bundle(PbrBundle {
|
2021-07-08 02:49:33 +00:00
|
|
|
mesh: meshes.add(Mesh::from(shape::Box::new(5.0, 0.15, 5.0))),
|
2021-07-01 23:48:55 +00:00
|
|
|
transform,
|
|
|
|
material: materials.add(StandardMaterial {
|
|
|
|
base_color: Color::INDIGO,
|
|
|
|
perceptual_roughness: 1.0,
|
|
|
|
..Default::default()
|
|
|
|
}),
|
|
|
|
..Default::default()
|
|
|
|
});
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// back (right) wall
|
2021-07-01 23:48:55 +00:00
|
|
|
let mut transform = Transform::from_xyz(0.0, 2.5, -2.5);
|
|
|
|
transform.rotate(Quat::from_rotation_x(std::f32::consts::FRAC_PI_2));
|
|
|
|
commands.spawn_bundle(PbrBundle {
|
2021-07-08 02:49:33 +00:00
|
|
|
mesh: meshes.add(Mesh::from(shape::Box::new(5.0, 0.15, 5.0))),
|
2021-07-01 23:48:55 +00:00
|
|
|
transform,
|
|
|
|
material: materials.add(StandardMaterial {
|
|
|
|
base_color: Color::INDIGO,
|
|
|
|
perceptual_roughness: 1.0,
|
|
|
|
..Default::default()
|
|
|
|
}),
|
|
|
|
..Default::default()
|
|
|
|
});
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
|
2021-06-02 02:59:17 +00:00
|
|
|
// cube
|
|
|
|
commands
|
|
|
|
.spawn_bundle(PbrBundle {
|
|
|
|
mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
|
2021-06-18 18:21:18 +00:00
|
|
|
material: materials.add(StandardMaterial {
|
2021-06-27 23:10:23 +00:00
|
|
|
base_color: Color::PINK,
|
2021-06-18 18:21:18 +00:00
|
|
|
..Default::default()
|
|
|
|
}),
|
2021-07-08 02:49:33 +00:00
|
|
|
transform: Transform::from_xyz(0.0, 0.5, 0.0),
|
2021-06-02 02:59:17 +00:00
|
|
|
..Default::default()
|
|
|
|
})
|
|
|
|
.insert(Movable);
|
|
|
|
// sphere
|
|
|
|
commands
|
|
|
|
.spawn_bundle(PbrBundle {
|
2021-06-18 18:21:18 +00:00
|
|
|
mesh: meshes.add(Mesh::from(shape::UVSphere {
|
|
|
|
radius: 0.5,
|
|
|
|
..Default::default()
|
|
|
|
})),
|
|
|
|
material: materials.add(StandardMaterial {
|
2021-06-27 23:10:23 +00:00
|
|
|
base_color: Color::LIME_GREEN,
|
2021-06-18 18:21:18 +00:00
|
|
|
..Default::default()
|
|
|
|
}),
|
2021-06-02 02:59:17 +00:00
|
|
|
transform: Transform::from_xyz(1.5, 1.0, 1.5),
|
|
|
|
..Default::default()
|
|
|
|
})
|
|
|
|
.insert(Movable);
|
2021-07-01 23:48:55 +00:00
|
|
|
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// ambient light
|
|
|
|
commands.insert_resource(AmbientLight {
|
|
|
|
color: Color::ORANGE_RED,
|
|
|
|
brightness: 0.02,
|
|
|
|
});
|
|
|
|
|
|
|
|
// red point light
|
2021-07-01 23:48:55 +00:00
|
|
|
commands
|
2021-07-01 23:54:58 +00:00
|
|
|
.spawn_bundle(PointLightBundle {
|
2021-07-01 23:48:55 +00:00
|
|
|
// transform: Transform::from_xyz(5.0, 8.0, 2.0),
|
|
|
|
transform: Transform::from_xyz(1.0, 2.0, 0.0),
|
2021-07-01 23:54:58 +00:00
|
|
|
point_light: PointLight {
|
bevy_pbr2: Improve lighting units and documentation (#2704)
# Objective
A question was raised on Discord about the units of the `PointLight` `intensity` member.
After digging around in the bevy_pbr2 source code and [Google Filament documentation](https://google.github.io/filament/Filament.html#mjx-eqn-pointLightLuminousPower) I discovered that the intention by Filament was that the 'intensity' value for point lights would be in lumens. This makes a lot of sense as these are quite relatable units given basically all light bulbs I've seen sold over the past years are rated in lumens as people move away from thinking about how bright a bulb is relative to a non-halogen incandescent bulb.
However, it seems that the derivation of the conversion between luminous power (lumens, denoted `Φ` in the Filament formulae) and luminous intensity (lumens per steradian, `I` in the Filament formulae) was missed and I can see why as it is tucked right under equation 58 at the link above. As such, while the formula states that for a point light, `I = Φ / 4 π` we have been using `intensity` as if it were luminous intensity `I`.
Before this PR, the intensity field is luminous intensity in lumens per steradian. After this PR, the intensity field is luminous power in lumens, [as suggested by Filament](https://google.github.io/filament/Filament.html#table_lighttypesunits) (unfortunately the link jumps to the table's caption so scroll up to see the actual table).
I appreciate that it may be confusing to call this an intensity, but I think this is intended as more of a non-scientific, human-relatable general term with a bit of hand waving so that most light types can just have an intensity field and for most of them it works in the same way or at least with some relatable value. I'm inclined to think this is reasonable rather than throwing terms like luminous power, luminous intensity, blah at users.
## Solution
- Documented the `PointLight` `intensity` member as 'luminous power' in units of lumens.
- Added a table of examples relating from various types of household lighting to lumen values.
- Added in the mapping from luminous power to luminous intensity when premultiplying the intensity into the colour before it is made into a graphics uniform.
- Updated the documentation in `pbr.wgsl` to clarify the earlier confusion about the missing `/ 4 π`.
- Bumped the intensity of the point lights in `3d_scene_pipelined` to 1600 lumens.
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2021-08-23 23:48:11 +00:00
|
|
|
intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
|
2021-07-01 23:48:55 +00:00
|
|
|
color: Color::RED,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
})
|
|
|
|
.with_children(|builder| {
|
|
|
|
builder.spawn_bundle(PbrBundle {
|
|
|
|
mesh: meshes.add(Mesh::from(shape::UVSphere {
|
|
|
|
radius: 0.1,
|
|
|
|
..Default::default()
|
|
|
|
})),
|
|
|
|
material: materials.add(StandardMaterial {
|
|
|
|
base_color: Color::RED,
|
|
|
|
emissive: Color::rgba_linear(100.0, 0.0, 0.0, 0.0),
|
|
|
|
..Default::default()
|
|
|
|
}),
|
|
|
|
..Default::default()
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// green point light
|
2021-07-01 23:48:55 +00:00
|
|
|
commands
|
2021-07-01 23:54:58 +00:00
|
|
|
.spawn_bundle(PointLightBundle {
|
2021-07-01 23:48:55 +00:00
|
|
|
// transform: Transform::from_xyz(5.0, 8.0, 2.0),
|
|
|
|
transform: Transform::from_xyz(-1.0, 2.0, 0.0),
|
2021-07-01 23:54:58 +00:00
|
|
|
point_light: PointLight {
|
bevy_pbr2: Improve lighting units and documentation (#2704)
# Objective
A question was raised on Discord about the units of the `PointLight` `intensity` member.
After digging around in the bevy_pbr2 source code and [Google Filament documentation](https://google.github.io/filament/Filament.html#mjx-eqn-pointLightLuminousPower) I discovered that the intention by Filament was that the 'intensity' value for point lights would be in lumens. This makes a lot of sense as these are quite relatable units given basically all light bulbs I've seen sold over the past years are rated in lumens as people move away from thinking about how bright a bulb is relative to a non-halogen incandescent bulb.
However, it seems that the derivation of the conversion between luminous power (lumens, denoted `Φ` in the Filament formulae) and luminous intensity (lumens per steradian, `I` in the Filament formulae) was missed and I can see why as it is tucked right under equation 58 at the link above. As such, while the formula states that for a point light, `I = Φ / 4 π` we have been using `intensity` as if it were luminous intensity `I`.
Before this PR, the intensity field is luminous intensity in lumens per steradian. After this PR, the intensity field is luminous power in lumens, [as suggested by Filament](https://google.github.io/filament/Filament.html#table_lighttypesunits) (unfortunately the link jumps to the table's caption so scroll up to see the actual table).
I appreciate that it may be confusing to call this an intensity, but I think this is intended as more of a non-scientific, human-relatable general term with a bit of hand waving so that most light types can just have an intensity field and for most of them it works in the same way or at least with some relatable value. I'm inclined to think this is reasonable rather than throwing terms like luminous power, luminous intensity, blah at users.
## Solution
- Documented the `PointLight` `intensity` member as 'luminous power' in units of lumens.
- Added a table of examples relating from various types of household lighting to lumen values.
- Added in the mapping from luminous power to luminous intensity when premultiplying the intensity into the colour before it is made into a graphics uniform.
- Updated the documentation in `pbr.wgsl` to clarify the earlier confusion about the missing `/ 4 π`.
- Bumped the intensity of the point lights in `3d_scene_pipelined` to 1600 lumens.
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2021-08-23 23:48:11 +00:00
|
|
|
intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
|
2021-07-01 23:48:55 +00:00
|
|
|
color: Color::GREEN,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
})
|
|
|
|
.with_children(|builder| {
|
|
|
|
builder.spawn_bundle(PbrBundle {
|
|
|
|
mesh: meshes.add(Mesh::from(shape::UVSphere {
|
|
|
|
radius: 0.1,
|
|
|
|
..Default::default()
|
|
|
|
})),
|
|
|
|
material: materials.add(StandardMaterial {
|
|
|
|
base_color: Color::GREEN,
|
|
|
|
emissive: Color::rgba_linear(0.0, 100.0, 0.0, 0.0),
|
|
|
|
..Default::default()
|
|
|
|
}),
|
|
|
|
..Default::default()
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// blue point light
|
2021-07-01 23:48:55 +00:00
|
|
|
commands
|
2021-07-01 23:54:58 +00:00
|
|
|
.spawn_bundle(PointLightBundle {
|
2021-07-01 23:48:55 +00:00
|
|
|
// transform: Transform::from_xyz(5.0, 8.0, 2.0),
|
|
|
|
transform: Transform::from_xyz(0.0, 4.0, 0.0),
|
2021-07-01 23:54:58 +00:00
|
|
|
point_light: PointLight {
|
bevy_pbr2: Improve lighting units and documentation (#2704)
# Objective
A question was raised on Discord about the units of the `PointLight` `intensity` member.
After digging around in the bevy_pbr2 source code and [Google Filament documentation](https://google.github.io/filament/Filament.html#mjx-eqn-pointLightLuminousPower) I discovered that the intention by Filament was that the 'intensity' value for point lights would be in lumens. This makes a lot of sense as these are quite relatable units given basically all light bulbs I've seen sold over the past years are rated in lumens as people move away from thinking about how bright a bulb is relative to a non-halogen incandescent bulb.
However, it seems that the derivation of the conversion between luminous power (lumens, denoted `Φ` in the Filament formulae) and luminous intensity (lumens per steradian, `I` in the Filament formulae) was missed and I can see why as it is tucked right under equation 58 at the link above. As such, while the formula states that for a point light, `I = Φ / 4 π` we have been using `intensity` as if it were luminous intensity `I`.
Before this PR, the intensity field is luminous intensity in lumens per steradian. After this PR, the intensity field is luminous power in lumens, [as suggested by Filament](https://google.github.io/filament/Filament.html#table_lighttypesunits) (unfortunately the link jumps to the table's caption so scroll up to see the actual table).
I appreciate that it may be confusing to call this an intensity, but I think this is intended as more of a non-scientific, human-relatable general term with a bit of hand waving so that most light types can just have an intensity field and for most of them it works in the same way or at least with some relatable value. I'm inclined to think this is reasonable rather than throwing terms like luminous power, luminous intensity, blah at users.
## Solution
- Documented the `PointLight` `intensity` member as 'luminous power' in units of lumens.
- Added a table of examples relating from various types of household lighting to lumen values.
- Added in the mapping from luminous power to luminous intensity when premultiplying the intensity into the colour before it is made into a graphics uniform.
- Updated the documentation in `pbr.wgsl` to clarify the earlier confusion about the missing `/ 4 π`.
- Bumped the intensity of the point lights in `3d_scene_pipelined` to 1600 lumens.
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2021-08-23 23:48:11 +00:00
|
|
|
intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
|
2021-07-01 23:48:55 +00:00
|
|
|
color: Color::BLUE,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
})
|
|
|
|
.with_children(|builder| {
|
|
|
|
builder.spawn_bundle(PbrBundle {
|
|
|
|
mesh: meshes.add(Mesh::from(shape::UVSphere {
|
|
|
|
radius: 0.1,
|
|
|
|
..Default::default()
|
|
|
|
})),
|
|
|
|
material: materials.add(StandardMaterial {
|
|
|
|
base_color: Color::BLUE,
|
|
|
|
emissive: Color::rgba_linear(0.0, 0.0, 100.0, 0.0),
|
|
|
|
..Default::default()
|
|
|
|
}),
|
|
|
|
..Default::default()
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
Use the infinite reverse right-handed perspective projection (#2543)
# Objective
Forward perspective projections have poor floating point precision distribution over the depth range. Reverse projections fair much better, and instead of having to have a far plane, with the reverse projection, using an infinite far plane is not a problem. The infinite reverse perspective projection has become the industry standard. The renderer rework is a great time to migrate to it.
## Solution
All perspective projections, including point lights, have been moved to using `glam::Mat4::perspective_infinite_reverse_rh()` and so have no far plane. As various depth textures are shared between orthographic and perspective projections, a quirk of this PR is that the near and far planes of the orthographic projection are swapped when the Mat4 is computed. This has no impact on 2D/3D orthographic projection usage, and provides consistency in shaders, texture clear values, etc. throughout the codebase.
## Known issues
For some reason, when looking along -Z, all geometry is black. The camera can be translated up/down / strafed left/right and geometry will still be black. Moving forward/backward or rotating the camera away from looking exactly along -Z causes everything to work as expected.
I have tried to debug this issue but both in macOS and Windows I get crashes when doing pixel debugging. If anyone could reproduce this and debug it I would be very grateful. Otherwise I will have to try to debug it further without pixel debugging, though the projections and such all looked fine to me.
2021-08-27 20:15:09 +00:00
|
|
|
// directional 'sun' light
|
2021-07-08 02:49:33 +00:00
|
|
|
const HALF_SIZE: f32 = 10.0;
|
|
|
|
commands.spawn_bundle(DirectionalLightBundle {
|
|
|
|
directional_light: DirectionalLight {
|
|
|
|
// Configure the projection to better fit the scene
|
|
|
|
shadow_projection: OrthographicProjection {
|
|
|
|
left: -HALF_SIZE,
|
|
|
|
right: HALF_SIZE,
|
|
|
|
bottom: -HALF_SIZE,
|
|
|
|
top: HALF_SIZE,
|
|
|
|
near: -10.0 * HALF_SIZE,
|
|
|
|
far: 10.0 * HALF_SIZE,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
transform: Transform {
|
|
|
|
translation: Vec3::new(0.0, 2.0, 0.0),
|
2021-07-16 22:41:56 +00:00
|
|
|
rotation: Quat::from_rotation_x(-std::f32::consts::FRAC_PI_4),
|
2021-07-08 02:49:33 +00:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
});
|
|
|
|
|
2021-06-02 02:59:17 +00:00
|
|
|
// camera
|
|
|
|
commands.spawn_bundle(PerspectiveCameraBundle {
|
2021-07-08 02:49:33 +00:00
|
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
2021-06-02 02:59:17 +00:00
|
|
|
..Default::default()
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2021-07-08 02:49:33 +00:00
|
|
|
fn animate_light_direction(
|
|
|
|
time: Res<Time>,
|
|
|
|
mut query: Query<&mut Transform, With<DirectionalLight>>,
|
|
|
|
) {
|
|
|
|
for mut transform in query.iter_mut() {
|
|
|
|
transform.rotate(Quat::from_rotation_y(time.delta_seconds() * 0.5));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-02 02:59:17 +00:00
|
|
|
fn movement(
|
|
|
|
input: Res<Input<KeyCode>>,
|
|
|
|
time: Res<Time>,
|
|
|
|
mut query: Query<&mut Transform, With<Movable>>,
|
|
|
|
) {
|
|
|
|
for mut transform in query.iter_mut() {
|
|
|
|
let mut direction = Vec3::ZERO;
|
|
|
|
if input.pressed(KeyCode::Up) {
|
|
|
|
direction.y += 1.0;
|
|
|
|
}
|
|
|
|
if input.pressed(KeyCode::Down) {
|
|
|
|
direction.y -= 1.0;
|
|
|
|
}
|
|
|
|
if input.pressed(KeyCode::Left) {
|
|
|
|
direction.x -= 1.0;
|
|
|
|
}
|
|
|
|
if input.pressed(KeyCode::Right) {
|
|
|
|
direction.x += 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
transform.translation += time.delta_seconds() * 2.0 * direction;
|
|
|
|
}
|
|
|
|
}
|