Compare commits

...

6 Commits

Author SHA1 Message Date
Eveline-97
fe68764e7d fix aligning 2025-07-02 14:29:59 +02:00
Eveline-97
40d0927a0e streamline layout patch 2025-07-02 12:16:30 +02:00
Eveline-97
92b7545e90 match Max layout to jweb 2025-07-02 12:07:53 +02:00
Eveline-97
4912b398dd Merge remote-tracking branch 'refs/remotes/origin/main'
merge
2025-07-01 16:34:50 +02:00
Eveline-97
02d5c6e914 cleanup modulator table 2025-07-01 16:34:27 +02:00
13f3a18c4c Merge pull request 'bpatcher-embed' (#15) from bpatcher-embed into main
Reviewed-on: https://gitea.lz-storage.synology.me/kieran-mcauliffe/max-mod-enum/pulls/15
2025-07-01 16:32:05 +02:00
4 changed files with 420 additions and 75 deletions

View File

@ -2,16 +2,42 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"classnamespace" : "box",
"rect" : [ 230.0, 102.0, 750.0, 734.0 ],
"rect" : [ 347.0, 100.0, 1131.0, 790.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-12",
@ -63,7 +89,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 796.202521204948425, 849.367077469825745, 50.0, 22.0 ]
"patching_rect" : [ 851.30120575428009, 786.0, 50.0, 22.0 ]
}
}
@ -74,7 +100,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 655.696193933486938, 849.367077469825745, 50.0, 22.0 ]
"patching_rect" : [ 679.901205754280113, 786.0, 50.0, 22.0 ]
}
}
@ -85,7 +111,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 486.075942993164062, 849.367077469825745, 50.0, 22.0 ]
"patching_rect" : [ 508.501205754280136, 786.0, 50.0, 22.0 ]
}
}
@ -96,7 +122,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 345.569615721702576, 849.367077469825745, 50.0, 22.0 ]
"patching_rect" : [ 337.101205754280102, 786.0, 50.0, 22.0 ]
}
}
@ -108,7 +134,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 188.607592463493347, 849.367077469825745, 50.0, 35.0 ],
"patching_rect" : [ 165.701205754280096, 786.0, 50.0, 35.0 ],
"text" : "stream 0.802"
}
@ -121,7 +147,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 48.10126519203186, 849.367077469825745, 50.0, 62.0 ],
"patching_rect" : [ 46.0, 786.0, 50.0, 62.0 ],
"text" : "pulse_length 0.981862"
}
@ -142,7 +168,7 @@
"numoutlets" : 6,
"offset" : [ 0.0, 0.0 ],
"outlettype" : [ "", "", "", "", "", "" ],
"patching_rect" : [ 25.30120575428009, 154.216873168945312, 838.631580829620361, 601.0 ],
"patching_rect" : [ 25.30120575428009, 154.216873168945312, 876.0, 621.0 ],
"varname" : "ModEnum",
"viewvisibility" : 1
}
@ -206,7 +232,6 @@
}
],
"originid" : "pat-20",
"parameters" : {
"obj-1::obj-25" : [ "dict", "dict", 0 ],
"parameterbanks" : {
@ -223,14 +248,14 @@
,
"dependency_cache" : [ {
"name" : "ModEnum.maxpat",
"bootpath" : "~/Documents/max-mod-enum",
"bootpath" : "~/Documents/Max 8/Library/max-mod-enum",
"patcherrelativepath" : ".",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "myStorage.json",
"bootpath" : "~/Documents/max-mod-enum",
"bootpath" : "~/Documents/Max 8/Library/max-mod-enum",
"patcherrelativepath" : ".",
"type" : "JSON",
"implicit" : 1

View File

@ -2,17 +2,42 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"classnamespace" : "box",
"rect" : [ 294.0, 100.0, 1083.0, 787.0 ],
"rect" : [ 47.0, 165.0, 884.0, 704.0 ],
"bglocked" : 1,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 15,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-5",
@ -305,53 +330,61 @@
}
, {
"box" : {
"fontname" : "Arial Bold",
"id" : "obj-165",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 447.0, 1145.0, 91.0, 20.0 ],
"patching_rect" : [ 447.0, 1145.0, 96.0, 20.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 126.0, 91.0, 20.0 ],
"text" : "Custom wave 4"
"presentation_rect" : [ 673.0, 18.0, 96.0, 20.0 ],
"text" : "Custom wave 4",
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ]
}
}
, {
"box" : {
"fontname" : "Arial Bold",
"id" : "obj-166",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 356.0, 1145.0, 91.0, 20.0 ],
"patching_rect" : [ 356.0, 1145.0, 96.0, 20.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 126.0, 91.0, 20.0 ],
"text" : "Custom wave 3"
"presentation_rect" : [ 459.666666666666629, 18.0, 96.0, 20.0 ],
"text" : "Custom wave 3",
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ]
}
}
, {
"box" : {
"fontname" : "Arial Bold",
"id" : "obj-164",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 447.0, 1123.0, 91.0, 20.0 ],
"patching_rect" : [ 447.0, 1123.0, 96.0, 20.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 14.0, 91.0, 20.0 ],
"text" : "Custom wave 2"
"presentation_rect" : [ 246.333333333333314, 18.0, 96.0, 20.0 ],
"text" : "Custom wave 2",
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ]
}
}
, {
"box" : {
"fontname" : "Arial Bold",
"id" : "obj-163",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 356.0, 1123.0, 91.0, 20.0 ],
"patching_rect" : [ 356.0, 1123.0, 96.0, 20.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 14.0, 91.0, 20.0 ],
"text" : "Custom wave 1"
"presentation_rect" : [ 33.0, 18.0, 96.0, 20.0 ],
"text" : "Custom wave 1",
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ]
}
}
@ -399,8 +432,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -408,7 +441,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-106",
@ -544,11 +603,17 @@
}
}
],
"originid" : "pat-3857"
]
}
,
"patching_rect" : [ 724.0, 1441.0, 95.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p dumpFunction"
}
@ -592,9 +657,11 @@
, {
"box" : {
"addpoints" : [ 0.0, 62.666666666666664, 0, 101.694915254237287, 100.0, 0, 230.363894333230689, 0.0, 0, 549.512830503443411, 0.0, 0, 861.016949152542338, 100.0, 0, 1000.0, 0.0, 0 ],
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"classic_curve" : 1,
"hidden" : 1,
"id" : "obj-153",
"linecolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"maxclass" : "function",
"numinlets" : 1,
"numoutlets" : 4,
@ -603,7 +670,7 @@
"parameter_enable" : 0,
"patching_rect" : [ 724.0, 1479.0, 159.5, 52.0 ],
"presentation" : 1,
"presentation_rect" : [ 193.0, 172.0, 159.5, 52.0 ],
"presentation_rect" : [ 673.0, 64.0, 159.5, 52.0 ],
"range" : [ 0.0, 100.0 ],
"varname" : "userFunction4"
}
@ -619,8 +686,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -628,7 +695,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-106",
@ -764,11 +857,17 @@
}
}
],
"originid" : "pat-3859"
]
}
,
"patching_rect" : [ 510.0, 1441.0, 95.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p dumpFunction"
}
@ -812,8 +911,10 @@
, {
"box" : {
"addpoints" : [ 0.0, 0.0, 0, 390.95744680851061, 0.0, 0, 390.95744680851061, 82.666666666666671, 0, 638.418079096045176, 100.0, 0, 881.355932203389784, 51.851851851851855, 0 ],
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"classic_curve" : 1,
"id" : "obj-148",
"linecolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"maxclass" : "function",
"numinlets" : 1,
"numoutlets" : 4,
@ -822,7 +923,7 @@
"parameter_enable" : 0,
"patching_rect" : [ 510.0, 1479.0, 159.5, 52.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.5, 172.0, 161.0, 52.0 ],
"presentation_rect" : [ 460.0, 64.0, 161.0, 52.0 ],
"range" : [ 0.0, 100.0 ],
"varname" : "userFunction3"
}
@ -838,8 +939,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -847,7 +948,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-106",
@ -983,11 +1110,17 @@
}
}
],
"originid" : "pat-3861"
]
}
,
"patching_rect" : [ 296.0, 1441.0, 95.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p dumpFunction"
}
@ -1031,9 +1164,11 @@
, {
"box" : {
"addpoints" : [ 0.0, 0.0, 0, 108.474576271186436, 100.0, 0, 108.474576271186436, 100.0, 0, 1000.0, 0.0, 0 ],
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"classic_curve" : 1,
"hidden" : 1,
"id" : "obj-143",
"linecolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"maxclass" : "function",
"numinlets" : 1,
"numoutlets" : 4,
@ -1042,7 +1177,7 @@
"parameter_enable" : 0,
"patching_rect" : [ 296.0, 1479.0, 159.5, 52.0 ],
"presentation" : 1,
"presentation_rect" : [ 193.0, 60.0, 159.5, 52.0 ],
"presentation_rect" : [ 246.0, 64.0, 159.5, 52.0 ],
"range" : [ 0.0, 100.0 ],
"varname" : "userFunction2"
}
@ -1070,8 +1205,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -1079,7 +1214,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-106",
@ -1215,11 +1376,17 @@
}
}
],
"originid" : "pat-3863"
]
}
,
"patching_rect" : [ 82.0, 1441.0, 95.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p dumpFunction"
}
@ -1238,6 +1405,7 @@
}
, {
"box" : {
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"candicane2" : [ 0.145098, 0.203922, 0.356863, 1.0 ],
"candicane3" : [ 0.290196, 0.411765, 0.713726, 1.0 ],
"candicane4" : [ 0.439216, 0.619608, 0.070588, 1.0 ],
@ -1255,10 +1423,11 @@
"patching_rect" : [ 320.0, 1282.0, 162.0, 52.0 ],
"peakcolor" : [ 0.498039, 0.498039, 0.498039, 1.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 172.0, 162.0, 52.0 ],
"presentation_rect" : [ 672.0, 64.0, 162.0, 52.0 ],
"setminmax" : [ 0.0, 127.0 ],
"settype" : 0,
"size" : 50,
"slidercolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "userWave4"
}
@ -1277,6 +1446,7 @@
}
, {
"box" : {
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"candicane2" : [ 0.145098, 0.203922, 0.356863, 1.0 ],
"candicane3" : [ 0.290196, 0.411765, 0.713726, 1.0 ],
"candicane4" : [ 0.439216, 0.619608, 0.070588, 1.0 ],
@ -1295,10 +1465,11 @@
"patching_rect" : [ 320.0, 1185.0, 162.0, 52.0 ],
"peakcolor" : [ 0.498039, 0.498039, 0.498039, 1.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 172.0, 162.0, 52.0 ],
"presentation_rect" : [ 460.0, 64.0, 162.0, 52.0 ],
"setminmax" : [ 0.0, 127.0 ],
"settype" : 0,
"size" : 50,
"slidercolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "userWave3"
}
@ -1363,6 +1534,15 @@
}
, {
"box" : {
"bgfillcolor_angle" : 270.0,
"bgfillcolor_autogradient" : 0.0,
"bgfillcolor_color" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_color1" : [ 1.0, 1.0, 1.0, 1.0 ],
"bgfillcolor_color2" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_proportion" : 0.5,
"bgfillcolor_type" : "gradient",
"color" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"elementcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"id" : "obj-96",
"items" : [ "free", "draw", "wave", ",", "function", "wave" ],
"maxclass" : "umenu",
@ -1372,7 +1552,8 @@
"parameter_enable" : 0,
"patching_rect" : [ 844.0, 1185.0, 106.0, 22.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 148.0, 106.0, 22.0 ],
"presentation_rect" : [ 673.0, 40.0, 106.0, 22.0 ],
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "umenu[3]"
}
@ -1391,6 +1572,15 @@
}
, {
"box" : {
"bgfillcolor_angle" : 270.0,
"bgfillcolor_autogradient" : 0.0,
"bgfillcolor_color" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_color1" : [ 1.0, 1.0, 1.0, 1.0 ],
"bgfillcolor_color2" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_proportion" : 0.5,
"bgfillcolor_type" : "gradient",
"color" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"elementcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"id" : "obj-91",
"items" : [ "free", "draw", "wave", ",", "function", "wave" ],
"maxclass" : "umenu",
@ -1400,7 +1590,8 @@
"parameter_enable" : 0,
"patching_rect" : [ 735.0, 1185.0, 106.0, 22.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 148.0, 106.0, 22.0 ],
"presentation_rect" : [ 459.666666666666629, 40.0, 106.0, 22.0 ],
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "umenu[2]"
}
@ -1419,6 +1610,15 @@
}
, {
"box" : {
"bgfillcolor_angle" : 270.0,
"bgfillcolor_autogradient" : 0.0,
"bgfillcolor_color" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_color1" : [ 1.0, 1.0, 1.0, 1.0 ],
"bgfillcolor_color2" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_proportion" : 0.5,
"bgfillcolor_type" : "gradient",
"color" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"elementcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"id" : "obj-88",
"items" : [ "free", "draw", "wave", ",", "function", "wave" ],
"maxclass" : "umenu",
@ -1428,7 +1628,8 @@
"parameter_enable" : 0,
"patching_rect" : [ 626.0, 1185.0, 106.0, 22.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 36.0, 106.0, 22.0 ],
"presentation_rect" : [ 246.333333333333314, 40.0, 106.0, 22.0 ],
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "umenu[1]"
}
@ -1455,8 +1656,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -1464,7 +1665,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-12",
@ -1729,11 +1956,17 @@
}
}
],
"originid" : "pat-3865"
]
}
,
"patching_rect" : [ 517.0, 1267.0, 129.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p toggle-wave-function"
}
@ -1753,6 +1986,15 @@
}
, {
"box" : {
"bgfillcolor_angle" : 270.0,
"bgfillcolor_autogradient" : 0.0,
"bgfillcolor_color" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_color1" : [ 1.0, 1.0, 1.0, 1.0 ],
"bgfillcolor_color2" : [ 0.847058823529412, 0.847058823529412, 0.847058823529412, 1.0 ],
"bgfillcolor_proportion" : 0.5,
"bgfillcolor_type" : "gradient",
"color" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"elementcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"id" : "obj-3",
"items" : [ "free", "draw", "wave", ",", "function", "wave" ],
"maxclass" : "umenu",
@ -1762,7 +2004,8 @@
"parameter_enable" : 0,
"patching_rect" : [ 517.0, 1185.0, 106.0, 22.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 36.0, 106.0, 22.0 ],
"presentation_rect" : [ 33.0, 40.0, 106.0, 22.0 ],
"textcolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "umenu"
}
@ -1817,8 +2060,10 @@
, {
"box" : {
"addpoints" : [ 0.0, 0.0, 0, 549.512830503443411, 0.0, 0, 549.512830503443411, 100.0, 0, 859.042553191489333, 0.0, 0, 916.534107099188191, 100.0, 0, 1000.0, 62.666666666666664, 0 ],
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"classic_curve" : 1,
"id" : "obj-7",
"linecolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"maxclass" : "function",
"numinlets" : 1,
"numoutlets" : 4,
@ -1827,7 +2072,7 @@
"parameter_enable" : 0,
"patching_rect" : [ 82.0, 1479.0, 159.5, 52.0 ],
"presentation" : 1,
"presentation_rect" : [ 17.0, 60.0, 159.5, 52.0 ],
"presentation_rect" : [ 33.0, 64.0, 159.5, 52.0 ],
"range" : [ 0.0, 100.0 ],
"varname" : "userFunction1"
}
@ -1886,6 +2131,7 @@
}
, {
"box" : {
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"candicane2" : [ 0.145098, 0.203922, 0.356863, 1.0 ],
"candicane3" : [ 0.290196, 0.411765, 0.713726, 1.0 ],
"candicane4" : [ 0.439216, 0.619608, 0.070588, 1.0 ],
@ -1903,10 +2149,11 @@
"patching_rect" : [ 144.0, 1282.0, 162.0, 52.0 ],
"peakcolor" : [ 0.498039, 0.498039, 0.498039, 1.0 ],
"presentation" : 1,
"presentation_rect" : [ 192.0, 60.0, 162.0, 52.0 ],
"presentation_rect" : [ 246.0, 64.0, 162.0, 52.0 ],
"setminmax" : [ 0.0, 127.0 ],
"settype" : 0,
"size" : 50,
"slidercolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "userWave2"
}
@ -1921,8 +2168,8 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 9,
"minor" : 0,
"major" : 8,
"minor" : 6,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
@ -1930,7 +2177,33 @@
,
"classnamespace" : "box",
"rect" : [ 59.0, 119.0, 640.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
"gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
"gridsnaponopen" : 1,
"objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
"lefttoolbarpinned" : 0,
"toptoolbarpinned" : 0,
"righttoolbarpinned" : 0,
"bottomtoolbarpinned" : 0,
"toolbars_unpinned_last_save" : 0,
"tallnewobj" : 0,
"boxanimatetime" : 200,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"fontname" : "Arial",
@ -2049,11 +2322,17 @@
}
}
],
"originid" : "pat-3867"
]
}
,
"patching_rect" : [ 619.0, 89.0, 66.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
"globalpatchername" : "",
"tags" : ""
}
,
"text" : "p transport"
}
@ -2108,6 +2387,7 @@
}
, {
"box" : {
"bgcolor" : [ 0.968627450980392, 0.968627450980392, 0.968627450980392, 1.0 ],
"candicane2" : [ 0.145098, 0.203922, 0.356863, 1.0 ],
"candicane3" : [ 0.290196, 0.411765, 0.713726, 1.0 ],
"candicane4" : [ 0.439216, 0.619608, 0.070588, 1.0 ],
@ -2126,10 +2406,11 @@
"patching_rect" : [ 144.0, 1185.0, 162.0, 52.0 ],
"peakcolor" : [ 0.498039, 0.498039, 0.498039, 1.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 60.0, 162.0, 52.0 ],
"presentation_rect" : [ 33.0, 64.0, 162.0, 52.0 ],
"setminmax" : [ 0.0, 127.0 ],
"settype" : 0,
"size" : 50,
"slidercolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"varname" : "userWave1"
}
@ -2308,7 +2589,6 @@
}
, {
"box" : {
"disablefind" : 0,
"id" : "obj-2",
"maxclass" : "jweb",
"numinlets" : 1,
@ -2316,11 +2596,30 @@
"outlettype" : [ "" ],
"patching_rect" : [ 397.0, 210.0, 838.631580829620361, 368.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 247.0, 838.631580829620361, 368.0 ],
"presentation_rect" : [ 16.0, 139.0, 839.0, 474.0 ],
"rendermode" : 0,
"url" : "file://lfogui.html"
}
}
, {
"box" : {
"angle" : 270.0,
"background" : 1,
"bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"border" : 1,
"bordercolor" : [ 0.254901960784314, 0.411764705882353, 0.882352941176471, 1.0 ],
"id" : "obj-9",
"maxclass" : "panel",
"mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 541.5, 393.5, 128.0, 128.0 ],
"presentation" : 1,
"presentation_rect" : [ 16.0, 8.0, 839.0, 130.0 ],
"proportion" : 0.5
}
}
],
"lines" : [ {
@ -3249,7 +3548,6 @@
}
],
"originid" : "pat-3855",
"parameters" : {
"obj-25" : [ "dict", "dict", 0 ],
"parameterbanks" : {
@ -3265,7 +3563,8 @@
}
,
"dependency_cache" : [ ],
"autosave" : 0
"autosave" : 0,
"bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
}
}

View File

@ -27,8 +27,7 @@ body {
height: 100%;
margin: 0px;
border: 0;
overflow-x: hidden;
/* no horizontal scrollbar*/
overflow-x: scroll;
overflow-y: scroll;
display: block;
/* No floating content on sides */
@ -77,12 +76,17 @@ td button {
/* table */
table {
overflow: scroll;
margin: 1em;
padding: 0em;
border-collapse: collapse;
background-color: lightsteelblue;
}
/* points datacells should have a min-width*/
.enum-count {
min-width: 5.6em;
}
th {
padding: 0.4em 0.3em;
text-align: left;
@ -90,18 +94,26 @@ th {
thead {
color: white;
background-color: royalblue;
background-color: var(--active);
}
tr, td {
tr,
td {
margin: 0em;
}
td:last-child {
white-space: nowrap;
overflow: hidden;
padding: 0;
}
/* input types */
/* dropdown list */
select {
width: 100%;
}
/*
option, select>* {
font-size: 0.8em !important;
@ -113,12 +125,14 @@ option, select>* {
option {
background-color: var(--active);
}
option:not(:checked) {
background-color: white;
}
/* input */
input, select {
input,
select {
border: 1px solid var(--active);
color: var(--active);
margin: 0;
@ -128,6 +142,11 @@ input, select {
box-sizing: border-box;
}
input {
padding-left: 5px;
/*slight padding on left*/
}
input[type=number] {
width: 50px;
}
@ -249,6 +268,8 @@ h5 {
font-size: small;
margin-left: 2px;
margin-top: 5px;
display: none;
/*hide*/
}

View File

@ -30,7 +30,7 @@ const LockModes = Object.freeze({
var modPhases = Array(MAXLFOS).fill(0);
var firstUpdateTime = Date.now();
const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center"];
const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center", "result", "", ""];
const ENUMERATORLABELS = ["inst", "parameter", "# points"];