Skip to content

Commit eab102b

Browse files
committed
Fix all constants to match Processing Java PConstants exactly; add HOME/END/F1-F12 aliases
1 parent ea63cbc commit eab102b

1 file changed

Lines changed: 22 additions & 16 deletions

File tree

src/Processing.h

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -522,14 +522,14 @@ void tint(const PColor& c);
522522
// IMAGE FILTER CONSTANTS
523523
// =============================================================================
524524

525-
static constexpr int THRESHOLD = 1;
526-
static constexpr int GRAY = 2;
525+
static constexpr int THRESHOLD = 16;
526+
static constexpr int GRAY = 12;
527527
static constexpr int OPAQUE = 14;
528-
static constexpr int INVERT = 4;
529-
static constexpr int POSTERIZE = 8;
528+
static constexpr int INVERT = 13;
529+
static constexpr int POSTERIZE = 15;
530530
static constexpr int BLUR = 11;
531-
static constexpr int ERODE = 15;
532-
static constexpr int DILATE = 16;
531+
static constexpr int ERODE = 17;
532+
static constexpr int DILATE = 18;
533533

534534
// =============================================================================
535535
// PIMAGE -- Pixel buffer backed by an OpenGL texture
@@ -1150,16 +1150,22 @@ constexpr bool _is_numeric_v =
11501150
static constexpr int ALT = 18;
11511151
static constexpr int CONTROL = 17;
11521152
static constexpr int SHIFT = 16;
1153-
static constexpr int HOME_KEY = 36;
1154-
static constexpr int END_KEY = 35;
1153+
static constexpr int HOME_KEY = 36; static constexpr int HOME = 36;
1154+
static constexpr int END_KEY = 35; static constexpr int END = 35;
11551155
static constexpr int PAGE_UP = 33;
11561156
static constexpr int PAGE_DOWN = 34;
1157-
static constexpr int F1_KEY = 112; static constexpr int F2_KEY = 113;
1158-
static constexpr int F3_KEY = 114; static constexpr int F4_KEY = 115;
1159-
static constexpr int F5_KEY = 116; static constexpr int F6_KEY = 117;
1160-
static constexpr int F7_KEY = 118; static constexpr int F8_KEY = 119;
1161-
static constexpr int F9_KEY = 120; static constexpr int F10_KEY = 121;
1162-
static constexpr int F11_KEY = 122; static constexpr int F12_KEY = 123;
1157+
static constexpr int F1_KEY = 112; static constexpr int F1 = 112;
1158+
static constexpr int F2_KEY = 113; static constexpr int F2 = 113;
1159+
static constexpr int F3_KEY = 114; static constexpr int F3 = 114;
1160+
static constexpr int F4_KEY = 115; static constexpr int F4 = 115;
1161+
static constexpr int F5_KEY = 116; static constexpr int F5 = 116;
1162+
static constexpr int F6_KEY = 117; static constexpr int F6 = 117;
1163+
static constexpr int F7_KEY = 118; static constexpr int F7 = 118;
1164+
static constexpr int F8_KEY = 119; static constexpr int F8 = 119;
1165+
static constexpr int F9_KEY = 120; static constexpr int F9 = 120;
1166+
static constexpr int F10_KEY = 121; static constexpr int F10 = 121;
1167+
static constexpr int F11_KEY = 122; static constexpr int F11 = 122;
1168+
static constexpr int F12_KEY = 123; static constexpr int F12 = 123;
11631169

11641170
// Non-coded keys: use `key` directly (not keyCode) for these
11651171
static constexpr char BACKSPACE = 8;
@@ -1202,8 +1208,8 @@ static constexpr int LINES = 5;
12021208
static constexpr int TRIANGLES = 9;
12031209
static constexpr int TRIANGLE_FAN = 11;
12041210
static constexpr int TRIANGLE_STRIP = 10;
1205-
static constexpr int QUADS = 16;
1206-
static constexpr int QUAD_STRIP = 17;
1211+
static constexpr int QUADS = 17;
1212+
static constexpr int QUAD_STRIP = 18;
12071213
static constexpr int CLOSE = 2;
12081214
// Arc modes
12091215
static constexpr int OPEN = 1;

0 commit comments

Comments
 (0)