michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 1px of texture border around non-repeating image patterns. 

Closes #401.
This commit is contained in:
Patrick Walton 2020-07-27 13:44:59 -07:00
parent a05270f0a7
commit 444cae2b72
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
renderer/src/paint.rs
View File

@ -344,6 +344,10 @@ pub(crate) struct PaintColorTextureMetadata {
pub(crate) filter: PaintFilter, pub(crate) filter: PaintFilter,
/// How the color texture is to be composited over the base color. /// How the color texture is to be composited over the base color.
pub(crate) composite_op: PaintCompositeOp, pub(crate) composite_op: PaintCompositeOp,
/// How much of a border there needs to be around the image.
///
/// The border ensures clamp-to-edge yields the right result.
pub(crate) border: Vector2I,
} }
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
@ -488,9 +492,13 @@ impl Palette {
}, },
transform: Transform2F::default(), transform: Transform2F::default(),
composite_op: overlay.composite_op(), composite_op: overlay.composite_op(),
border: Vector2I::zero(),
}) })
} }
PaintContents::Pattern(ref pattern) => { PaintContents::Pattern(ref pattern) => {
let border = vec2i(if pattern.repeat_x() { 0 } else { 1 },
if pattern.repeat_y() { 0 } else { 1 });
let location; let location;
match *pattern.source() { match *pattern.source() {
PatternSource::RenderTarget { id: render_target_id, .. } => { PatternSource::RenderTarget { id: render_target_id, .. } => {
@ -501,24 +509,26 @@ impl Palette {
// TODO(pcwalton): We should be able to use tile cleverness to // TODO(pcwalton): We should be able to use tile cleverness to
// repeat inside the atlas in some cases. // repeat inside the atlas in some cases.
let image_hash = image.get_hash(); let image_hash = image.get_hash();
//println!("image hash: {:?}", image_hash);
match texture_manager.cached_images.get(&image_hash) { match texture_manager.cached_images.get(&image_hash) {
Some(cached_location) => { Some(cached_location) => {
//println!("... cache hit: {:?}", cached_location);
location = *cached_location; location = *cached_location;
used_image_hashes.insert(image_hash); used_image_hashes.insert(image_hash);
} }
None => { None => {
//println!("... cache MISS"); // Leave a pixel of border on the side.
let allocation_mode = AllocationMode::OwnPage; let allocation_mode = AllocationMode::OwnPage;
location = allocator.allocate(image.size(), location = allocator.allocate(
image.size() + border * 2,
allocation_mode); allocation_mode);
texture_manager.cached_images.insert(image_hash, texture_manager.cached_images.insert(image_hash,
location); location);
} }
} }
image_texel_info.push(ImageTexelInfo { image_texel_info.push(ImageTexelInfo {
location, location: TextureLocation {
page: location.page,
rect: location.rect.contract(border),
},
texels: (*image.pixels()).clone(), texels: (*image.pixels()).clone(),
}); });
} }
@ -546,8 +556,9 @@ impl Palette {
page_scale: allocator.page_scale(location.page), page_scale: allocator.page_scale(location.page),
sampling_flags, sampling_flags,
filter, filter,
transform: Transform2F::default(), transform: Transform2F::from_translation(border.to_f32()),
composite_op: overlay.composite_op(), composite_op: overlay.composite_op(),
border,
}) })
} }
} }