Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TextureAtlasBuilder padding #10031

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Fix TextureAtlasBuilder padding #10031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c4114
Fix atlas builder padding
s-puig Oct 5, 2023
3b61357
Merge branch 'main' into fix-padding-atlas-builder
s-puig Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions crates/bevy_sprite/src/texture_atlas_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ pub enum TextureAtlasBuilderError {
/// A builder which is used to create a texture atlas from many individual
/// sprites.
pub struct TextureAtlasBuilder {
/// The grouped rects which must be placed with a key value pair of a
/// texture handle to an index.
rects_to_place: GroupedRectsToPlace<AssetId<Image>>,
/// Collection of textures and their size to be packed into an atlas
textures_to_place: Vec<(AssetId<Image>, Extent3d)>,
/// The initial atlas size in pixels.
initial_size: Vec2,
/// The absolute maximum size of the texture atlas in pixels.
Expand All @@ -45,7 +44,7 @@ pub struct TextureAtlasBuilder {
impl Default for TextureAtlasBuilder {
fn default() -> Self {
Self {
rects_to_place: GroupedRectsToPlace::new(),
textures_to_place: Vec::new(),
initial_size: Vec2::new(256., 256.),
max_size: Vec2::new(2048., 2048.),
format: TextureFormat::Rgba8UnormSrgb,
Expand Down Expand Up @@ -84,15 +83,8 @@ impl TextureAtlasBuilder {

/// Adds a texture to be copied to the texture atlas.
pub fn add_texture(&mut self, image_id: AssetId<Image>, texture: &Image) {
self.rects_to_place.push_rect(
image_id,
None,
RectToInsert::new(
texture.texture_descriptor.size.width + self.padding.x,
texture.texture_descriptor.size.height + self.padding.y,
1,
),
);
self.textures_to_place
.push((image_id, texture.texture_descriptor.size));
}

/// Sets the amount of padding in pixels to add between the textures in the texture atlas.
Expand Down Expand Up @@ -177,6 +169,16 @@ impl TextureAtlasBuilder {
let mut current_height = initial_height;
let mut rect_placements = None;
let mut atlas_texture = Image::default();
let mut rects_to_place = GroupedRectsToPlace::<AssetId<Image>>::new();

// Adds textures to rectangle group packer
for (image_id, size) in &self.textures_to_place {
rects_to_place.push_rect(
*image_id,
None,
RectToInsert::new(size.width + self.padding.x, size.height + self.padding.y, 1),
);
}

while rect_placements.is_none() {
if current_width > max_width || current_height > max_height {
Expand All @@ -188,7 +190,7 @@ impl TextureAtlasBuilder {
let mut target_bins = std::collections::BTreeMap::new();
target_bins.insert(0, TargetBin::new(current_width, current_height, 1));
rect_placements = match pack_rects(
&self.rects_to_place,
&rects_to_place,
&mut target_bins,
&volume_heuristic,
&contains_smallest_box,
Expand Down