From 539b465b32102d90a6d356d8f94300e70338856e Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Tue, 20 Nov 2018 15:35:59 +0300 Subject: Implement basic global tablet pressure curve options. Grease Pencil already implements support for full-featured per-brush pressure curves, but it is useful to have some basic global settings that affect all brushes and tools. This adds two simple options: - Raw pressure required to achieve full brush intensity. - Softness control, using a gamma curve internally. The most important one is the max pressure setting, because it is critical for ergonomics, but the Linux Wacom driver lacks it. The softness option internally converts to gamma = 4^-softness. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D3967 --- source/blender/windowmanager/intern/wm_event_system.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager/intern/wm_event_system.c') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index f82df000288..03a80ff240b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3662,6 +3662,22 @@ static void wm_eventemulation(wmEvent *event) } } +/* applies the global tablet pressure correction curve */ +float wm_pressure_curve(float pressure) +{ + if (U.pressure_threshold_max != 0.0f) { + pressure /= U.pressure_threshold_max; + } + + CLAMP(pressure, 0.0f, 1.0f); + + if (U.pressure_softness != 0.0f) { + pressure = powf(pressure, powf(4.0f, -U.pressure_softness)); + } + + return pressure; +} + /* adds customdata to event */ static void update_tablet_data(wmWindow *win, wmEvent *event) { @@ -3672,7 +3688,7 @@ static void update_tablet_data(wmWindow *win, wmEvent *event) struct wmTabletData *wmtab = MEM_mallocN(sizeof(wmTabletData), "customdata tablet"); wmtab->Active = (int)td->Active; - wmtab->Pressure = td->Pressure; + wmtab->Pressure = wm_pressure_curve(td->Pressure); wmtab->Xtilt = td->Xtilt; wmtab->Ytilt = td->Ytilt; -- cgit v1.2.3