Add update example showcasing both diffuse and specular transmission
This commit is contained in:
Marco Buono
parent
927cfa24fc
commit
cd1976d03c
@ -4,6 +4,7 @@
|
||||
//!
|
||||
//! | Key Binding | Action |
|
||||
//! |:-------------------|:------------------------------------------|
|
||||
//! | `1` / `2` | Decrease / Increase Diffuse Transmission |
|
||||
//! | `Q` / `W` | Decrease / Increase Transmission |
|
||||
//! | `A` / `S` | Decrease / Increase Thickness |
|
||||
//! | `Z` / `X` | Decrease / Increase IOR |
|
||||
@ -12,13 +13,25 @@
|
||||
//! | `H` | Toggle HDR |
|
||||
//! | `C` | Randomize Colors |
|
||||
|
||||
use bevy::prelude::*;
|
||||
use std::f32::consts::PI;
|
||||
|
||||
use bevy::{
|
||||
core_pipeline::{bloom::BloomSettings, tonemapping::Tonemapping},
|
||||
pbr::{NotShadowCaster, NotTransmittedShadowReceiver, PointLightShadowMap},
|
||||
prelude::*,
|
||||
render::view::ColorGrading,
|
||||
};
|
||||
use rand::random;
|
||||
|
||||
fn main() {
|
||||
let mut app = App::new();
|
||||
|
||||
app.add_plugins(DefaultPlugins)
|
||||
.insert_resource(PointLightShadowMap { size: 4096 })
|
||||
.insert_resource(AmbientLight {
|
||||
brightness: 0.0,
|
||||
..default()
|
||||
})
|
||||
.add_systems(Startup, setup)
|
||||
.add_systems(Update, example_control_system);
|
||||
|
||||
@ -46,32 +59,106 @@ fn setup(
|
||||
.unwrap(),
|
||||
);
|
||||
|
||||
// Opaque
|
||||
let cube_mesh = meshes.add(Mesh::from(shape::Cube { size: 0.7 }));
|
||||
|
||||
let plane_mesh = meshes.add(shape::Plane::from_size(2.0).into());
|
||||
|
||||
let cylinder_mesh = meshes.add(
|
||||
Mesh::try_from(shape::Cylinder {
|
||||
radius: 0.5,
|
||||
height: 2.0,
|
||||
resolution: 50,
|
||||
segments: 1,
|
||||
})
|
||||
.unwrap(),
|
||||
);
|
||||
|
||||
// Cube #1
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: icosphere_mesh.clone(),
|
||||
material: materials.add(StandardMaterial {
|
||||
base_color: Color::rgba(0.9, 0.2, 0.3, 1.0),
|
||||
alpha_mode: AlphaMode::Opaque,
|
||||
..default()
|
||||
}),
|
||||
transform: Transform::from_xyz(-1.0, 0.0, 0.0),
|
||||
mesh: cube_mesh.clone(),
|
||||
material: materials.add(StandardMaterial { ..default() }),
|
||||
transform: Transform::from_xyz(0.25, 0.5, -2.0).with_rotation(Quat::from_euler(
|
||||
EulerRot::XYZ,
|
||||
1.4,
|
||||
3.7,
|
||||
21.3,
|
||||
)),
|
||||
..default()
|
||||
},
|
||||
ExampleControls {
|
||||
color: true,
|
||||
transmission: false,
|
||||
diffuse_transmission: false,
|
||||
},
|
||||
));
|
||||
|
||||
// Transmissive
|
||||
// Cube #2
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: cube_mesh,
|
||||
material: materials.add(StandardMaterial { ..default() }),
|
||||
transform: Transform::from_xyz(-0.75, 0.7, -2.0).with_rotation(Quat::from_euler(
|
||||
EulerRot::XYZ,
|
||||
0.4,
|
||||
2.3,
|
||||
4.7,
|
||||
)),
|
||||
..default()
|
||||
},
|
||||
ExampleControls {
|
||||
color: true,
|
||||
transmission: false,
|
||||
diffuse_transmission: false,
|
||||
},
|
||||
));
|
||||
|
||||
// Candle
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: cylinder_mesh,
|
||||
material: materials.add(StandardMaterial {
|
||||
base_color: Color::rgba(0.9, 0.2, 0.3, 1.0),
|
||||
diffuse_transmission: 0.7,
|
||||
perceptual_roughness: 0.32,
|
||||
thickness: 0.2,
|
||||
..default()
|
||||
}),
|
||||
transform: Transform::from_xyz(-1.0, 0.0, 0.0),
|
||||
..default()
|
||||
},
|
||||
NotTransmittedShadowReceiver,
|
||||
ExampleControls {
|
||||
color: true,
|
||||
transmission: false,
|
||||
diffuse_transmission: true,
|
||||
},
|
||||
));
|
||||
|
||||
// Candle Flame
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: icosphere_mesh.clone(),
|
||||
material: materials.add(StandardMaterial {
|
||||
emissive: Color::ANTIQUE_WHITE * 20.0 + Color::ORANGE_RED * 4.0,
|
||||
diffuse_transmission: 1.0,
|
||||
..default()
|
||||
}),
|
||||
transform: Transform::from_xyz(-1.0, 1.15, 0.0).with_scale(Vec3::new(0.1, 0.2, 0.1)),
|
||||
..default()
|
||||
},
|
||||
NotShadowCaster,
|
||||
));
|
||||
|
||||
// Glass Sphere
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: icosphere_mesh,
|
||||
material: materials.add(StandardMaterial {
|
||||
base_color: Color::WHITE,
|
||||
transmission: 1.0,
|
||||
thickness: 1.0,
|
||||
transmission: 0.9,
|
||||
diffuse_transmission: 1.0,
|
||||
thickness: 1.8,
|
||||
ior: 1.5,
|
||||
perceptual_roughness: 0.12,
|
||||
..default()
|
||||
@ -79,17 +166,28 @@ fn setup(
|
||||
transform: Transform::from_xyz(1.0, 0.0, 0.0),
|
||||
..default()
|
||||
},
|
||||
NotTransmittedShadowReceiver,
|
||||
ExampleControls {
|
||||
color: true,
|
||||
transmission: true,
|
||||
diffuse_transmission: false,
|
||||
},
|
||||
));
|
||||
|
||||
// Chessboard Plane
|
||||
let black_material = materials.add(Color::BLACK.into());
|
||||
let white_material = materials.add(Color::WHITE.into());
|
||||
let black_material = materials.add(StandardMaterial {
|
||||
base_color: Color::BLACK,
|
||||
reflectance: 0.3,
|
||||
perceptual_roughness: 0.8,
|
||||
..default()
|
||||
});
|
||||
|
||||
let plane_mesh = meshes.add(shape::Plane::from_size(2.0).into());
|
||||
let white_material = materials.add(StandardMaterial {
|
||||
base_color: Color::WHITE,
|
||||
reflectance: 0.3,
|
||||
perceptual_roughness: 0.8,
|
||||
..default()
|
||||
});
|
||||
|
||||
for x in -3..4 {
|
||||
for z in -3..4 {
|
||||
@ -107,22 +205,69 @@ fn setup(
|
||||
ExampleControls {
|
||||
color: true,
|
||||
transmission: false,
|
||||
diffuse_transmission: false,
|
||||
},
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// Light
|
||||
// Paper
|
||||
commands.spawn((
|
||||
PbrBundle {
|
||||
mesh: plane_mesh.clone(),
|
||||
material: materials.add(StandardMaterial {
|
||||
base_color: Color::WHITE,
|
||||
diffuse_transmission: 0.6,
|
||||
perceptual_roughness: 0.8,
|
||||
reflectance: 1.0,
|
||||
double_sided: true,
|
||||
cull_mode: None,
|
||||
..default()
|
||||
}),
|
||||
transform: Transform::from_xyz(0.0, 0.5, -3.0)
|
||||
.with_scale(Vec3::new(2.0, 1.0, 1.0))
|
||||
.with_rotation(Quat::from_euler(EulerRot::XYZ, PI / 2.0, 0.0, 0.0)),
|
||||
..default()
|
||||
},
|
||||
ExampleControls {
|
||||
transmission: false,
|
||||
color: false,
|
||||
diffuse_transmission: true,
|
||||
},
|
||||
));
|
||||
|
||||
// Candle Light
|
||||
commands.spawn(PointLightBundle {
|
||||
transform: Transform::from_xyz(4.0, 8.0, 4.0),
|
||||
transform: Transform::from_xyz(-1.0, 1.7, 0.0),
|
||||
point_light: PointLight {
|
||||
color: Color::ANTIQUE_WHITE * 0.8 + Color::ORANGE_RED * 0.2,
|
||||
intensity: 1600.0,
|
||||
radius: 0.2,
|
||||
range: 5.0,
|
||||
shadows_enabled: true,
|
||||
..default()
|
||||
},
|
||||
..default()
|
||||
});
|
||||
|
||||
// Camera
|
||||
commands.spawn(Camera3dBundle {
|
||||
transform: Transform::from_xyz(0.0, 1.5, 7.0).looking_at(Vec3::ZERO, Vec3::Y),
|
||||
..default()
|
||||
});
|
||||
commands.spawn((
|
||||
Camera3dBundle {
|
||||
transform: Transform::from_xyz(0.0, 2.8, 7.0).looking_at(Vec3::ZERO, Vec3::Y),
|
||||
color_grading: ColorGrading {
|
||||
exposure: -2.0,
|
||||
post_saturation: 1.2,
|
||||
..default()
|
||||
},
|
||||
tonemapping: Tonemapping::TonyMcMapface,
|
||||
..default()
|
||||
},
|
||||
EnvironmentMapLight {
|
||||
diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
|
||||
specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
|
||||
},
|
||||
BloomSettings::default(),
|
||||
));
|
||||
|
||||
// Controls Text
|
||||
let text_style = TextStyle {
|
||||
@ -133,7 +278,7 @@ fn setup(
|
||||
|
||||
commands.spawn(
|
||||
TextBundle::from_section(
|
||||
"Q / W - Decrease / Increase Transmission\nA / S - Decrease / Increase Thickness\nZ / X - Decrease / Increase IOR\nDown / Up - Decrease / Increase Perceptual Roughness\nLeft / Right - Rotate Camera\nH - Toggle HDR\nC - Randomize Colors",
|
||||
"1 / 2 - Decrease / Increase Diffuse Transmission\nQ / W - Decrease / Increase Transmission\nA / S - Decrease / Increase Thickness\nZ / X - Decrease / Increase IOR\nDown / Up - Decrease / Increase Perceptual Roughness\nLeft / Right - Rotate Camera\nH - Toggle HDR\nC - Randomize Colors",
|
||||
text_style.clone(),
|
||||
)
|
||||
.with_style(Style {
|
||||
@ -157,11 +302,13 @@ fn setup(
|
||||
|
||||
#[derive(Component)]
|
||||
struct ExampleControls {
|
||||
diffuse_transmission: bool,
|
||||
transmission: bool,
|
||||
color: bool,
|
||||
}
|
||||
|
||||
struct ExampleState {
|
||||
diffuse_transmission: f32,
|
||||
transmission: f32,
|
||||
thickness: f32,
|
||||
ior: f32,
|
||||
@ -174,8 +321,9 @@ struct ExampleDisplay;
|
||||
impl Default for ExampleState {
|
||||
fn default() -> Self {
|
||||
ExampleState {
|
||||
transmission: 1.0,
|
||||
thickness: 1.0,
|
||||
diffuse_transmission: 0.5,
|
||||
transmission: 0.9,
|
||||
thickness: 1.8,
|
||||
ior: 1.5,
|
||||
perceptual_roughness: 0.12,
|
||||
}
|
||||
@ -192,6 +340,12 @@ fn example_control_system(
|
||||
time: Res<Time>,
|
||||
input: Res<Input<KeyCode>>,
|
||||
) {
|
||||
if input.pressed(KeyCode::Key2) {
|
||||
state.diffuse_transmission = (state.diffuse_transmission + time.delta_seconds()).min(1.0);
|
||||
} else if input.pressed(KeyCode::Key1) {
|
||||
state.diffuse_transmission = (state.diffuse_transmission - time.delta_seconds()).max(0.0);
|
||||
}
|
||||
|
||||
if input.pressed(KeyCode::W) {
|
||||
state.transmission = (state.transmission + time.delta_seconds()).min(1.0);
|
||||
} else if input.pressed(KeyCode::Q) {
|
||||
@ -199,7 +353,7 @@ fn example_control_system(
|
||||
}
|
||||
|
||||
if input.pressed(KeyCode::S) {
|
||||
state.thickness = (state.thickness + time.delta_seconds()).min(1.0);
|
||||
state.thickness = (state.thickness + time.delta_seconds()).min(5.0);
|
||||
} else if input.pressed(KeyCode::A) {
|
||||
state.thickness = (state.thickness - time.delta_seconds()).max(0.0);
|
||||
}
|
||||
@ -227,6 +381,10 @@ fn example_control_system(
|
||||
material.perceptual_roughness = state.perceptual_roughness;
|
||||
}
|
||||
|
||||
if controls.diffuse_transmission {
|
||||
material.diffuse_transmission = state.diffuse_transmission;
|
||||
}
|
||||
|
||||
if controls.color && randomize_colors {
|
||||
material.base_color.set_r(random());
|
||||
material.base_color.set_g(random());
|
||||
@ -255,8 +413,9 @@ fn example_control_system(
|
||||
|
||||
let mut display = display.single_mut();
|
||||
display.sections[0].value = format!(
|
||||
"HDR: {}\nTransmission: {:.2}\nThickness: {:.2}\nIOR: {:.2}\nPerceptual Roughness: {:.2}",
|
||||
"HDR: {}\nDiffuse Transmission: {:.2}\nTransmission: {:.2}\nThickness: {:.2}\nIOR: {:.2}\nPerceptual Roughness: {:.2}",
|
||||
if camera.hdr { "ON " } else { "OFF" },
|
||||
state.diffuse_transmission,
|
||||
state.transmission,
|
||||
state.thickness,
|
||||
state.ior,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user