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

[Merged by Bors] - Fix overflow scaling for images #7142

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Fix overflow scaling for images #7142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48f4e34
do not multiply by scale factor
mockersf Jan 9, 2023
fc34d9b
remove unused scale factor
mockersf Jan 9, 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
21 changes: 8 additions & 13 deletions crates/bevy_ui/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ pub struct ExtractedUiNode {
pub clip: Option<Rect>,
pub flip_x: bool,
pub flip_y: bool,
pub scale_factor: f32,
}

#[derive(Resource, Default)]
Expand All @@ -188,7 +187,6 @@ pub fn extract_uinodes(
mut extracted_uinodes: ResMut<ExtractedUiNodes>,
images: Extract<Res<Assets<Image>>>,
ui_stack: Extract<Res<UiStack>>,
windows: Extract<Res<Windows>>,
uinode_query: Extract<
Query<(
&Node,
Expand All @@ -200,7 +198,6 @@ pub fn extract_uinodes(
)>,
>,
) {
let scale_factor = windows.scale_factor(WindowId::primary()) as f32;
extracted_uinodes.uinodes.clear();
for (stack_index, entity) in ui_stack.uinodes.iter().enumerate() {
if let Ok((uinode, transform, color, maybe_image, visibility, clip)) =
Expand Down Expand Up @@ -236,7 +233,6 @@ pub fn extract_uinodes(
clip: clip.map(|clip| clip.clip),
flip_x,
flip_y,
scale_factor,
});
}
}
Expand Down Expand Up @@ -364,7 +360,6 @@ pub fn extract_text_uinodes(
clip: clip.map(|clip| clip.clip),
flip_x: false,
flip_y: false,
scale_factor,
});
}
}
Expand Down Expand Up @@ -500,20 +495,20 @@ pub fn prepare_uinodes(
let atlas_extent = extracted_uinode.atlas_size.unwrap_or(uinode_rect.max);
let mut uvs = [
Vec2::new(
uinode_rect.min.x + positions_diff[0].x * extracted_uinode.scale_factor,
uinode_rect.min.y + positions_diff[0].y * extracted_uinode.scale_factor,
uinode_rect.min.x + positions_diff[0].x,
uinode_rect.min.y + positions_diff[0].y,
),
Vec2::new(
uinode_rect.max.x + positions_diff[1].x * extracted_uinode.scale_factor,
uinode_rect.min.y + positions_diff[1].y * extracted_uinode.scale_factor,
uinode_rect.max.x + positions_diff[1].x,
uinode_rect.min.y + positions_diff[1].y,
),
Vec2::new(
uinode_rect.max.x + positions_diff[2].x * extracted_uinode.scale_factor,
uinode_rect.max.y + positions_diff[2].y * extracted_uinode.scale_factor,
uinode_rect.max.x + positions_diff[2].x,
uinode_rect.max.y + positions_diff[2].y,
),
Vec2::new(
uinode_rect.min.x + positions_diff[3].x * extracted_uinode.scale_factor,
uinode_rect.max.y + positions_diff[3].y * extracted_uinode.scale_factor,
uinode_rect.min.x + positions_diff[3].x,
uinode_rect.max.y + positions_diff[3].y,
),
]
.map(|pos| pos / atlas_extent);
Expand Down