Skip to content

Commit b212b28

Browse files
committed
Merge branch 'dev-2.0' into dependencies-update
2 parents 7079586 + 270eb1c commit b212b28

55 files changed

Lines changed: 2455 additions & 1206 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: 92 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,11 +1485,14 @@
14851485
"noiseDetail": {
14861486
"overloads": [
14871487
[
1488-
"Number",
1488+
"Number"
1489+
],
1490+
[
1491+
"Number",
14891492
"Number"
14901493
]
1491-
]
1492-
},
1494+
]
1495+
},
14931496
"noiseSeed": {
14941497
"overloads": [
14951498
[
@@ -2033,13 +2036,6 @@
20332036
]
20342037
]
20352038
},
2036-
"combineColors": {
2037-
"overloads": [
2038-
[
2039-
"Function"
2040-
]
2041-
]
2042-
},
20432039
"getPixelInputs": {
20442040
"overloads": [
20452041
[
@@ -2885,6 +2881,16 @@
28852881
]
28862882
]
28872883
},
2884+
"buildFilterShader": {
2885+
"overloads": [
2886+
[
2887+
"Function"
2888+
],
2889+
[
2890+
"Object"
2891+
]
2892+
]
2893+
},
28882894
"createFilterShader": {
28892895
"overloads": [
28902896
[
@@ -2913,6 +2919,25 @@
29132919
]
29142920
]
29152921
},
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+
},
29162941
"baseMaterialShader": {
29172942
"overloads": [
29182943
[]
@@ -2923,16 +2948,73 @@
29232948
[]
29242949
]
29252950
},
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+
},
29262970
"baseNormalShader": {
29272971
"overloads": [
29282972
[]
29292973
]
29302974
},
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+
},
29312994
"baseColorShader": {
29322995
"overloads": [
29332996
[]
29342997
]
29352998
},
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+
},
29363018
"baseStrokeShader": {
29373019
"overloads": [
29383020
[]

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)