Revert "Merge pull request #2962 from iced-rs/fix/blurry-quads"
This reverts commit03326b955b, reversing changes made to7c5a4bc465.
This commit is contained in:
parent
6c0962c5c3
commit
9d4e849a0e
31 changed files with 78 additions and 59 deletions
|
|
@ -147,6 +147,8 @@ impl Pipeline {
|
|||
6 => Float32x2,
|
||||
// Layer
|
||||
7 => Sint32,
|
||||
// Snap
|
||||
8 => Uint32,
|
||||
),
|
||||
}],
|
||||
compilation_options:
|
||||
|
|
@ -241,7 +243,7 @@ impl State {
|
|||
[bounds.width, bounds.height],
|
||||
f32::from(image.rotation),
|
||||
image.opacity,
|
||||
scale,
|
||||
image.snap,
|
||||
atlas_entry,
|
||||
match image.filter_method {
|
||||
crate::core::image::FilterMethod::Nearest => {
|
||||
|
|
@ -274,7 +276,7 @@ impl State {
|
|||
size,
|
||||
f32::from(svg.rotation),
|
||||
svg.opacity,
|
||||
scale,
|
||||
true,
|
||||
atlas_entry,
|
||||
nearest_instances,
|
||||
);
|
||||
|
|
@ -504,6 +506,7 @@ struct Instance {
|
|||
_position_in_atlas: [f32; 2],
|
||||
_size_in_atlas: [f32; 2],
|
||||
_layer: u32,
|
||||
_snap: u32,
|
||||
}
|
||||
|
||||
impl Instance {
|
||||
|
|
@ -521,21 +524,14 @@ struct Uniforms {
|
|||
}
|
||||
|
||||
fn add_instances(
|
||||
mut image_position: [f32; 2],
|
||||
mut image_size: [f32; 2],
|
||||
image_position: [f32; 2],
|
||||
image_size: [f32; 2],
|
||||
rotation: f32,
|
||||
opacity: f32,
|
||||
scale: f32,
|
||||
snap: bool,
|
||||
entry: &atlas::Entry,
|
||||
instances: &mut Vec<Instance>,
|
||||
) {
|
||||
let snap = |coordinate: f32| (coordinate * scale).round() / scale;
|
||||
|
||||
image_position[0] = snap(image_position[0]);
|
||||
image_position[1] = snap(image_position[1]);
|
||||
image_size[0] = snap(image_size[0]);
|
||||
image_size[1] = snap(image_size[1]);
|
||||
|
||||
let center = [
|
||||
image_position[0] + image_size[0] / 2.0,
|
||||
image_position[1] + image_size[1] / 2.0,
|
||||
|
|
@ -549,6 +545,7 @@ fn add_instances(
|
|||
image_size,
|
||||
rotation,
|
||||
opacity,
|
||||
snap,
|
||||
allocation,
|
||||
instances,
|
||||
);
|
||||
|
|
@ -578,8 +575,8 @@ fn add_instances(
|
|||
];
|
||||
|
||||
add_instance(
|
||||
position, center, size, rotation, opacity, allocation,
|
||||
instances,
|
||||
position, center, size, rotation, opacity, snap,
|
||||
allocation, instances,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -593,6 +590,7 @@ fn add_instance(
|
|||
size: [f32; 2],
|
||||
rotation: f32,
|
||||
opacity: f32,
|
||||
snap: bool,
|
||||
allocation: &atlas::Allocation,
|
||||
instances: &mut Vec<Instance>,
|
||||
) {
|
||||
|
|
@ -615,6 +613,7 @@ fn add_instance(
|
|||
(height as f32 - 1.0) / atlas::SIZE as f32,
|
||||
],
|
||||
_layer: layer as u32,
|
||||
_snap: snap as u32,
|
||||
};
|
||||
|
||||
instances.push(instance);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue