mirror of
https://github.com/storytold/cadcraft.git
synced 2026-10-25 03:16:50 -06:00
Valentin KleinandClaude Opus 5.5
7336a3f597
A wipeout was drawn only as its outline, so objects behind it stayed visible on the canvas and in PNG, SVG and PDF output. The display list gets a new primitive kind, Kind::Mask: the wipeout polygon as triangles that every backend fills with its background colour (paper white for SVG/PDF and plots, the raster background for PNG, the canvas colour or the white sheet on screen), in draw order, so it hides what came before it (DRAWORDER decides). The frame follows WIPEOUTFRAME: 0 none, 1 shown and plotted (default), 2 shown but not plotted. The GPU canvas drew all fills before all lines; it now splits the mesh into draw-order groups at each mask (MeshData::breaks) and draws each group's fills, lines and quads in turn. Infinite lines stay on top as before. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
77 lines
3.3 KiB
Rust
77 lines
3.3 KiB
Rust
//! Wipeouts hide what is drawn before them and show their frame per WIPEOUTFRAME (issue #291).
|
|
|
|
use cadcraft_color::Rgb;
|
|
use cadcraft_doc::{Common, Drawing, EntityKind, Line, Space, Wipeout};
|
|
use cadcraft_geom::{Vec2, Vec3};
|
|
use cadcraft_render::raster::{RasterOptions, View, render};
|
|
use cadcraft_render::{DisplayList, Kind, Options, build, build_plot};
|
|
|
|
fn line() -> EntityKind {
|
|
EntityKind::Line(Line { a: Vec3::new(0.0, 0.0, 0.0), b: Vec3::new(10.0, 10.0, 0.0) })
|
|
}
|
|
|
|
fn wipeout() -> EntityKind {
|
|
let b = [(2.0, 2.0), (8.0, 2.0), (8.0, 8.0), (2.0, 8.0)];
|
|
EntityKind::Wipeout(Wipeout { boundary: b.iter().map(|&(x, y)| Vec2::new(x, y)).collect() })
|
|
}
|
|
|
|
/// A diagonal line and a square wipeout over its middle, in the given draw order.
|
|
fn drawing(line_on_top: bool) -> Drawing {
|
|
let mut d = Drawing::new_imperial();
|
|
let order = if line_on_top { [wipeout(), line()] } else { [line(), wipeout()] };
|
|
for k in order {
|
|
d.add(&Space::Model, Common::default(), k).unwrap();
|
|
}
|
|
d
|
|
}
|
|
|
|
/// Dark (drawn) pixels inside and outside the wipeout, on white paper (colour 7 prints black).
|
|
fn dark_pixels(list: &DisplayList) -> (usize, usize) {
|
|
let view = View { center: Vec2::new(5.0, 5.0), scale: 10.0, width: 120, height: 120 };
|
|
let o = RasterOptions { background: Rgb(255, 255, 255), antialias: false, ..Default::default() };
|
|
let pm = render(list, &view, &o).unwrap();
|
|
let (mut inside, mut outside) = (0, 0);
|
|
for y in 0..120u32 {
|
|
for x in 0..120u32 {
|
|
let c = pm.pixel(x, y).unwrap();
|
|
if c.red() > 128 {
|
|
continue;
|
|
}
|
|
// Screen (60, 60) is world (5, 5); 10 px per unit. Inside = clear of the frame.
|
|
let (wx, wy) = (5.0 + (f64::from(x) + 0.5 - 60.0) / 10.0, 5.0 - (f64::from(y) + 0.5 - 60.0) / 10.0);
|
|
if (2.5..7.5).contains(&wx) && (2.5..7.5).contains(&wy) {
|
|
inside += 1;
|
|
} else {
|
|
outside += 1;
|
|
}
|
|
}
|
|
}
|
|
(inside, outside)
|
|
}
|
|
|
|
#[test]
|
|
fn wipeout_hides_what_is_drawn_before_it() {
|
|
let (inside, outside) = dark_pixels(&build(&drawing(false), &Space::Model, &Options::default()));
|
|
assert_eq!(inside, 0, "the line is hidden under the wipeout");
|
|
assert!(outside > 0, "the line shows outside it");
|
|
// Brought to front (drawn after the wipeout), the line shows on top.
|
|
let (inside, _) = dark_pixels(&build(&drawing(true), &Space::Model, &Options::default()));
|
|
assert!(inside > 0);
|
|
}
|
|
|
|
#[test]
|
|
fn wipeoutframe_controls_the_frame() {
|
|
// Polylines in the list: the line, plus the frame when it is drawn.
|
|
let polylines = |d: &Drawing, plot: bool| {
|
|
let l = if plot { build_plot(d, &Space::Model, &Options::default()) } else { build(d, &Space::Model, &Options::default()) };
|
|
assert_eq!(l.prims.iter().filter(|p| p.kind == Kind::Mask).count(), 1);
|
|
l.prims.iter().filter(|p| p.kind == Kind::Polyline).count()
|
|
};
|
|
let mut d = drawing(false);
|
|
assert_eq!((polylines(&d, false), polylines(&d, true)), (2, 2), "default 1: shown and plotted");
|
|
d.header.set_i64("WIPEOUTFRAME", 0);
|
|
assert_eq!((polylines(&d, false), polylines(&d, true)), (1, 1), "0: no frame");
|
|
d.header.set_i64("WIPEOUTFRAME", 2);
|
|
assert_eq!((polylines(&d, false), polylines(&d, true)), (2, 1), "2: shown, not plotted");
|
|
}
|