mirror of
https://github.com/storytold/figcraft.git
synced 2026-11-19 00:27:49 +00:00
Presenter: the hidpi detail replaces the whole-frame texture instead of drawing over it (#2127)
Both textures start from a transparent pixmap, so a translucent layer was counted twice where the detail covered it. The whole-frame texture is now drawn only around the detail rect (up to four clipped strips), then the detail. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Model-Effort: Opus 5.5 drove; Opus 5.5 briefed; Sonnet 5.5 wrote at medium
This commit is contained in:
1 parent
5b18f5fab4
commit
0859f94c7d
2 files changed
+88
-5
No files matched your search
@@ -75,17 +75,24 @@ pub(super) fn draw(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Conte
|
||||
}
|
||||
if !drawn && let Some(to) = &to_tex {
|
||||
let on_clip = painter.with_clip_rect(l.clip);
|
||||
on_clip.image(to.tex.id(), l.place.rect(to.bounds), uv, Color32::WHITE);
|
||||
// A frame too big for one texture at device scale is drawn from a smaller one: the part in
|
||||
// view is drawn again from a texture at device scale, over it (and the overlays over that).
|
||||
// view is drawn from a texture at device scale instead. The detail REPLACES that part of the
|
||||
// whole-frame texture (the base is drawn only around it): both start from a transparent
|
||||
// pixmap, so drawn over it a translucent layer would count twice.
|
||||
let shown = l.clip.intersect(l.place.rect(to.bounds));
|
||||
let mut detail = None;
|
||||
if shown.is_positive() {
|
||||
let (a, b) = (l.place.page(shown.min), l.place.page(shown.max));
|
||||
let visible = figcraft_geom::Rect::new(a.x, a.y, b.x, b.y);
|
||||
let moving = p.fling.is_some() || p.drag_scroll.is_some() || p.wheel.is_some();
|
||||
if let Some(d) = p.detail_texture(ctx, &l.disp, p.current, px, to.bounds, visible, moving, now) {
|
||||
on_clip.image(d.tex.id(), l.place.rect(d.bounds), uv, Color32::WHITE);
|
||||
}
|
||||
detail = p.detail_texture(ctx, &l.disp, p.current, px, to.bounds, visible, moving, now);
|
||||
}
|
||||
let hole = detail.as_ref().map(|d| l.clip.intersect(l.place.rect(d.bounds)));
|
||||
for part in base_parts(l.clip, hole) {
|
||||
painter.with_clip_rect(part).image(to.tex.id(), l.place.rect(to.bounds), uv, Color32::WHITE);
|
||||
}
|
||||
if let Some(d) = detail {
|
||||
on_clip.image(d.tex.id(), l.place.rect(d.bounds), uv, Color32::WHITE);
|
||||
}
|
||||
}
|
||||
// Overlays (each with its background and opening transition); closing ones run it backwards.
|
||||
@@ -133,3 +140,23 @@ pub(super) fn draw(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Conte
|
||||
ctx.request_repaint();
|
||||
}
|
||||
}
|
||||
|
||||
/// The parts of `clip` outside `hole` (up to four disjoint rectangles; `clip` itself with no hole).
|
||||
pub(super) fn base_parts(clip: Rect, hole: Option<Rect>) -> Vec<Rect> {
|
||||
let Some(h) = hole.filter(|h| h.is_positive()) else {
|
||||
return vec![clip];
|
||||
};
|
||||
let h = h.intersect(clip);
|
||||
if !h.is_positive() {
|
||||
return vec![clip];
|
||||
}
|
||||
[
|
||||
Rect::from_min_max(clip.min, egui::pos2(clip.max.x, h.min.y)),
|
||||
Rect::from_min_max(egui::pos2(clip.min.x, h.max.y), clip.max),
|
||||
Rect::from_min_max(egui::pos2(clip.min.x, h.min.y), egui::pos2(h.min.x, h.max.y)),
|
||||
Rect::from_min_max(egui::pos2(h.max.x, h.min.y), egui::pos2(clip.max.x, h.max.y)),
|
||||
]
|
||||
.into_iter()
|
||||
.filter(|r| r.is_positive())
|
||||
.collect()
|
||||
}
|
||||
@@ -536,3 +536,59 @@ fn detail_plan_edge_cases() {
|
||||
let view = R::new(0.0, 0.0, 1440.0, 860.0);
|
||||
assert_eq!(actions::detail_plan(bounds, view, 2.0, 2048.0), Some(view));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_detail_replaces_the_whole_frame_texture_instead_of_drawing_over_it() {
|
||||
// A frame with no fill holding a 50% rectangle: both textures start from a transparent pixmap,
|
||||
// so drawn over each other the rectangle would count twice (75%, not 50%).
|
||||
let mut session = figcraft_engine::Session::new();
|
||||
let frame = id(&session.execute("node.create", &json!({"type": "frame", "width": 1440, "height": 9701, "props": {"fills": []}})).unwrap());
|
||||
let r =
|
||||
id(&session.execute("node.create", &json!({"type": "rectangle", "parent": frame, "x": 0, "y": 0, "width": 1440, "height": 9701})).unwrap());
|
||||
session.execute("node.set", &json!({"id": r, "props": {"fill": "#ff0000", "opacity": 0.5}})).unwrap();
|
||||
let mut ui = Ui::new(session);
|
||||
ui.hidpi = Some((2.0, 16_384));
|
||||
ui.run("proto.present", json!({"start": frame}));
|
||||
ui.app.ui.present.as_mut().unwrap().view.scale = PresentScale::FitWidth;
|
||||
ui.frames(2, Vec::new);
|
||||
|
||||
// The pixel's alpha is the rectangle's 0.5 in the whole-frame render and in the detail render.
|
||||
let doc = ui.app.session.doc().unwrap();
|
||||
let alpha = |pix: &figcraft_render::Pixmap| pix.data()[3];
|
||||
let whole = figcraft_render::render_node_at(doc, frame, 0.5, 0.0).unwrap();
|
||||
let detail = figcraft_render::render_area_at(doc, &[frame], figcraft_geom::Rect::new(0.0, 0.0, 100.0, 100.0), 2.0, 0.0).unwrap();
|
||||
assert!((i32::from(alpha(&whole)) - 128).abs() <= 1 && (i32::from(alpha(&detail)) - 128).abs() <= 1);
|
||||
|
||||
// On screen, no whole-frame texture is drawn under the detail: one texture covers its centre.
|
||||
let out = ui.frame_output(Vec::new());
|
||||
let prims = ui.ctx.tessellate(out.shapes, 2.0);
|
||||
let names: std::collections::HashMap<egui::TextureId, String> =
|
||||
ui.ctx.tex_manager().read().allocated().map(|(id, m)| (*id, m.name.clone())).collect();
|
||||
let mut present: Vec<(String, egui::Rect, egui::Rect)> = Vec::new();
|
||||
for prim in &prims {
|
||||
if let egui::epaint::Primitive::Mesh(m) = &prim.primitive
|
||||
&& let Some(n) = names.get(&m.texture_id).filter(|n| n.starts_with("present-"))
|
||||
{
|
||||
let bbox = m.vertices.iter().fold(egui::Rect::NOTHING, |r, v| r.union(egui::Rect::from_min_max(v.pos, v.pos)));
|
||||
present.push((n.clone(), bbox, prim.clip_rect));
|
||||
}
|
||||
}
|
||||
let (_, dbox, dclip) = present.iter().find(|(n, ..)| n.starts_with("present-detail-")).expect("the detail is drawn");
|
||||
let centre = dbox.intersect(*dclip).center();
|
||||
let covering: Vec<_> = present.iter().filter(|(_, b, c)| b.contains(centre) && c.contains(centre)).map(|(n, ..)| n.as_str()).collect();
|
||||
assert_eq!(covering.len(), 1, "only the detail covers the view's centre:: {covering:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn base_parts_leave_the_hole_out() {
|
||||
use egui::{Rect, pos2};
|
||||
let clip = Rect::from_min_max(pos2(0.0, 0.0), pos2(100.0, 100.0));
|
||||
assert_eq!(draw::base_parts(clip, None), vec![clip]);
|
||||
let hole = Rect::from_min_max(pos2(10.0, 20.0), pos2(60.0, 70.0));
|
||||
let parts = draw::base_parts(clip, Some(hole));
|
||||
assert_eq!(parts.len(), 4);
|
||||
let area: f32 = parts.iter().map(|r| r.width() * r.height()).sum();
|
||||
assert_eq!(area, 100.0 * 100.0 - 50.0 * 50.0);
|
||||
assert!(parts.iter().all(|r| !r.intersects(hole.shrink(0.01))));
|
||||
assert!(draw::base_parts(clip, Some(clip)).is_empty());
|
||||
}
|
||||
Reference in new issue
Block a user