fix: stroke arcs and splines analytically — opaque core, angle-independent weight

LICE_Arc never reaches opacity and ThickFLine's width is minor-axis. One
distance-to-polyline coverage mask, blended once, replaces both.
This commit is contained in:
2026-08-01 13:18:21 -04:00
parent ae9019465e
commit 2e09776342
16 changed files with 1001 additions and 72 deletions
+23 -6
View File
@@ -25,18 +25,30 @@ double valuePerPixel(const VelocityCurve::Box& box, CurveDomain d) {
if (h <= 1) return 0.0;
return (kCurveYMax - curveYMin(d)) / static_cast<double>(h - 1);
}
int velToX(const VelocityCurve::Box& box, double velocity) {
// The integer maps are these rounded — ONE mapping, so a sub-pixel trace and an integer hit-test
// cannot drift. Rounding the OFFSET (not the absolute coordinate) keeps the int results identical
// to what they were before the sub-pixel form existed: the offset is non-negative, so truncation
// is floor regardless of where the box sits.
double velToXf(const VelocityCurve::Box& box, double velocity) {
const int w = std::max(0, box.width);
if (w <= 0) return box.left;
if (w <= 0) return static_cast<double>(box.left);
const double frac = (clampVelocity(velocity) - kVelMin) / (kVelMax - kVelMin);
return box.left + static_cast<int>(frac * static_cast<double>(w) + 0.5);
return static_cast<double>(box.left) + frac * static_cast<double>(w);
}
int valueToY(const VelocityCurve::Box& box, double value, CurveDomain d) {
double valueToYf(const VelocityCurve::Box& box, double value, CurveDomain d) {
const int h = std::max(0, box.height);
if (h <= 1) return box.top;
if (h <= 1) return static_cast<double>(box.top);
const double lo = curveYMin(d);
const double frac = (clampValue(value, d) - lo) / (kCurveYMax - lo);
return box.top + static_cast<int>((1.0 - frac) * static_cast<double>(h - 1) + 0.5);
return static_cast<double>(box.top) + (1.0 - frac) * static_cast<double>(h - 1);
}
int velToX(const VelocityCurve::Box& box, double velocity) {
return box.left +
static_cast<int>(velToXf(box, velocity) - static_cast<double>(box.left) + 0.5);
}
int valueToY(const VelocityCurve::Box& box, double value, CurveDomain d) {
return box.top +
static_cast<int>(valueToYf(box, value, d) - static_cast<double>(box.top) + 0.5);
}
} // namespace
@@ -187,6 +199,11 @@ VelocityCurve::CurvePixel VelocityCurve::pixelFromPoint(const Box& box,
return CurvePixel{velToX(box, p.velocity), valueToY(box, p.value, domain_)};
}
VelocityCurve::CurvePixelF VelocityCurve::subpixelFromPoint(const Box& box,
const VelocityPoint& p) const {
return CurvePixelF{velToXf(box, p.velocity), valueToYf(box, p.value, domain_)};
}
VelocityPoint VelocityCurve::pointFromPixel(const Box& box, int x, int y) const {
// Exact inverse of velToX/valueToY (within one pixel); degenerate dims collapse the same way.
VelocityPoint p;
@@ -182,6 +182,16 @@ public:
};
CurvePixel pixelFromPoint(const Box& box, const VelocityPoint& p) const;
// The SAME mapping before rounding: pixelFromPoint IS this, rounded, so a sub-pixel trace and
// an integer hit-test cannot drift. An antialiased stroke needs the fraction — quantizing y to
// a whole pixel forces the slope into alternating 1/2-px steps, and that beat-frequency
// staircase is what read as a dotted line where a contour steepened.
struct CurvePixelF {
double x = 0.0;
double y = 0.0;
};
CurvePixelF subpixelFromPoint(const Box& box, const VelocityPoint& p) const;
// Exact inverse of pixelFromPoint (within the one-pixel quantum) — where an empty-space
// click lands as a new point. Degenerate box: zero-width reads velocity 0; height <= 1
// reads the domain's max (the top row is what a collapsed box draws).
+15
View File
@@ -101,6 +101,7 @@ L7 sub-pass, 2026-07-27):
- `tooltip` — pure tooltip placement + prefix-strip: strips the `ReaSampler:` display prefix from the registered action phrase; width clamped to the client rect.
- `card_drag` — pure drag-gesture precedence + slot hit-test: leave-client → OS drag-out; other-bank → move/copy; same-bank → reorder / Alt-over-occupied → replace.
- `card_meta` — pure card-metadata formatters: bars.beats.subdivisions and seconds.milliseconds; blank when the sample is unstamped.
- `stroke_aa` — analytic antialiased thick-stroke COVERAGE (the shell blends it): `StrokeCanvas`, a reusable mask holding distance-to-polyline coverage MAX-accumulated across segments, plus `strokePolyline` / `strokeBounds` / `appendArc`. An arc is just a flattened polyline, so ONE path serves the knob arcs, the inner dial, the envelope polyline and both spline traces. Coverage is `clamp(halfWidth + 0.5 - distance, 0, 1)`, which makes perpendicular weight exactly `2·halfWidth` at every angle and gives an opaque core for any width above 1 px. Long segments are subdivided before rasterizing — EXACT, not an approximation (min-distance to a partition of a segment is min-distance to the whole), purely to keep each piece's bounding box tight, since one long diagonal's box has area O(len²).
## Gotchas
@@ -122,3 +123,17 @@ L7 sub-pass, 2026-07-27):
- `rect`'s prior role names survive only as `using` aliases at their old call
sites — changing `rect.h` itself ripples across every directory that aliases
it (e.g. `editor_geometry::Rect`); check all alias sites, not just this one.
- **`stroke_aa`'s mask is deliberately NOT cleared on `reset`.** Only
`[rowLo, rowHi)` of each row holds meaningful coverage; everything else is
whatever the reused buffer last held. That is what keeps a stroke's cost
proportional to its ink rather than to its bounding box — but it means any new
reader must respect the row extents, and any new writer must grow them through
`extendRow`, which zero-fills the newly-valid cells INCLUDING the gap when a
stroke revisits a row far from where it left it (a circle touches most rows on
both sides). Reading the raw buffer outside the extents returns garbage by
design, not zero.
- **Neither `LICE_Arc` nor `LICE_ThickFLine` can draw these strokes** — the first
never reaches an opaque core, the second's width is along the minor axis so its
perpendicular weight falls off as `cos θ`. The evidence and the measurements
live in `docs/product/visual-design-language.md` §8; do not "simplify" a stroke
site back onto either primitive.
+3
View File
@@ -38,3 +38,6 @@ reasampler_test(card_meta LINK card_meta)
reasampler_pure_library(card_drag SOURCES card_drag.cpp LINK PUBLIC drag_out bank_grid)
reasampler_test(card_drag LINK card_drag)
reasampler_pure_library(stroke_aa SOURCES stroke_aa.cpp)
reasampler_test(stroke_aa LINK stroke_aa)
+178
View File
@@ -0,0 +1,178 @@
#include "core/ui/stroke_aa.h"
#include <algorithm>
#include <cmath>
namespace reasampler::ui {
namespace {
inline float clamp01(float v) { return v < 0.0f ? 0.0f : (v > 1.0f ? 1.0f : v); }
} // namespace
void StrokeCanvas::reset(const Rect& bounds) {
bounds_ = bounds;
if (bounds_.empty()) {
bounds_ = Rect{};
return;
}
const std::size_t area =
static_cast<std::size_t>(bounds_.width) * static_cast<std::size_t>(bounds_.height);
if (coverage_.size() < area) coverage_.resize(area);
rowLo_.assign(static_cast<std::size_t>(bounds_.height), bounds_.width);
rowHi_.assign(static_cast<std::size_t>(bounds_.height), 0);
}
float StrokeCanvas::coverageAt(int x, int y) const {
if (!contains(bounds_, x, y)) return 0.0f;
const int rel = x - bounds_.x;
if (rel < rowLo(y) || rel >= rowHi(y)) return 0.0f;
return rowData(y)[rel];
}
// Grows a row's valid span to cover [x0, x1) (canvas-relative), zero-filling only the cells that
// become valid. Cost is bounded by the growth, so a whole stroke stays O(ink).
void StrokeCanvas::extendRow(int y, int x0, int x1) {
const std::size_t r = static_cast<std::size_t>(y - bounds_.y);
float* row = coverage_.data() + r * static_cast<std::size_t>(bounds_.width);
int lo = rowLo_[r];
int hi = rowHi_[r];
if (hi <= lo) {
std::fill(row + x0, row + x1, 0.0f);
rowLo_[r] = x0;
rowHi_[r] = x1;
return;
}
// A stroke can revisit a row far from where it left it (an arc touches most rows on both
// sides of the circle), so the gap between the old span and the new one must be zeroed too.
if (x0 < lo) {
std::fill(row + x0, row + lo, 0.0f);
rowLo_[r] = x0;
}
if (x1 > hi) {
std::fill(row + hi, row + x1, 0.0f);
rowHi_[r] = x1;
}
}
void StrokeCanvas::addPiece(float ax, float ay, float bx, float by, float halfWidth) {
const float reach = halfWidth + 0.5f; // beyond this the coverage is 0
const float dx = bx - ax;
const float dy = by - ay;
const float len2 = dx * dx + dy * dy;
const float invLen2 = len2 > 0.0f ? 1.0f / len2 : 0.0f;
int x0 = static_cast<int>(std::floor((std::min)(ax, bx) - reach));
int x1 = static_cast<int>(std::ceil((std::max)(ax, bx) + reach)) + 1;
int y0 = static_cast<int>(std::floor((std::min)(ay, by) - reach));
int y1 = static_cast<int>(std::ceil((std::max)(ay, by) + reach)) + 1;
x0 = (std::max)(x0, bounds_.x);
y0 = (std::max)(y0, bounds_.y);
x1 = (std::min)(x1, bounds_.right());
y1 = (std::min)(y1, bounds_.bottom());
if (x0 >= x1 || y0 >= y1) return;
const int relX0 = x0 - bounds_.x;
const int relX1 = x1 - bounds_.x;
for (int y = y0; y < y1; ++y) {
extendRow(y, relX0, relX1);
float* row = coverage_.data() + static_cast<std::size_t>(y - bounds_.y) *
static_cast<std::size_t>(bounds_.width);
const float pyc = static_cast<float>(y) + 0.5f;
const float qy = pyc - ay;
for (int x = x0; x < x1; ++x) {
const float qx = static_cast<float>(x) + 0.5f - ax;
const float t = clamp01((qx * dx + qy * dy) * invLen2);
const float ex = qx - dx * t;
const float ey = qy - dy * t;
const float cov = clamp01(reach - std::sqrt(ex * ex + ey * ey));
float& dst = row[x - bounds_.x];
if (cov > dst) dst = cov;
}
}
}
void StrokeCanvas::addSegment(float ax, float ay, float bx, float by, float halfWidth) {
if (bounds_.empty() || halfWidth <= 0.0f) return;
const float dx = bx - ax;
const float dy = by - ay;
const float len2 = dx * dx + dy * dy;
if (len2 <= kMaxPieceLen * kMaxPieceLen) {
addPiece(ax, ay, bx, by, halfWidth);
return;
}
const int pieces = static_cast<int>(std::sqrt(len2) / kMaxPieceLen) + 1;
float px = ax;
float py = ay;
for (int i = 1; i <= pieces; ++i) {
const float t = static_cast<float>(i) / static_cast<float>(pieces);
const float qx = ax + dx * t;
const float qy = ay + dy * t;
addPiece(px, py, qx, qy, halfWidth);
px = qx;
py = qy;
}
}
Rect strokeBounds(const StrokePoint* pts, std::size_t count, float halfWidth, const Rect& clip) {
if (pts == nullptr || count == 0 || halfWidth <= 0.0f || clip.empty()) return Rect{};
float minX = pts[0].x, maxX = pts[0].x, minY = pts[0].y, maxY = pts[0].y;
for (std::size_t i = 1; i < count; ++i) {
minX = (std::min)(minX, pts[i].x);
maxX = (std::max)(maxX, pts[i].x);
minY = (std::min)(minY, pts[i].y);
maxY = (std::max)(maxY, pts[i].y);
}
const float reach = halfWidth + 0.5f;
const int x0 = (std::max)(clip.x, static_cast<int>(std::floor(minX - reach)));
const int y0 = (std::max)(clip.y, static_cast<int>(std::floor(minY - reach)));
const int x1 = (std::min)(clip.right(), static_cast<int>(std::ceil(maxX + reach)) + 1);
const int y1 = (std::min)(clip.bottom(), static_cast<int>(std::ceil(maxY + reach)) + 1);
if (x0 >= x1 || y0 >= y1) return Rect{};
return Rect::ltrb(x0, y0, x1, y1);
}
void strokePolyline(StrokeCanvas& canvas, const StrokePoint* pts, std::size_t count,
float halfWidth, const Rect& clip) {
canvas.reset(strokeBounds(pts, count, halfWidth, clip));
if (canvas.bounds().empty()) return;
if (count == 1) {
canvas.addSegment(pts[0].x, pts[0].y, pts[0].x, pts[0].y, halfWidth);
return;
}
for (std::size_t i = 1; i < count; ++i) {
canvas.addSegment(pts[i - 1].x, pts[i - 1].y, pts[i].x, pts[i].y, halfWidth);
}
}
void appendArc(std::vector<StrokePoint>& out, float cx, float cy, float radius, float startRad,
float endRad, float flatnessPx) {
if (radius <= 0.0f) {
out.push_back(StrokePoint{cx, cy});
return;
}
if (!(flatnessPx > 0.0f)) flatnessPx = kArcFlatnessPx;
// Chord sagitta: r*(1 - cos(step/2)) <= flatness. A flatness at or past the diameter admits
// the whole sweep in one chord, which is what keeps `maxStep` strictly positive.
const float cosHalf = (std::max)(-1.0f, 1.0f - flatnessPx / radius);
const float maxStep = 2.0f * std::acos(cosHalf);
const float sweep = endRad - startRad;
int segments = 1;
if (maxStep > 0.0f) {
const float wanted = std::ceil(std::fabs(sweep) / maxStep);
segments = wanted >= static_cast<float>(kMaxArcSegments)
? kMaxArcSegments
: (std::max)(1, static_cast<int>(wanted));
} else {
// A radius large enough that flatness/radius underflows the cosine's resolution. The cap
// is the termination guarantee, not a quality choice.
segments = kMaxArcSegments;
}
out.reserve(out.size() + static_cast<std::size_t>(segments) + 1);
for (int i = 0; i <= segments; ++i) {
const float a = startRad + sweep * (static_cast<float>(i) / static_cast<float>(segments));
out.push_back(StrokePoint{cx + radius * std::sin(a), cy - radius * std::cos(a)});
}
}
} // namespace reasampler::ui
+87
View File
@@ -0,0 +1,87 @@
// stroke_aa.h — analytic antialiased thick-stroke coverage: distance-to-polyline, MAX-accumulated
// into a scratch mask that a shell blends ONCE. Pure geometry; no LICE, no host types.
//
// The single blend is the load-bearing part. Compositing a stroke segment-by-segment (or as a
// stack of 1px arcs) re-lays ink over the previous segment's antialiased fringe, which is what
// makes a stroke read as a soft glow that never reaches an opaque core.
#pragma once
#include <cstddef>
#include <vector>
#include "core/ui/rect.h"
namespace reasampler::ui {
struct StrokePoint {
float x = 0.0f;
float y = 0.0f;
};
// Chord-flatness bound for arc flattening: an order of magnitude under the AA fringe the arc is
// drawn with, so the polyline is indistinguishable from the true arc at any radius the deck uses.
inline constexpr float kArcFlatnessPx = 0.05f;
// Hard cap on flattening output, so a pathological radius/flatness pair terminates with a coarse
// arc rather than allocating without bound.
inline constexpr int kMaxArcSegments = 512;
// Long segments are split before rasterizing. This is EXACT, not an approximation: the minimum
// distance to a partition of a segment is the minimum distance to the whole segment. It exists
// because a piece is rasterized over its bounding box, and one long diagonal's box has area
// O(len^2) — subdivision is what keeps a stroke's cost linear in its length.
inline constexpr float kMaxPieceLen = 4.0f;
// A reusable coverage mask. Allocation is amortized across calls: `reset` grows the buffer but
// never clears it, because per-row valid extents make a clear unnecessary.
class StrokeCanvas {
public:
// Grows the buffer to fit `bounds` and marks every row empty. O(height), not O(area).
void reset(const Rect& bounds);
// MAX-accumulates one segment. Endpoints are round-capped, so a zero-length segment is a dot
// of radius `halfWidth` and a polyline's joints are round by construction.
void addSegment(float ax, float ay, float bx, float by, float halfWidth);
const Rect& bounds() const { return bounds_; }
// Only [rowLo, rowHi) of a row holds meaningful coverage; outside that span the buffer is
// deliberately uninitialized, which is what keeps cost proportional to ink, not to the box.
int rowLo(int y) const { return rowLo_[static_cast<std::size_t>(y - bounds_.y)]; }
int rowHi(int y) const { return rowHi_[static_cast<std::size_t>(y - bounds_.y)]; }
// Row base pointer; index it by (x - bounds().x) within [rowLo, rowHi).
const float* rowData(int y) const {
return coverage_.data() +
static_cast<std::size_t>(y - bounds_.y) * static_cast<std::size_t>(bounds_.width);
}
// Bounds-checked single read — 0 outside the valid span. For tests and cold callers; the
// blend loop walks rows directly.
float coverageAt(int x, int y) const;
private:
void addPiece(float ax, float ay, float bx, float by, float halfWidth);
void extendRow(int y, int x0, int x1);
Rect bounds_{};
std::vector<float> coverage_;
std::vector<int> rowLo_;
std::vector<int> rowHi_;
};
// The pixel box a polyline of this half-width can touch, intersected with `clip`.
Rect strokeBounds(const StrokePoint* pts, std::size_t count, float halfWidth, const Rect& clip);
// A whole stroke in one pass: bounds, reset, every segment MAX-accumulated. Blending the finished
// canvas exactly once is the caller's half of the contract.
void strokePolyline(StrokeCanvas& canvas, const StrokePoint* pts, std::size_t count,
float halfWidth, const Rect& clip);
// Appends a flattened arc (n+1 points for n chords) to `out`. Angles are radians in LICE's
// convention: 0 is 12 o'clock, increasing clockwise — x = cx + r*sin(a), y = cy - r*cos(a).
void appendArc(std::vector<StrokePoint>& out, float cx, float cy, float radius, float startRad,
float endRad, float flatnessPx = kArcFlatnessPx);
} // namespace reasampler::ui
+1
View File
@@ -103,6 +103,7 @@ declared ahead of the instrument slots at that member in `reasampler_processor.h
- `reasampler_processor` (`shell/instrument/`: `reasampler_processor.cpp` lifecycle + `process()`, `processor_state.cpp` component-state I/O + UI-thread parameter accessors, `processor_reload.cpp` the off-audio-thread `reloadInstrument`/publish family — Q-W2v, T4-12 split; `process()` and its per-block work stay ONE TU on purpose, no cross-TU call on the per-sample path) — VST3 `SingleComponentEffect` shell: declares event-input bus + **permanently stereo** output (GA fix: dynamic mono↔stereo bus renegotiation deleted; `ChannelMode` is now decode-only), marshals MIDI note-on/off into the VoiceEngine, renders audio; owns off-audio-thread `reloadInstrument` + atomic pointer swap so `process()` does no allocation, no file I/O, no bridge calls. The instance state is `{loaded capture id, one InstrumentParams}`, and `reloadInstrument` resolves + decodes exactly that one capture into the `SampleData` the engine plays. **Self-contained playback (pS):** `ComponentState` v10 adds a `SampleRefs` table — per referenced sample, a project-relative path + decode intrinsics (root, loop, channels, displayName); `reloadInstrument` decodes directly from `SampleRefs`, bank-free (plays with the extension absent). The bank/bridge is a browser source: loading a capture copies its reference in; the reopen-heal timer + poll-to-play apparatus are removed. `retireIdleDrain()` retires fully-idle drain snapshots on the UI-timer cadence. Voice-param edits (`setVoiceCount`/`setVoiceMode`/`setMonoTrigger`) rebuild the engine from the already-decoded `SampleData` via the drain-slot swap — no bank re-read, no WAV re-decode, no audible cut to ringing tails. **FB1:** applies the post-mixer `masterGainLinear` (from `ComponentState` v8) as a per-sample ramp over the summed output — no zipper noise. **GA v9:** `channelModeExplicit_` flag persisted; `channelModeFor()` auto-defaults the mode from the loaded capture's channel count when the flag is not set. **pS:** `ComponentState` bumped v9→v10 (`SampleRefs` table); pre-v10 blobs lift to empty refs and re-save self-contained. **pS-usage:** publishes instance usage (held `SampleRefs` paths) to `rsusage_<instanceGuid>` at the tail of `reloadInstrument` (off audio thread) via `reaper_bridge::writeUsageExtState`; `ComponentState` bumped v10→**v11** (`instanceGuid` field); pre-v11 blobs mint guid on first publish.
- `reasampler_editor` — VST3 `IPlugView` LICE editor shell: hosts a LICE-drawn child window; the Sample face is home and Browse is a modal picker over it. Split on the Sample face's BAND axis, mirroring the pure `sample_bands` allocator: `editor_session` (session/bridge state, caches, commit-and-reload), `editor_controls` (the ONE `faceLayout` band resolve every paint and hit-test path shares, the node-drag bounds, the value labels, and the per-instance controls the parameter set does not carry — the parameter-set binding itself is the pure `core/instrument/ui/deck_values` module this only adapts int ids onto), `editor_models` (the orthogonal half: which stored struct each transient editor selection names — the staged-envelope pack/unpack, the drawn contour, and the three velocity curves), then matching paint and input sets — `editor_paint`/`editor_input` (dispatch + drag router + hover dispatch), `_chrome`, `_waveform`, `_deck` — plus the two band-independent surfaces (`_browse` for the modal picker, `_curve` for the velocity-curve popup) and `editor_platform` (IPlugView/Win32 window plumbing). Shared internals in `editor_internal.h`, no TU of its own. Drop-onto-editor ingest is NOT shipped (deferred).
- `reasampler_embed` — implements `IReaperUIEmbedInterface` so the instrument draws inline in the TCP/MCP without a plugin-owned HWND; delegates layout to `embed_strip`. A read-only readout: the loaded capture across the keyboard span with its root marked, plus the activity level. It takes no mouse input (there is nothing on the strip to select).
- `editor_stroke` — the editor's LICE side of the analytic stroker: builds a coverage mask with the pure `core/ui/stroke_aa` and blends it into the bitmap ONCE, writing straight to the bitmap's bits (the arithmetic matches LICE's own mode-0 combine, so a stroke composites identically to every other kit draw). Every radial and spline stroke on the editor routes through `strokeArcAA` / `strokePolylineAA` / `strokeLineAA`. Holds the draw-thread-only scratch mask and arc point list — reuse, not a hidden dependency: threading a canvas through the eight paint sites would grow those signatures to carry an allocation detail. Deliberately does NOT touch `shell/panel/draw_kit`: the waveform stroke, the docked bank panel and the browse cards are out of this seam's blast radius.
- `vst_entry` — VST3 entry point: `GetPluginFactory` export, class registration, channel-forked class UIDs.
- `editor_internal.h` — INTERNAL shared helpers for the `reasampler_editor` TU family, included only by the editor's own shell TUs (`editor_session` / `editor_controls` / `editor_paint_*` / `editor_input_*` / `editor_platform`), never a public seam: the `Rect`↔kit adapters, small draw primitives (knob face / title band), label helpers, and the velocity-curve box derivation — the helpers more than one band TU needs. The deck's control ids, group ids and group composition are the pure `deck_groups` module's, not this file's. The piano-strip and root-key draws live in `editor_paint_chrome`, their only consumer, not here.
- `reasampler_vst.h` — shared identity constants for the ReaSampler VST3 instrument (Phase S): the plugin's class UID (the channel-selected `Steinberg::FUID`, built from the FOREVER-FROZEN macros in `core/wire/reasampler_uid.h`), vendor name/URL/email, so the processor, factory, and editor agree. A class UID is FOREVER-STABLE once shipped — minted once, never regenerated. *(Newly authored per this dispatch's brief — no existing root-CLAUDE.md bullet; verified by reading `src/shell/instrument/reasampler_vst.h` directly.)*
+2 -1
View File
@@ -64,6 +64,7 @@ if(WIN32 AND EXISTS "${VST3_SDK}/public.sdk/source/main/pluginfactory.cpp")
editor_input_deck.cpp
editor_input_browse.cpp
editor_input_curve.cpp
editor_stroke.cpp
editor_platform.cpp
reasampler_embed.cpp
reaper_bridge.cpp
@@ -87,7 +88,7 @@ if(WIN32 AND EXISTS "${VST3_SDK}/public.sdk/source/main/pluginfactory.cpp")
waveform_view bank_sync browser_scroll param_slider tooltip
theme component_geometry bank_grid trigger_seam envelope_overlay envelope_edit
knob_deck deck_groups deck_values curve_popup spline_edit master_gain sample_usage
file_bytes curve_law)
file_bytes curve_law stroke_aa)
# SDK_INC gives the REAPER VST3 interfaces + API header for the bridge; WDL_INC gives
# LICE for the editor. The VST3 SDK headers arrive via vst3_sdk PUBLIC.
target_include_directories(reasampler_vst PRIVATE ${REASAMPLER_SRC_DIR} ${SDK_INC} ${WDL_INC})
+20 -23
View File
@@ -25,6 +25,7 @@
#include "core/instrument/ui/param_slider.h" // KnobGeometry / KnobArc (drawKnobFace)
#include "core/ui/component_geometry.h" // KitBox / waveformColumnCount
#include "core/ui/theme.h" // Role / InteractionState / KitColor / spectralColor
#include "shell/instrument/editor_stroke.h" // strokeArcAA / strokePolylineAA
#include "shell/panel/draw_kit.h" // the L1 draw kit: fillSurface/text/drawWaveform/toLice
#endif
@@ -111,11 +112,11 @@ inline void drawTitleBand(LICE_IBitmap* bmp, const instrument::ui::Rect& title,
kitText(bmp, titleText, readout.c_str(), Font::Title, ui::Role::TextPrimary);
}
// Stroke widths for the radial faces. The value arc is drawn as adjacent 1px AA arcs rather
// than one thick primitive — LICE has no thick-arc call, and stacking radii is what keeps every
// ring antialiased.
inline constexpr int kKnobValueArcPx = 3;
inline constexpr int kInnerDialArcPx = 2;
// Stroke widths for the radial faces. Every arc is ONE analytic stroke (editor_stroke.h) whose
// outer edge sits on the knob's radius, so the centerline is inset by half the width.
inline constexpr float kKnobTrackArcPx = 1.0f;
inline constexpr float kKnobValueArcPx = 3.0f;
inline constexpr float kInnerDialArcPx = 2.0f;
inline constexpr int kKnobNeedlePx = 2;
// Draws one radial knob face: param_slider owns the value<->angle map; this turns it into
@@ -143,27 +144,26 @@ inline void drawKnobFace(LICE_IBitmap* bmp, const instrument::ui::Rect& knobRect
const float a0 = static_cast<float>((arc.startDeg - 360.0) * kDegToRad);
const float a1 = static_cast<float>(
(arc.startDeg + instrument::ui::knobSweepDeg(arc) - 360.0) * kDegToRad);
LICE_Arc(bmp, cx, cy, rOuter, a0, a1, toLice(ui::roleColor(ui::Role::LineHairline)), 1.0f, 0,
true);
strokeArcAA(bmp, cx, cy, rOuter - kKnobTrackArcPx * 0.5f, a0, a1, kKnobTrackArcPx,
toLice(ui::roleColor(ui::Role::LineHairline)));
const double v = value01 < 0.0 ? 0.0 : (value01 > 1.0 ? 1.0 : value01);
if (v > 0.0) {
const float av = static_cast<float>(
(arc.startDeg + v * instrument::ui::knobSweepDeg(arc) - 360.0) * kDegToRad);
const ui::Role valueRole = disabled ? ui::Role::TextDim
: (hot ? ui::Role::AccentHot : ui::Role::AccentPrimary);
const LICE_pixel valueCol = toLice(ui::roleColor(valueRole));
for (int i = 0; i < kKnobValueArcPx; ++i) {
LICE_Arc(bmp, cx, cy, rOuter - static_cast<float>(i), a0, av, valueCol, 1.0f, 0, true);
}
strokeArcAA(bmp, cx, cy, rOuter - kKnobValueArcPx * 0.5f, a0, av, kKnobValueArcPx,
toLice(ui::roleColor(valueRole)));
}
// Needle: from ~35% radius out to the rim at the value's angle. ThickFLine keeps the float
// endpoints AND is always antialiased, so the needle is smooth at every angle.
// Needle: from ~35% radius out to the rim at the value's angle, stroked through the same
// analytic path as the arcs so it holds its weight at every knob position.
const KnobPoint tip = instrument::ui::knobNeedlePoint(kg, arc, v);
const double ix = kg.centerX + (tip.x - kg.centerX) * 0.35;
const double iy = kg.centerY + (tip.y - kg.centerY) * 0.35;
const ui::Role needleRole = disabled ? ui::Role::TextDim : ui::Role::TextPrimary;
LICE_ThickFLine(bmp, ix, iy, tip.x, tip.y, toLice(ui::roleColor(needleRole)), 1.0f, 0,
kKnobNeedlePx);
strokeLineAA(bmp, static_cast<float>(ix), static_cast<float>(iy),
static_cast<float>(tip.x), static_cast<float>(tip.y),
static_cast<float>(kKnobNeedlePx), toLice(ui::roleColor(needleRole)));
}
// The concentric INNER dial: a second value on the same cell, drawn in the categorical
@@ -194,15 +194,12 @@ inline void drawInnerDial(LICE_IBitmap* bmp, const instrument::ui::Rect& innerRe
(arc.startDeg + v * instrument::ui::knobSweepDeg(arc) - 360.0) * kDegToRad);
const ui::Role arcRole = disabled ? ui::Role::TextDim
: (hot ? ui::Role::AccentHot : ui::Role::AccentTertiary);
const LICE_pixel arcCol = toLice(ui::roleColor(arcRole));
for (int i = 0; i < kInnerDialArcPx; ++i) {
LICE_Arc(bmp, cx, cy, r - static_cast<float>(i), a0, av, arcCol, 1.0f, 0, true);
}
strokeArcAA(bmp, cx, cy, r - kInnerDialArcPx * 0.5f, a0, av, kInnerDialArcPx,
toLice(ui::roleColor(arcRole)));
const KnobPoint tip = instrument::ui::knobNeedlePoint(kg, arc, v);
LICE_FLine(bmp, static_cast<float>(kg.centerX), static_cast<float>(kg.centerY),
static_cast<float>(tip.x), static_cast<float>(tip.y),
toLice(ui::roleColor(disabled ? ui::Role::TextDim : ui::Role::AccentTertiary)),
1.0f, 0, true);
strokeLineAA(bmp, static_cast<float>(kg.centerX), static_cast<float>(kg.centerY),
static_cast<float>(tip.x), static_cast<float>(tip.y), 1.0f,
toLice(ui::roleColor(disabled ? ui::Role::TextDim : ui::Role::AccentTertiary)));
}
#endif // _WIN32
+18 -13
View File
@@ -6,6 +6,8 @@
#ifdef _WIN32
#include <vector>
#include "core/instrument/ui/curve_popup.h" // centered curve-popup sheet geometry
#include "shell/instrument/editor_internal.h" // kit adapters + curveBoxFromRect
#include "shell/instrument/reasampler_processor.h"
@@ -17,6 +19,10 @@ using namespace reasampler::instrument::ui; // popup geometry
namespace {
// The deck thumbnail traces a hairline; the full editor matches the envelope traces' weight.
constexpr float kMiniTracePx = 1.0f;
constexpr float kCurveTracePx = 2.0f;
const char* curveTitle(CurveTarget target) {
switch (target) {
case CurveTarget::kPitch: return "VELOCITY -> PITCH";
@@ -57,15 +63,15 @@ void ReaSamplerEditor::paintCurveButton(LICE_IBitmap* bmp, const Rect& r, CurveT
}
const LICE_pixel trace =
toLice(roleColor(disabled ? Role::LineHairline : Role::AccentSecondary));
int prevX = 0, prevY = 0;
static thread_local std::vector<ui::StrokePoint> pts;
pts.clear();
for (int px = 0; px <= mini.width; ++px) {
const int mx = mini.left + px;
const double vel = curve.pointFromPixel(mini, mx, mini.top).velocity;
const int my = curve.pixelFromPoint(mini, {vel, curve.eval(vel)}).y;
if (px > 0) LICE_Line(bmp, prevX, prevY, mx, my, trace, 1.0f, 0, true);
prevX = mx;
prevY = my;
const auto p = curve.subpixelFromPoint(mini, {vel, curve.eval(vel)});
pts.push_back(ui::StrokePoint{static_cast<float>(mx), static_cast<float>(p.y)});
}
strokePolylineAA(bmp, pts, kMiniTracePx, trace);
}
}
@@ -114,19 +120,18 @@ void ReaSamplerEditor::paintVelocityCurve(LICE_IBitmap* bmp, const Rect& r) {
// Trace the monotone spline — ONE eval per x column over the mapping box, in the categorical
// secondary accent (the same grammar as the envelope trace over the waveform). The x ->
// velocity and value -> y mappings both go through the pure module so the trace, the node
// handles, and the hit-test all share one coordinate system.
// handles, and the hit-test all share one coordinate system (sub-pixel for the trace — see
// subpixelFromPoint).
const LICE_pixel line = toLice(roleColor(Role::AccentSecondary));
int prevX = 0, prevY = 0;
static thread_local std::vector<ui::StrokePoint> pts;
pts.clear();
for (int px = 0; px <= box.width; ++px) {
const int cx = box.left + px;
const double vel = curve.pointFromPixel(box, cx, box.top).velocity;
const int cy = curve.pixelFromPoint(box, {vel, curve.eval(vel)}).y;
// Same weight and antialiasing the envelope traces use — one trace grammar across every
// curve surface (editor_paint_waveform.cpp owns why ThickFLine and not LICE_Line).
if (px > 0) LICE_ThickFLine(bmp, prevX, prevY, cx, cy, line, 1.0f, 0, 2);
prevX = cx;
prevY = cy;
const auto p = curve.subpixelFromPoint(box, {vel, curve.eval(vel)});
pts.push_back(ui::StrokePoint{static_cast<float>(cx), static_cast<float>(p.y)});
}
strokePolylineAA(bmp, pts, kCurveTracePx, line);
// Draggable node handles (mirror of the envelope overlay's): accent-primary squares lifted
// to accent-hot when grabbed or hovered, or warn when a drag-off delete is armed (cursor
+19 -20
View File
@@ -42,11 +42,9 @@ constexpr int kEnvHandleRadius = 3;
constexpr int kEnvHandleGrabbedRadius = 5;
constexpr int kEnvHandleRingPx = 2;
// Both envelope traces — staged and drawn — are one grammar and one weight. LICE_ThickFLine is
// ALWAYS antialiased (unlike LICE_Line, whose aa flag does nothing on an axis-aligned run), and
// the second pixel of width is what stops a shallow slope reading as a staircase over the
// waveform behind it.
constexpr int kEnvTracePx = 2;
// Both envelope traces — staged and drawn — are one grammar and one weight. Two pixels is what
// reads as a trace rather than a hairline over the waveform behind it.
constexpr float kEnvTracePx = 2.0f;
} // namespace
void ReaSamplerEditor::paintWaveform(LICE_IBitmap* bmp, const Rect& band) {
@@ -143,21 +141,22 @@ void ReaSamplerEditor::paintSplineOverlay(LICE_IBitmap* bmp, const OverlayArea&
if (box.width <= 0 || box.height <= 1) return;
const VelocityCurve& curve = splineFor(overlayEnv_);
// One eval per drawn column, through the curve's own pixel maps, so the trace and the
// handles share the coordinate system the hit-test resolves against.
// One eval per drawn column, through the curve's own pixel maps, so the trace and the handles
// share the coordinate system the hit-test resolves against (sub-pixel here — see
// subpixelFromPoint).
const LICE_pixel line = toLice(roleColor(Role::OverlayTrace));
int prevX = 0, prevY = 0;
static thread_local std::vector<ui::StrokePoint> trace;
trace.clear();
// < not <=: box.left + box.width is the overlay's own EXCLUSIVE right edge (the box has no
// inset, unlike the popup's), so a <= column paints one pixel into the next band's pad —
// and it is redundant with the clamped endpoint handle below anyway.
for (int px = 0; px < box.width; ++px) {
const int cx = box.left + px;
const double t = curve.pointFromPixel(box, cx, box.top).velocity;
const int cy = curve.pixelFromPoint(box, {t, curve.eval(t)}).y;
if (px > 0) LICE_ThickFLine(bmp, prevX, prevY, cx, cy, line, 1.0f, 0, kEnvTracePx);
prevX = cx;
prevY = cy;
const auto p = curve.subpixelFromPoint(box, {t, curve.eval(t)});
trace.push_back(ui::StrokePoint{static_cast<float>(cx), static_cast<float>(p.y)});
}
strokePolylineAA(bmp, trace, kEnvTracePx, line);
// Handles carry two independent states on the same mark, so they use two independent
// channels: SIZE is the grab (the staged painter's grammar — a hotter hue reads as lower
@@ -211,18 +210,18 @@ void ReaSamplerEditor::paintEnvelopeOverlay(LICE_IBitmap* bmp, const OverlayArea
const StageEnvelope env = packEnvelope(overlayEnv_, params_.play, frames, startFrame);
const std::vector<EnvVertex> poly = buildEnvelopePolyline(env, waveArea, totalSeconds);
// Clip x to the wave rect. Knots are handles, not line vertices.
// Clip x to the wave rect. Knots are handles, not line vertices. Vertices stay INTEGER here
// — unlike the spline traces above — because they are the same positions the draggable
// handles are drawn at, and a sub-pixel trace would sit off its own handles.
const LICE_pixel line = toLice(roleColor(Role::OverlayTrace));
const EnvVertex* prev = nullptr;
static thread_local std::vector<ui::StrokePoint> trace;
trace.clear();
for (const EnvVertex& v : poly) {
if (v.knot) continue;
if (prev != nullptr) {
const int x0 = (std::max)(area.x, (std::min)(area.right() - 1, prev->x));
const int x1 = (std::max)(area.x, (std::min)(area.right() - 1, v.x));
LICE_ThickFLine(bmp, x0, prev->y, x1, v.y, line, 1.0f, 0, kEnvTracePx);
}
prev = &v;
const int vx = (std::max)(area.x, (std::min)(area.right() - 1, v.x));
trace.push_back(ui::StrokePoint{static_cast<float>(vx), static_cast<float>(v.y)});
}
strokePolylineAA(bmp, trace, kEnvTracePx, line);
// Handles: a square per draggable stage node, a ROUND knot per curvable segment. Every
// vertex is guaranteed in-bounds; the handle is additionally clamped inside the band so one
// on an edge node never overhangs into the neighbouring bands.
+83
View File
@@ -0,0 +1,83 @@
#include "shell/instrument/editor_stroke.h"
#ifdef _WIN32
#include <cstddef>
namespace reasampler::vst {
namespace {
// Draw-thread-only scratch. It lives here rather than on the editor because a stroke is a leaf
// draw call reached from eight paint sites — threading a canvas through every one of them would
// grow those signatures to carry an allocation detail. Reuse is the point: after the first paint
// the mask and the point list are resized, never reallocated.
thread_local ui::StrokeCanvas g_canvas;
thread_local std::vector<ui::StrokePoint> g_arcPoints;
// One blend of the finished mask. The arithmetic matches LICE's own mode-0 combine
// (src + (dst-src)*(256-a)/256 on all four channels, alpha in .8 fixed point) so a stroke
// composites identically to every other kit draw on the same surface — written straight to the
// bitmap's bits rather than through LICE_PutPixel, which re-derives the row pointer per pixel.
void blendCanvas(LICE_IBitmap* bmp, const ui::StrokeCanvas& canvas, LICE_pixel color,
float alpha) {
const ui::Rect& b = canvas.bounds();
if (b.empty() || alpha <= 0.0f) return;
LICE_pixel* const bits = bmp->getBits();
const int span = bmp->getRowSpan();
if (bits == nullptr || span <= 0) return;
const bool flipped = bmp->isFlipped();
const int lastRow = bmp->getHeight() - 1;
const int sr = LICE_GETR(color);
const int sg = LICE_GETG(color);
const int sb = LICE_GETB(color);
const int sa = LICE_GETA(color);
for (int y = b.y; y < b.bottom(); ++y) {
const int lo = canvas.rowLo(y);
const int hi = canvas.rowHi(y);
if (hi <= lo) continue;
const float* const cov = canvas.rowData(y);
LICE_pixel* const row =
bits + static_cast<std::size_t>(flipped ? lastRow - y : y) *
static_cast<std::size_t>(span) + static_cast<std::size_t>(b.x);
for (int i = lo; i < hi; ++i) {
const int ia = static_cast<int>(cov[i] * alpha * 256.0f);
if (ia <= 0) continue;
if (ia >= 256) {
row[i] = color;
continue;
}
const int sc = 256 - ia;
LICE_pixel_chan* const d = reinterpret_cast<LICE_pixel_chan*>(row + i);
d[LICE_PIXEL_R] = static_cast<LICE_pixel_chan>(sr + ((d[LICE_PIXEL_R] - sr) * sc) / 256);
d[LICE_PIXEL_G] = static_cast<LICE_pixel_chan>(sg + ((d[LICE_PIXEL_G] - sg) * sc) / 256);
d[LICE_PIXEL_B] = static_cast<LICE_pixel_chan>(sb + ((d[LICE_PIXEL_B] - sb) * sc) / 256);
d[LICE_PIXEL_A] = static_cast<LICE_pixel_chan>(sa + ((d[LICE_PIXEL_A] - sa) * sc) / 256);
}
}
}
ui::Rect bitmapRect(LICE_IBitmap* bmp) {
return ui::Rect{0, 0, bmp->getWidth(), bmp->getHeight()};
}
} // namespace
void strokePolylineAA(LICE_IBitmap* bmp, const ui::StrokePoint* pts, std::size_t count,
float widthPx, LICE_pixel color, float alpha) {
if (bmp == nullptr || pts == nullptr || count == 0 || widthPx <= 0.0f) return;
ui::strokePolyline(g_canvas, pts, count, widthPx * 0.5f, bitmapRect(bmp));
blendCanvas(bmp, g_canvas, color, alpha);
}
void strokeArcAA(LICE_IBitmap* bmp, float cx, float cy, float radius, float startRad, float endRad,
float widthPx, LICE_pixel color, float alpha) {
if (bmp == nullptr || widthPx <= 0.0f) return;
g_arcPoints.clear();
ui::appendArc(g_arcPoints, cx, cy, radius, startRad, endRad);
strokePolylineAA(bmp, g_arcPoints.data(), g_arcPoints.size(), widthPx, color, alpha);
}
} // namespace reasampler::vst
#endif // _WIN32
+50
View File
@@ -0,0 +1,50 @@
// editor_stroke.h — the editor's LICE side of the analytic stroker: build a coverage mask with
// the pure `core/ui/stroke_aa` module, blend it into the bitmap ONCE.
//
// Every radial and spline stroke on the editor goes through here. LICE's own primitives cannot
// serve these two shapes: LICE_Arc rasterizes a whole circle clipped per 90-degree box and splits
// one unit of ink across two pixels by the radius's fractional part (so a stacked-radii arc never
// reaches an opaque core), and LICE_ThickFLine lays its width along the MINOR axis (so a curve's
// perpendicular weight falls off as cos(theta) and thins at every diagonal).
#pragma once
#ifdef _WIN32
#include <cstddef>
#include <vector>
#include "lice/lice.h"
#include "wdltypes.h"
#include "core/ui/rect.h"
#include "core/ui/stroke_aa.h"
namespace reasampler::vst {
// Blends a polyline as one antialiased stroke of `widthPx`. Clipped to the bitmap. Takes a raw
// span so a short stroke (a knob needle) can pass a stack array and cost no allocation.
void strokePolylineAA(LICE_IBitmap* bmp, const ui::StrokePoint* pts, std::size_t count,
float widthPx, LICE_pixel color, float alpha = 1.0f);
inline void strokePolylineAA(LICE_IBitmap* bmp, const std::vector<ui::StrokePoint>& pts,
float widthPx, LICE_pixel color, float alpha = 1.0f) {
strokePolylineAA(bmp, pts.data(), pts.size(), widthPx, color, alpha);
}
// A single antialiased segment — the two-point polyline, spelled out for the call sites that
// have exactly two endpoints.
inline void strokeLineAA(LICE_IBitmap* bmp, float x0, float y0, float x1, float y1, float widthPx,
LICE_pixel color, float alpha = 1.0f) {
const ui::StrokePoint pts[2] = {{x0, y0}, {x1, y1}};
strokePolylineAA(bmp, pts, 2, widthPx, color, alpha);
}
// Blends a circular arc as one antialiased stroke of `widthPx`. Angles are radians in LICE's
// convention (0 = 12 o'clock, increasing clockwise), matching what LICE_Arc took.
void strokeArcAA(LICE_IBitmap* bmp, float cx, float cy, float radius, float startRad, float endRad,
float widthPx, LICE_pixel color, float alpha = 1.0f);
} // namespace reasampler::vst
#endif // _WIN32