mirror of
https://github.com/bevyengine/bevy.git
synced 2026-06-30 15:55:32 -04:00
Rostyslav Lesovyi
9fd2637846
# Objective - Fixes #16751 ## Solution - `Assets::get_mut` now returns a wrapper `AssetMut` type instead of `&mut impl Asset`. - `AssetMut` implements `Deref` and `DerefMut`. - `DerefMut` marks assets as changed. - when dropped `AssetMut` will add `AssetEvent::Modified` event to a queue only in case asset was marked as changed. ## Testing - Did you test these changes? If so, how? - No unit tests were added, change is pretty straightforward. - Test project: https://github.com/MatrixDev/bevy-feature-16751-test. - With change: ~100 fps. - Without change: ~15 fps. - Are there any parts that need more testing? - I don't really see how this can break anything or add a measurable overhead. - `AssetEvent::Modified` will now be sent after the asset was modified instead of before. It should not affect anything but still worth noting. - How can other people (reviewers) test your changes? Is there anything specific they need to know? - Have a big amount of entities that constantly update their materials. - Properties of those materials should be animated in a stepped maned (like changing color every 0.1 seconds). - Update material only if value has actually changed: ```rust if material.base_color != new_color { material.base_color = new_color; } ``` - If relevant, what platforms did you test these changes on, and are there any important ones you can't test? - tested on macos (Mackbook M1) - not a platform-specific issue PS: This is my first PR, so please don’t judge.
60 lines
1.7 KiB
Rust
60 lines
1.7 KiB
Rust
//! Shows how to animate material properties
|
|
|
|
use bevy::prelude::*;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, animate_materials)
|
|
.run();
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Transform::from_xyz(3.0, 1.0, 3.0).looking_at(Vec3::new(0.0, -0.5, 0.0), Vec3::Y),
|
|
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"),
|
|
intensity: 2_000.0,
|
|
..default()
|
|
},
|
|
));
|
|
|
|
let cube = meshes.add(Cuboid::new(0.5, 0.5, 0.5));
|
|
|
|
const GOLDEN_ANGLE: f32 = 137.507_77;
|
|
|
|
let mut hsla = Hsla::hsl(0.0, 1.0, 0.5);
|
|
for x in -1..2 {
|
|
for z in -1..2 {
|
|
commands.spawn((
|
|
Mesh3d(cube.clone()),
|
|
MeshMaterial3d(materials.add(Color::from(hsla))),
|
|
Transform::from_translation(Vec3::new(x as f32, 0.0, z as f32)),
|
|
));
|
|
hsla = hsla.rotate_hue(GOLDEN_ANGLE);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn animate_materials(
|
|
material_handles: Query<&MeshMaterial3d<StandardMaterial>>,
|
|
time: Res<Time>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
for material_handle in material_handles.iter() {
|
|
if let Some(mut material) = materials.get_mut(material_handle)
|
|
&& let Color::Hsla(ref mut hsla) = material.base_color
|
|
{
|
|
*hsla = hsla.rotate_hue(time.delta_secs() * 100.0);
|
|
}
|
|
}
|
|
}
|