forked from 1b-agent/opencadstudio-upstream
feat(polyline): smooth per-segment taper for varying-width wide polylines
A wide polyline with per-vertex varying widths rendered at its widest edge (uniform-width ones were already exact). Draw the true taper instead. `WireModel.taper_widths` carries a per-point full band width. The wire instance (native slim + web fat) gains per-endpoint `world_hw_a/b`, and both wire shaders interpolate `mix(hw_a, hw_b, which_end)` so each segment's band narrows/widens linearly — depth-tested, and the linetype dash still applies. Alignment (widths must match the tessellated points) is solved by building both together: a new `TruckObject::TaperedLines(points, widths)`, filled by `common::tapered_band_points` (straight = endpoints, arc = 16 samples with the width lerped along it). to_truck routes a varying-width polyline here — LwPolyline before the PLINEGEN split, Polyline2D at its return — while a uniform-width one keeps the constant-band Contour path unchanged. `world_width` stays the widest edge as the PDF-stroke + zoom-floor fallback. Blocks fall back to the constant-widest band (`LocalWire` carries no taper_widths). Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
a8aece1909
commit
b3016ca892
48 files changed
+322
-7
No files matched your search
@@ -60,6 +60,11 @@ pub struct WireModel {
|
||||
/// units (scaling with zoom) so the band IS the wire — the linetype dash
|
||||
/// pattern then applies to the band instead of a separate hatch fill.
|
||||
pub world_width: f32,
|
||||
/// Per-point full band width (drawing units), aligned index-for-index with
|
||||
/// [`points`], for a polyline whose width VARIES (a taper). Empty = a
|
||||
/// constant band of `world_width`. The wire shader reads the two endpoint
|
||||
/// widths of each segment and interpolates, so the band tapers smoothly.
|
||||
pub taper_widths: Vec<f32>,
|
||||
/// ACI color index (1-255). 0 means true-color or unknown (no CTB lookup).
|
||||
pub aci: u8,
|
||||
/// Pre-baked snap candidates (Center, Node, Quadrant, Insertion).
|
||||
@@ -179,6 +184,7 @@ impl WireModel {
|
||||
/// Create a solid wire (no dash pattern, 1px weight).
|
||||
pub fn solid(name: String, points: Vec<[f32; 3]>, color: [f32; 4], selected: bool) -> Self {
|
||||
Self {
|
||||
taper_widths: Vec::new(),
|
||||
world_width: 0.0,
|
||||
fill_is_3d: false,
|
||||
pick_tris: Vec::new(),
|
||||
@@ -402,6 +408,7 @@ impl Default for WireModel {
|
||||
pattern: [0.0; 8],
|
||||
line_weight_px: 1.0,
|
||||
world_width: 0.0,
|
||||
taper_widths: Vec::new(),
|
||||
aci: 0,
|
||||
snap_pts: Vec::new(),
|
||||
tangent_geoms: Vec::new(),
|
||||
|
||||
Reference in new issue
Block a user