Skip to content

Commit 532660d

Browse files
authored
Merge branch 'dev-2.0' into fix-noiseDetail-default-falloff-2x
2 parents 2de0bca + 595f354 commit 532660d

47 files changed

Lines changed: 2295 additions & 1241 deletions

File tree

Some content is hidden

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

docs/parameterData.json

Lines changed: 86 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,13 +2036,6 @@
20362036
]
20372037
]
20382038
},
2039-
"combineColors": {
2040-
"overloads": [
2041-
[
2042-
"Function"
2043-
]
2044-
]
2045-
},
20462039
"getPixelInputs": {
20472040
"overloads": [
20482041
[
@@ -2888,6 +2881,16 @@
28882881
]
28892882
]
28902883
},
2884+
"buildFilterShader": {
2885+
"overloads": [
2886+
[
2887+
"Function"
2888+
],
2889+
[
2890+
"Object"
2891+
]
2892+
]
2893+
},
28912894
"createFilterShader": {
28922895
"overloads": [
28932896
[
@@ -2916,6 +2919,25 @@
29162919
]
29172920
]
29182921
},
2922+
"buildMaterialShader": {
2923+
"overloads": [
2924+
[
2925+
"Function"
2926+
],
2927+
[
2928+
"Object"
2929+
]
2930+
]
2931+
},
2932+
"loadMaterialShader": {
2933+
"overloads": [
2934+
[
2935+
"String",
2936+
"Function?",
2937+
"Function?"
2938+
]
2939+
]
2940+
},
29192941
"baseMaterialShader": {
29202942
"overloads": [
29212943
[]
@@ -2926,16 +2948,73 @@
29262948
[]
29272949
]
29282950
},
2951+
"buildNormalShader": {
2952+
"overloads": [
2953+
[
2954+
"Function"
2955+
],
2956+
[
2957+
"Object"
2958+
]
2959+
]
2960+
},
2961+
"loadNormalShader": {
2962+
"overloads": [
2963+
[
2964+
"String",
2965+
"Function?",
2966+
"Function?"
2967+
]
2968+
]
2969+
},
29292970
"baseNormalShader": {
29302971
"overloads": [
29312972
[]
29322973
]
29332974
},
2975+
"buildColorShader": {
2976+
"overloads": [
2977+
[
2978+
"Function"
2979+
],
2980+
[
2981+
"Object"
2982+
]
2983+
]
2984+
},
2985+
"loadColorShader": {
2986+
"overloads": [
2987+
[
2988+
"String",
2989+
"Function?",
2990+
"Function?"
2991+
]
2992+
]
2993+
},
29342994
"baseColorShader": {
29352995
"overloads": [
29362996
[]
29372997
]
29382998
},
2999+
"buildStrokeShader": {
3000+
"overloads": [
3001+
[
3002+
"Function"
3003+
],
3004+
[
3005+
"Object"
3006+
]
3007+
]
3008+
},
3009+
"loadStrokeShader": {
3010+
"overloads": [
3011+
[
3012+
"String",
3013+
"Function?",
3014+
"Function?"
3015+
]
3016+
]
3017+
},
29393018
"baseStrokeShader": {
29403019
"overloads": [
29413020
[]

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"test/**/*.js": "eslint",
2020
"utils/**/*.{js,mjs}": "eslint"
2121
},
22-
"version": "2.2.0-rc.6",
22+
"version": "2.2.0",
2323
"dependencies": {
2424
"@davepagurek/bezier-path": "^0.0.2",
2525
"@japont/unicode-range": "^1.0.0",

preview/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107

108108
p.draw = function () {
109109
p.clear();
110+
p.rotateY(p.millis() * 0.001);
110111
p.push();
111112
//p.clip(() => p.rect(-50, -50, 200, 200));
112113
/*p.orbitControl();

0 commit comments

Comments
 (0)