mirror of
https://github.com/bevyengine/bevy
synced 2025-02-18 15:08:36 +00:00
# Objective #11431 and #11688 implemented meshing support for Bevy's new geometric primitives. The next step is to deprecate the shapes in `bevy_render::mesh::shape` and to later remove them completely for 0.14. ## Solution Deprecate the shapes and reduce code duplication by utilizing the primitive meshing API for the old shapes where possible. Note that some shapes have behavior that can't be exactly reproduced with the new primitives yet: - `Box` is more of an AABB with min/max extents - `Plane` supports a subdivision count - `Quad` has a `flipped` property These types have not been changed to utilize the new primitives yet. --- ## Changelog - Deprecated all shapes in `bevy_render::mesh::shape` - Changed all examples to use new primitives for meshing ## Migration Guide Bevy has previously used rendering-specific types like `UVSphere` and `Quad` for primitive mesh shapes. These have now been deprecated to use the geometric primitives newly introduced in version 0.13. Some examples: ```rust let before = meshes.add(shape::Box::new(5.0, 0.15, 5.0)); let after = meshes.add(Cuboid::new(5.0, 0.15, 5.0)); let before = meshes.add(shape::Quad::default()); let after = meshes.add(Rectangle::default()); let before = meshes.add(shape::Plane::from_size(5.0)); // The surface normal can now also be specified when using `new` let after = meshes.add(Plane3d::default().mesh().size(5.0, 5.0)); let before = meshes.add( Mesh::try_from(shape::Icosphere { radius: 0.5, subdivisions: 5, }) .unwrap(), ); let after = meshes.add(Sphere::new(0.5).mesh().ico(5).unwrap()); ```
302 lines
8.7 KiB
Rust
302 lines
8.7 KiB
Rust
//! This interactive example shows how to use distance fog,
|
|
//! and allows playing around with different fog settings.
|
|
//!
|
|
//! ## Controls
|
|
//!
|
|
//! | Key Binding | Action |
|
|
//! |:-------------------|:------------------------------------|
|
|
//! | `1` / `2` / `3` | Fog Falloff Mode |
|
|
//! | `A` / `S` | Move Start Distance (Linear Fog) |
|
|
//! | | Change Density (Exponential Fogs) |
|
|
//! | `Z` / `X` | Move End Distance (Linear Fog) |
|
|
//! | `-` / `=` | Adjust Fog Red Channel |
|
|
//! | `[` / `]` | Adjust Fog Green Channel |
|
|
//! | `;` / `'` | Adjust Fog Blue Channel |
|
|
//! | `.` / `?` | Adjust Fog Alpha Channel |
|
|
|
|
use bevy::{
|
|
pbr::{NotShadowCaster, NotShadowReceiver},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(
|
|
Startup,
|
|
(setup_camera_fog, setup_pyramid_scene, setup_instructions),
|
|
)
|
|
.add_systems(Update, update_system)
|
|
.run();
|
|
}
|
|
|
|
fn setup_camera_fog(mut commands: Commands) {
|
|
commands.spawn((
|
|
Camera3dBundle::default(),
|
|
FogSettings {
|
|
color: Color::rgba(0.25, 0.25, 0.25, 1.0),
|
|
falloff: FogFalloff::Linear {
|
|
start: 5.0,
|
|
end: 20.0,
|
|
},
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
fn setup_pyramid_scene(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
let stone = materials.add(StandardMaterial {
|
|
base_color: Color::hex("28221B").unwrap(),
|
|
perceptual_roughness: 1.0,
|
|
..default()
|
|
});
|
|
|
|
// pillars
|
|
for (x, z) in &[(-1.5, -1.5), (1.5, -1.5), (1.5, 1.5), (-1.5, 1.5)] {
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(1.0, 3.0, 1.0)),
|
|
material: stone.clone(),
|
|
transform: Transform::from_xyz(*x, 1.5, *z),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// orb
|
|
commands.spawn((
|
|
PbrBundle {
|
|
mesh: meshes.add(Sphere::default()),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Color::hex("126212CC").unwrap(),
|
|
reflectance: 1.0,
|
|
perceptual_roughness: 0.0,
|
|
metallic: 0.5,
|
|
alpha_mode: AlphaMode::Blend,
|
|
..default()
|
|
}),
|
|
transform: Transform::from_scale(Vec3::splat(1.75))
|
|
.with_translation(Vec3::new(0.0, 4.0, 0.0)),
|
|
..default()
|
|
},
|
|
NotShadowCaster,
|
|
NotShadowReceiver,
|
|
));
|
|
|
|
// steps
|
|
for i in 0..50 {
|
|
let half_size = i as f32 / 2.0 + 3.0;
|
|
let y = -i as f32 / 2.0;
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(2.0 * half_size, 0.5, 2.0 * half_size)),
|
|
material: stone.clone(),
|
|
transform: Transform::from_xyz(0.0, y + 0.25, 0.0),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// sky
|
|
commands.spawn(PbrBundle {
|
|
mesh: meshes.add(Cuboid::new(2.0, 1.0, 1.0)),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Color::hex("888888").unwrap(),
|
|
unlit: true,
|
|
cull_mode: None,
|
|
..default()
|
|
}),
|
|
transform: Transform::from_scale(Vec3::splat(1_000_000.0)),
|
|
..default()
|
|
});
|
|
|
|
// light
|
|
commands.spawn(PointLightBundle {
|
|
transform: Transform::from_xyz(0.0, 1.0, 0.0),
|
|
point_light: PointLight {
|
|
intensity: 300_000.,
|
|
range: 100.,
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
..default()
|
|
});
|
|
}
|
|
|
|
fn setup_instructions(mut commands: Commands) {
|
|
commands.spawn(
|
|
TextBundle::from_section(
|
|
"",
|
|
TextStyle {
|
|
font_size: 20.0,
|
|
..default()
|
|
},
|
|
)
|
|
.with_style(Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
}),
|
|
);
|
|
}
|
|
|
|
fn update_system(
|
|
mut camera: Query<(&mut FogSettings, &mut Transform)>,
|
|
mut text: Query<&mut Text>,
|
|
time: Res<Time>,
|
|
keycode: Res<ButtonInput<KeyCode>>,
|
|
) {
|
|
let now = time.elapsed_seconds();
|
|
let delta = time.delta_seconds();
|
|
|
|
let (mut fog, mut transform) = camera.single_mut();
|
|
let mut text = text.single_mut();
|
|
|
|
// Orbit camera around pyramid
|
|
let orbit_scale = 8.0 + (now / 10.0).sin() * 7.0;
|
|
*transform = Transform::from_xyz(
|
|
(now / 5.0).cos() * orbit_scale,
|
|
12.0 - orbit_scale / 2.0,
|
|
(now / 5.0).sin() * orbit_scale,
|
|
)
|
|
.looking_at(Vec3::ZERO, Vec3::Y);
|
|
|
|
// Fog Information
|
|
text.sections[0].value = format!("Fog Falloff: {:?}\nFog Color: {:?}", fog.falloff, fog.color);
|
|
|
|
// Fog Falloff Mode Switching
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
|
|
|
|
if keycode.pressed(KeyCode::Digit1) {
|
|
if let FogFalloff::Linear { .. } = fog.falloff {
|
|
// No change
|
|
} else {
|
|
fog.falloff = FogFalloff::Linear {
|
|
start: 5.0,
|
|
end: 20.0,
|
|
};
|
|
};
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Digit2) {
|
|
if let FogFalloff::Exponential { .. } = fog.falloff {
|
|
// No change
|
|
} else if let FogFalloff::ExponentialSquared { density } = fog.falloff {
|
|
fog.falloff = FogFalloff::Exponential { density };
|
|
} else {
|
|
fog.falloff = FogFalloff::Exponential { density: 0.07 };
|
|
};
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Digit3) {
|
|
if let FogFalloff::Exponential { density } = fog.falloff {
|
|
fog.falloff = FogFalloff::ExponentialSquared { density };
|
|
} else if let FogFalloff::ExponentialSquared { .. } = fog.falloff {
|
|
// No change
|
|
} else {
|
|
fog.falloff = FogFalloff::Exponential { density: 0.07 };
|
|
};
|
|
}
|
|
|
|
// Linear Fog Controls
|
|
if let FogFalloff::Linear {
|
|
ref mut start,
|
|
ref mut end,
|
|
} = &mut fog.falloff
|
|
{
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*start -= delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*start += delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyZ) {
|
|
*end -= delta * 3.0;
|
|
}
|
|
if keycode.pressed(KeyCode::KeyX) {
|
|
*end += delta * 3.0;
|
|
}
|
|
}
|
|
|
|
// Exponential Fog Controls
|
|
if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
|
|
text.sections[0].value.push_str("\nA / S - Change Density");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*density -= delta * 0.5 * *density;
|
|
if *density < 0.0 {
|
|
*density = 0.0;
|
|
}
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*density += delta * 0.5 * *density;
|
|
}
|
|
}
|
|
|
|
// ExponentialSquared Fog Controls
|
|
if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
|
|
text.sections[0].value.push_str("\nA / S - Change Density");
|
|
|
|
if keycode.pressed(KeyCode::KeyA) {
|
|
*density -= delta * 0.5 * *density;
|
|
if *density < 0.0 {
|
|
*density = 0.0;
|
|
}
|
|
}
|
|
if keycode.pressed(KeyCode::KeyS) {
|
|
*density += delta * 0.5 * *density;
|
|
}
|
|
}
|
|
|
|
// RGBA Controls
|
|
text.sections[0]
|
|
.value
|
|
.push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
|
|
|
|
if keycode.pressed(KeyCode::Minus) {
|
|
let r = (fog.color.r() - 0.1 * delta).max(0.0);
|
|
fog.color.set_r(r);
|
|
}
|
|
|
|
if keycode.any_pressed([KeyCode::Equal, KeyCode::NumpadEqual]) {
|
|
let r = (fog.color.r() + 0.1 * delta).min(1.0);
|
|
fog.color.set_r(r);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::BracketLeft) {
|
|
let g = (fog.color.g() - 0.1 * delta).max(0.0);
|
|
fog.color.set_g(g);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::BracketRight) {
|
|
let g = (fog.color.g() + 0.1 * delta).min(1.0);
|
|
fog.color.set_g(g);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Semicolon) {
|
|
let b = (fog.color.b() - 0.1 * delta).max(0.0);
|
|
fog.color.set_b(b);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Quote) {
|
|
let b = (fog.color.b() + 0.1 * delta).min(1.0);
|
|
fog.color.set_b(b);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Period) {
|
|
let a = (fog.color.a() - 0.1 * delta).max(0.0);
|
|
fog.color.set_a(a);
|
|
}
|
|
|
|
if keycode.pressed(KeyCode::Slash) {
|
|
let a = (fog.color.a() + 0.1 * delta).min(1.0);
|
|
fog.color.set_a(a);
|
|
}
|
|
}
|