mirror of
https://github.com/bevyengine/bevy
synced 2024-11-21 20:23:28 +00:00
ef23f465ce
# Objective _If I understand it correctly_, we were checking mesh visibility, as well as re-rendering point and spot light shadow maps for each view. This makes it so that M views and N lights produce M x N complexity. This PR aims to fix that, as well as introduce a stress test for this specific scenario. ## Solution - Keep track of what lights have already had mesh visibility calculated and do not calculate it again; - Reuse shadow depth textures and attachments across all views, and only render shadow maps for the _first_ time a light is encountered on a view; - Directional lights remain unaltered, since their shadow map cascades are view-dependent; - Add a new `many_cameras_lights` stress test example to verify the solution ## Showcase 110% speed up on the stress test 83% reduction of memory usage in stress test ### Before (5.35 FPS on stress test) <img width="1392" alt="Screenshot 2024-09-11 at 12 25 57" src="https://github.com/user-attachments/assets/136b0785-e9a4-44df-9a22-f99cc465e126"> ### After (11.34 FPS on stress test) <img width="1392" alt="Screenshot 2024-09-11 at 12 24 35" src="https://github.com/user-attachments/assets/b8dd858f-5e19-467f-8344-2b46ca039630"> ## Testing - Did you test these changes? If so, how? - On my game project where I have two cameras, and many shadow casting lights I managed to get pretty much double the FPS. - Also included a stress test, see the comparison above - Are there any parts that need more testing? - Yes, I would like help verifying that this fix is indeed correct, and that we were really re-rendering the shadow maps by mistake and it's indeed okay to not do that - How can other people (reviewers) test your changes? Is there anything specific they need to know? - Run the `many_cameras_lights` example - On the `main` branch, cherry pick the commit with the example (`git cherry-pick --no-commit 1ed4ace01`) and run it - If relevant, what platforms did you test these changes on, and are there any important ones you can't test? - macOS --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
92 lines
2.8 KiB
Rust
92 lines
2.8 KiB
Rust
//! Test rendering of many cameras and lights
|
|
|
|
use std::f32::consts::PI;
|
|
|
|
use bevy::{
|
|
math::ops::{cos, sin},
|
|
prelude::*,
|
|
render::camera::Viewport,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, rotate_cameras)
|
|
.run();
|
|
}
|
|
|
|
const CAMERA_ROWS: usize = 4;
|
|
const CAMERA_COLS: usize = 4;
|
|
const NUM_LIGHTS: usize = 5;
|
|
|
|
/// set up a simple 3D scene
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
window: Query<&Window>,
|
|
) {
|
|
// circular base
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Circle::new(4.0))),
|
|
MeshMaterial3d(materials.add(Color::WHITE)),
|
|
Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
|
|
));
|
|
|
|
// cube
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
|
|
MeshMaterial3d(materials.add(Color::WHITE)),
|
|
Transform::from_xyz(0.0, 0.5, 0.0),
|
|
));
|
|
|
|
// lights
|
|
for i in 0..NUM_LIGHTS {
|
|
let angle = (i as f32) / (NUM_LIGHTS as f32) * PI * 2.0;
|
|
commands.spawn((
|
|
PointLight {
|
|
color: Color::hsv(angle.to_degrees(), 1.0, 1.0),
|
|
intensity: 2_000_000.0 / NUM_LIGHTS as f32,
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
Transform::from_xyz(sin(angle) * 4.0, 2.0, cos(angle) * 4.0),
|
|
));
|
|
}
|
|
|
|
// cameras
|
|
let window = window.single();
|
|
let width = window.resolution.width() / CAMERA_COLS as f32 * window.resolution.scale_factor();
|
|
let height = window.resolution.height() / CAMERA_ROWS as f32 * window.resolution.scale_factor();
|
|
let mut i = 0;
|
|
for y in 0..CAMERA_COLS {
|
|
for x in 0..CAMERA_ROWS {
|
|
let angle = i as f32 / (CAMERA_ROWS * CAMERA_COLS) as f32 * PI * 2.0;
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Camera {
|
|
viewport: Some(Viewport {
|
|
physical_position: UVec2::new(
|
|
(x as f32 * width) as u32,
|
|
(y as f32 * height) as u32,
|
|
),
|
|
physical_size: UVec2::new(width as u32, height as u32),
|
|
..default()
|
|
}),
|
|
order: i,
|
|
..default()
|
|
},
|
|
Transform::from_xyz(sin(angle) * 4.0, 2.5, cos(angle) * 4.0)
|
|
.looking_at(Vec3::ZERO, Vec3::Y),
|
|
));
|
|
i += 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
fn rotate_cameras(time: Res<Time>, mut query: Query<&mut Transform, With<Camera>>) {
|
|
for mut transform in query.iter_mut() {
|
|
transform.rotate_around(Vec3::ZERO, Quat::from_rotation_y(time.delta_secs()));
|
|
}
|
|
}
|