forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare_sprite_image_bind_groups refactor (#17045)

Browse Source 
# Objective

In `prepare_sprite_image_bind_groups` the `batch_image_changed`
condition is checked twice but the second if-block seems unnecessary.

# Solution

Queue new `SpriteBatch`es inside the first if-block and remove the
second if-block.
This commit is contained in:
ickshonpe 2024-12-30 22:54:04 +00:00 committed by GitHub
parent d522c47dbe
commit 1e9f647b33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/bevy_sprite/src/render/mod.rs
View File

@ -670,8 +670,7 @@ pub fn prepare_sprite_image_bind_groups(
continue;
};
let batch_image_changed = batch_image_handle != extracted_sprite.image_handle_id;
if batch_image_changed {
if batch_image_handle != extracted_sprite.image_handle_id {
let Some(gpu_image) = gpu_images.get(extracted_sprite.image_handle_id) else {
continue;
};
@ -691,6 +690,15 @@ pub fn prepare_sprite_image_bind_groups(
)),
)
});
batch_item_index = item_index;
batches.push((
item.entity(),
SpriteBatch {
image_handle_id: batch_image_handle,
range: index..index,
},
));
}
// By default, the size of the quad is the size of the texture
@ -742,18 +750,6 @@ pub fn prepare_sprite_image_bind_groups(
&uv_offset_scale,
));
if batch_image_changed {
batch_item_index = item_index;
batches.push((
item.entity(),
SpriteBatch {
image_handle_id: batch_image_handle,
range: index..index,
},
));
}
transparent_phase.items[batch_item_index]
.batch_range_mut()
.end += 1;