Skip to content

Commit 68ef243

Browse files
davepagurekdavepagurek
committed
Merge branch 'dev-2.0' into typescript-declarations
2 parents b2644a4 + abd736f commit 68ef243

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3564
-19783
lines changed

‎docs/parameterData.json‎

Lines changed: 38 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@
197197
"colorMode": {
198198
"overloads": [
199199
[
200-
"RGB|HSB|HSL",
200+
"RGB|HSB|HSL|RGBHDR|HWB|LAB|LCH|OKLAB|OKLCH",
201201
"Number?"
202202
],
203203
[
204-
"RGB|HSB|HSL",
204+
"RGB|HSB|HSL|RGBHDR|HWB|LAB|LCH|OKLAB|OKLCH",
205205
"Number",
206206
"Number",
207207
"Number",
@@ -367,7 +367,18 @@
367367
"worldToScreen": {
368368
"overloads": [
369369
[
370-
"p5.Vector"
370+
"Number|p5.Vector",
371+
"Number",
372+
"Number?"
373+
]
374+
]
375+
},
376+
"screenToWorld": {
377+
"overloads": [
378+
[
379+
"Number|p5.Vector",
380+
"Number",
381+
"Number?"
371382
]
372383
]
373384
},
@@ -401,7 +412,7 @@
401412
[
402413
"Number?",
403414
"Number?",
404-
"P2D|WEBGL?",
415+
"P2D|WEBGL|P2DHDR?",
405416
"HTMLCanvasElement?"
406417
],
407418
[
@@ -1968,24 +1979,6 @@
19681979
]
19691980
]
19701981
},
1971-
"quadraticVertex": {
1972-
"overloads": [
1973-
[
1974-
"Number",
1975-
"Number",
1976-
"Number",
1977-
"Number"
1978-
],
1979-
[
1980-
"Number",
1981-
"Number",
1982-
"Number",
1983-
"Number",
1984-
"Number",
1985-
"Number"
1986-
]
1987-
]
1988-
},
19891982
"normal": {
19901983
"overloads": [
19911984
[
@@ -2322,7 +2315,7 @@
23222315
"strokeMode": {
23232316
"overloads": [
23242317
[
2325-
"string"
2318+
"String"
23262319
]
23272320
]
23282321
},
@@ -2839,6 +2832,11 @@
28392832
[]
28402833
]
28412834
},
2835+
"baseFilterShader": {
2836+
"overloads": [
2837+
[]
2838+
]
2839+
},
28422840
"baseNormalShader": {
28432841
"overloads": [
28442842
[]
@@ -3355,27 +3353,6 @@
33553353
]
33563354
]
33573355
},
3358-
"touchStarted": {
3359-
"overloads": [
3360-
[
3361-
"Function|Boolean"
3362-
]
3363-
]
3364-
},
3365-
"touchMoved": {
3366-
"overloads": [
3367-
[
3368-
"Function|Boolean"
3369-
]
3370-
]
3371-
},
3372-
"touchEnded": {
3373-
"overloads": [
3374-
[
3375-
"Function|Boolean"
3376-
]
3377-
]
3378-
},
33793356
"dragOver": {
33803357
"overloads": [
33813358
[
@@ -3791,36 +3768,36 @@
37913768
"textBounds": {
37923769
"overloads": [
37933770
[
3794-
"string",
3795-
"number",
3796-
"number",
3797-
"number",
3798-
"number"
3771+
"String",
3772+
"Number",
3773+
"Number",
3774+
"Number",
3775+
"Number"
37993776
]
38003777
]
38013778
},
38023779
"fontBounds": {
38033780
"overloads": [
38043781
[
3805-
"string",
3806-
"number",
3807-
"number",
3808-
"number",
3809-
"number"
3782+
"String",
3783+
"Number",
3784+
"Number",
3785+
"Number",
3786+
"Number"
38103787
]
38113788
]
38123789
},
38133790
"textWidth": {
38143791
"overloads": [
38153792
[
3816-
"string"
3793+
"String"
38173794
]
38183795
]
38193796
},
38203797
"fontWidth": {
38213798
"overloads": [
38223799
[
3823-
"string"
3800+
"String"
38243801
]
38253802
]
38263803
},
@@ -3852,8 +3829,8 @@
38523829
"overloads": [
38533830
[
38543831
"p5.Font|string",
3855-
"number",
3856-
"object"
3832+
"Number",
3833+
"Object"
38573834
]
38583835
]
38593836
},
@@ -4270,15 +4247,15 @@
42704247
"getValue": {
42714248
"overloads": [
42724249
[
4273-
"number"
4250+
"Number"
42744251
]
42754252
]
42764253
},
42774254
"setValue": {
42784255
"overloads": [
42794256
[
4280-
"number",
4281-
"number"
4257+
"Number",
4258+
"Number"
42824259
]
42834260
]
42844261
},

0 commit comments

Comments
 (0)