diff --git a/crates/effects/src/solids/tests_map_art.rs b/crates/effects/src/solids/tests_map_art.rs index 0bbe54a5b1..c359c44f8b 100644 --- a/crates/effects/src/solids/tests_map_art.rs +++ b/crates/effects/src/solids/tests_map_art.rs @@ -153,6 +153,25 @@ fn a_map_on_a_side_wall_reads_the_right_way_round_from_outside() { } } +#[test] +fn a_wall_beside_a_bevel_is_laid_out_at_its_own_length() { + let d = document(); + // A bevel 10 wide added around the square sets each wall 10 out, so each wall is 120 long; a + // bevel takes the length of the wall it sits above. Carved in, the walls are the square's own. + for (inside, length) in [(false, 120.0), (true, 100.0)] { + let solid = object(CLASSIC_EXTRUDE, json!({"bevel": "classic", "bevelHeight": 10, "bevelInside": inside})); + for side in surfaces(&solid).iter().skip(2) { + assert!((side.width - length).abs() < 1e-6, "inside {inside}: {side:?}"); + } + // Seen from one side, the art on the wall that faces the viewer keeps its size. + let walls: Vec = (3..=6).map(|k| json!({"surface": k, "symbol": "Corner"})).collect(); + let n = object(CLASSIC_EXTRUDE, json!({"bevel": "classic", "bevelHeight": 10, "bevelInside": inside, "rotationY": 90, "mapArt": walls})); + let art = solid_art_in(Some(&d), &n).unwrap(); + let whole = bounds_of(&[filled(&art, RED), filled(&art, BLUE), filled(&art, GREEN)].concat()); + assert!((whole.width() - 30.0).abs() < 1e-6 && (whole.height() - 30.0).abs() < 1e-6, "inside {inside}: {whole:?}"); + } +} + #[test] fn a_map_on_the_back_cap_reads_the_right_way_round_from_behind() { let d = document(); diff --git a/crates/three-d/src/solid/build.rs b/crates/three-d/src/solid/build.rs index 97a565e5cf..b6e7002bca 100644 --- a/crates/three-d/src/solid/build.rs +++ b/crates/three-d/src/solid/build.rs @@ -533,6 +533,16 @@ struct Step { face: f64, } +/// How far the walls are inset (negative: outset). With the bevel inside, the cap is inset by its +/// width and the wall is the outline; outside, the cap is the outline and the wall is outset by +/// the width. +fn wall_inset(o: &Extrude) -> f64 { + match o.bevel.filter(|b| b.width > 0.0 || b.height > 0.0) { + Some(b) if !b.inside => -b.width, + _ => 0.0, + } +} + /// The outline's steps from the front cap's edge to the back cap's edge. fn steps(o: &Extrude) -> Vec { let d = o.depth.max(1e-6); @@ -562,12 +572,7 @@ fn steps(o: &Extrude) -> Vec { } pts }; - // With the bevel inside, the cap is inset by its width and the wall is the outline; outside, - // the cap is the outline and the wall is outset by the width. - let wall = match bevel { - Some(b) if !b.inside => -b.width, - _ => 0.0, - }; + let wall = wall_inset(o); // A twist turns a bevel's steps too: each step between two samples is cut into steps that // turn no further than 6°, as the walls' slices do at most. let refine = |pts: Vec<(f64, f64)>| -> Vec<(f64, f64)> { @@ -694,7 +699,7 @@ pub(crate) fn extrude_faces(path: &PathData, rule: FillRule, bounds: Rect, optio .collect(); let mut budget = Budget::default(); // The numbered surfaces of the sides, for a solid whose walls stay flat. - let layout = (o.map_surfaces && o.twist == 0.0 && o.taper == 1.0).then(|| (sides(&traced), band_spans(&steps, o.depth))); + let layout = (o.map_surfaces && o.twist == 0.0 && o.taper == 1.0).then(|| (sides(&traced, wall_inset(&o)), band_spans(&steps, o.depth))); for (r, ((ring, traced), pieces)) in rings.iter().zip(&traced).zip(&pieces).enumerate() { let placed: Vec> = steps.iter().map(|s| ring_at(ring, s)).collect(); for (k, pair) in placed.windows(2).enumerate() { @@ -750,17 +755,22 @@ const CORNER: f64 = 20.0; /// no corner is one surface from its first point. The edges of one curve of the outline are never /// parted. An edge of no length belongs to no surface. An edge starts farther along its surface /// than it ends: the surface is measured from its left edge as it is seen from outside the solid. +/// Lengths are measured on the ring moved to the walls' inset `wall`, so a wall set out by a bevel +/// is laid out at its own length, and a bevel band at the length of the wall below it. struct Sides { edges: Vec>>, lengths: Vec, } -fn sides(rings: &[Ring]) -> Sides { +fn sides(rings: &[Ring], wall: f64) -> Sides { let mut out = Sides { edges: vec![], lengths: vec![] }; for ring in rings { let n = ring.points.len(); let point = |i: usize| ring.points.get(i % n.max(1)).copied().unwrap_or_default(); - let length = |i: usize| point(i).distance(point(i + 1)); + let at_wall = inset(&ring.points, wall); + let wall_point = |i: usize| at_wall.get(i % n.max(1)).copied().unwrap_or_default(); + // An edge of the outline with no length (a corner cut square) stays off every surface. + let length = |i: usize| if point(i).distance(point(i + 1)) > 1e-9 { wall_point(i).distance(wall_point(i + 1)) } else { 0.0 }; let direction = |i: usize| { let d = point(i + 1) - point(i); let l = d.hypot(); @@ -858,7 +868,7 @@ pub fn extrude_surfaces(path: &PathData, rule: FillRule, bounds: Rect, options: if o.twist != 0.0 || o.taper != 1.0 { return Ok(out); } - let sides = sides(&traced); + let sides = sides(&traced, wall_inset(&o)); let spans = band_spans(&steps, o.depth); let across = |bevel: bool| spans.iter().flatten().filter(|s| s.0 == bevel).map(|s| s.2).fold(0.0, f64::max); let kinds = [(SurfaceKind::Wall, false)].into_iter().chain(spans.iter().flatten().any(|s| s.0).then_some((SurfaceKind::Bevel, true))); diff --git a/docs/mcp.md b/docs/mcp.md index 802ac28b46..f09dad4165 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -4688,7 +4688,8 @@ Rotate (Classic) and the other 3D effects take no map. - `surface` is a whole number from 1 to the object's surface count. Extrude & Bevel (Classic) numbers the surfaces through the object's solids in the order they are built: each solid's front cap and back cap, then each side wall from corner to corner of the outline, then the bevel above each wall. A hollow solid (`cap` false) has no caps, so - its numbering starts at its first side wall. Revolve (Classic) has one surface, its swept + its numbering starts at its first side wall. A side wall is laid out at its own length, and a bevel at the length of + the wall below it. Revolve (Classic) has one surface, its swept side; on a group it is the side of the member with the longest profile, and the other members take no map. The numbering is VectorCraft's own. - `symbol` names the symbol mapped onto the surface, and `null` removes the surface's map, also a map kept past the diff --git a/docs/three-d.md b/docs/three-d.md index e90f209ee5..07c02070dd 100644 --- a/docs/three-d.md +++ b/docs/three-d.md @@ -567,7 +567,9 @@ Rotate (Classic) and the other 3D effects take no map. The command is `threeD.ma Extrude & Bevel (Classic) numbers its surfaces through the object's solids in the order they are built (the top fill's solid, then each stroke's): each solid's front cap and back cap, then each side wall from corner to corner of the outline, then the bevel above each wall. An extruded square has six surfaces. A hollow solid has no caps to number. -Revolve (Classic) has one surface, its swept side, unrolled around the axis as Revolve's graphics are; on a group it is +A side wall is laid out at its own length, which a bevel added around the shape makes longer than the outline. A bevel +is laid out at the length of the wall below it, so mapped art on a bevel is stretched or squeezed along its edge +nearer the cap. Revolve (Classic) has one surface, its swept side, unrolled around the axis as Revolve's graphics are; on a group it is the side of the member with the longest profile, and Invisible Geometry leaves out every member's faces. The numbering is VectorCraft's own.