leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Use shorter names for width and height in image::atlas

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-10-28 10:20:04 +01:00
parent 67730a8bfa
commit 3cc5bd5dbc
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
wgpu/src/image/atlas.rs
View file

@ -340,12 +340,14 @@ impl Atlas {
const PIXEL: usize = 4; const PIXEL: usize = 4;
let mut fragment = buffer_slice.get_mapped_range_mut(); let mut fragment = buffer_slice.get_mapped_range_mut();
let w = width as usize;
let h = height as usize;
let pad_w = padding.width as usize; let pad_w = padding.width as usize;
let pad_h = padding.height as usize; let pad_h = padding.height as usize;
let stride = PIXEL * width as usize; let stride = PIXEL * w;
// Copy image rows // Copy image rows
for row in 0..height as usize { for row in 0..h {
let src = offset + row * PIXEL * image_width as usize; let src = offset + row * PIXEL * image_width as usize;
let dst = (row + pad_h) * bytes_per_row; let dst = (row + pad_h) * bytes_per_row;
@ -368,24 +370,18 @@ impl Atlas {
// Add padding on top and bottom // Add padding on top and bottom
for row in 0..pad_h { for row in 0..pad_h {
let dst_top = row * bytes_per_row; let dst_top = row * bytes_per_row;
let dst_bottom = (pad_h + height as usize + row) * bytes_per_row; let dst_bottom = (pad_h + h + row) * bytes_per_row;
let src_top = offset; let src_top = offset;
let src_bottom = let src_bottom = offset + (h - 1) * PIXEL * image_width as usize;
offset + (height - 1) as usize * PIXEL * image_width as usize;
// Top // Top
fragment[dst_top + PIXEL * pad_w fragment[dst_top + PIXEL * pad_w..dst_top + PIXEL * (pad_w + w)]
..dst_top + PIXEL * (pad_w + width as usize)] .copy_from_slice(&pixels[src_top..src_top + PIXEL * w]);
.copy_from_slice(
&pixels[src_top..src_top + PIXEL * width as usize],
);
// Bottom // Bottom
fragment[dst_bottom + PIXEL * pad_w fragment
..dst_bottom + PIXEL * (pad_w + width as usize)] [dst_bottom + PIXEL * pad_w..dst_bottom + PIXEL * (pad_w + w)]
.copy_from_slice( .copy_from_slice(&pixels[src_bottom..src_bottom + PIXEL * w]);
&pixels[src_bottom..src_bottom + PIXEL * width as usize],
);
// Corners // Corners
for i in 0..pad_w { for i in 0..pad_w {
@ -394,11 +390,10 @@ impl Atlas {
.copy_from_slice(&pixels[offset..offset + PIXEL]); .copy_from_slice(&pixels[offset..offset + PIXEL]);
// Top right // Top right
fragment[dst_top + PIXEL * (width as usize + pad_w + i) fragment[dst_top + PIXEL * (w + pad_w + i)
..dst_top + PIXEL * (width as usize + pad_w + i + 1)] ..dst_top + PIXEL * (w + pad_w + i + 1)]
.copy_from_slice( .copy_from_slice(
&pixels[offset + PIXEL * (width - 1) as usize &pixels[offset + PIXEL * (w - 1)..offset + PIXEL * w],
..offset + PIXEL * width as usize],
); );
// Bottom left // Bottom left
@ -406,11 +401,11 @@ impl Atlas {
.copy_from_slice(&pixels[src_bottom..src_bottom + PIXEL]); .copy_from_slice(&pixels[src_bottom..src_bottom + PIXEL]);
// Bottom right // Bottom right
fragment[dst_bottom + PIXEL * (width as usize + pad_w + i) fragment[dst_bottom + PIXEL * (w + pad_w + i)
..dst_bottom + PIXEL * (width as usize + pad_w + i + 1)] ..dst_bottom + PIXEL * (w + pad_w + i + 1)]
.copy_from_slice( .copy_from_slice(
&pixels[src_bottom + PIXEL * (width - 1) as usize &pixels[src_bottom + PIXEL * (w - 1)
..src_bottom + PIXEL * width as usize], ..src_bottom + PIXEL * w],
); );
} }
} }