From: equilet Date: Thu, 24 May 2018 01:13:17 +0000 (-0500) Subject: fixed bug with phase offset recall, added pattr support for missing params, updated... X-Git-Url: https://git.dabkitsch.com/?a=commitdiff_plain;h=ac9ddf48b0778775d4765a3d7e09ede9b87545f9;p=zeropointnine.git fixed bug with phase offset recall, added pattr support for missing params, updated preset --- diff --git a/max/_zpn_server.maxpat b/max/_zpn_server.maxpat index 516d83b..f998e67 100644 --- a/max/_zpn_server.maxpat +++ b/max/_zpn_server.maxpat @@ -9,7 +9,7 @@ "modernui" : 1 } , - "rect" : [ 26.0, 52.0, 735.0, 780.0 ], + "rect" : [ 24.0, 59.0, 735.0, 780.0 ], "bgcolor" : [ 0.19013, 0.597306, 0.711914, 1.0 ], "bglocked" : 0, "openinpresentation" : 0, @@ -65,7 +65,7 @@ "numoutlets" : 1, "offset" : [ -8.0, -9.0 ], "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 387.0, 31.0, 301.0, 600.0 ], + "patching_rect" : [ 402.0, 16.0, 301.0, 600.0 ], "varname" : "parameter_interface", "viewvisibility" : 1 } @@ -144,7 +144,7 @@ "patching_rect" : [ 8.0, 660.0, 137.0, 22.0 ], "style" : "", "text" : "autopattr @autoname 0", - "varname" : "u169001208" + "varname" : "u359004078" } } @@ -261,7 +261,7 @@ "outlettype" : [ "" ], "patching_rect" : [ 19.0, 750.0, 47.0, 20.0 ], "style" : "", - "text" : "store 1" + "text" : "1" } } @@ -993,7 +993,7 @@ "outlettype" : [ "" ], "patching_rect" : [ 308.0, 688.0, 195.0, 35.0 ], "saved_object_attributes" : { - "client_rect" : [ 1032, 147, 1745, 894 ], + "client_rect" : [ 654, 45, 1367, 792 ], "parameter_enable" : 0, "storage_rect" : [ 583, 69, 1034, 197 ] } @@ -2011,10 +2011,6 @@ "name" : "o.select.mxo", "type" : "iLaX" } -, { - "name" : "o.union.mxo", - "type" : "iLaX" - } , { "name" : "o.collect.mxo", "type" : "iLaX" @@ -2027,6 +2023,10 @@ "name" : "o.expr.codebox.mxo", "type" : "iLaX" } +, { + "name" : "o.union.mxo", + "type" : "iLaX" + } , { "name" : "o.prepend.mxo", "type" : "iLaX" diff --git a/max/lib_audiorate/zpn_servermodule~.maxpat b/max/lib_audiorate/zpn_servermodule~.maxpat index f544922..392c710 100644 --- a/max/lib_audiorate/zpn_servermodule~.maxpat +++ b/max/lib_audiorate/zpn_servermodule~.maxpat @@ -9,7 +9,7 @@ "modernui" : 1 } , - "rect" : [ 100.0, 150.0, 1213.0, 531.0 ], + "rect" : [ 100.0, 150.0, 1305.0, 556.0 ], "bglocked" : 0, "openinpresentation" : 1, "default_fontsize" : 12.0, @@ -135,12 +135,13 @@ "fontface" : 0, "fontsize" : 11.0, "id" : "obj-42", + "linecount" : 2, "maxclass" : "o.expr.codebox", "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "FullPacket", "FullPacket" ], - "patching_rect" : [ 1021.333374, 266.5, 138.0, 31.0 ], - "text" : "/freq = /freq / 15." + "patching_rect" : [ 1064.333374, 276.5, 138.0, 43.0 ], + "text" : "/freq ??= 0.4, \n/freq = /freq / 15." } } @@ -175,7 +176,7 @@ , "style" : "", "text" : "autopattr @autoname 0", - "varname" : "u169003522" + "varname" : "u792004688" } } @@ -602,7 +603,7 @@ "maxclass" : "newobj", "numinlets" : 1, "numoutlets" : 3, - "outlettype" : [ "signal", "", "FullPacket" ], + "outlettype" : [ "signal", "", "" ], "patching_rect" : [ 894.333374, 197.0, 79.0, 22.0 ], "style" : "", "text" : "zpn_slipper~", @@ -1512,10 +1513,6 @@ "name" : "o.select.mxo", "type" : "iLaX" } -, { - "name" : "o.union.mxo", - "type" : "iLaX" - } , { "name" : "o.collect.mxo", "type" : "iLaX" diff --git a/max/lib_audiorate/zpn_slipper~.maxpat b/max/lib_audiorate/zpn_slipper~.maxpat index 1ef7e8f..4d4360d 100644 --- a/max/lib_audiorate/zpn_slipper~.maxpat +++ b/max/lib_audiorate/zpn_slipper~.maxpat @@ -48,19 +48,6 @@ "text" : "t l l" } - } -, { - "box" : { - "id" : "obj-20", - "maxclass" : "newobj", - "numinlets" : 2, - "numoutlets" : 1, - "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 614.0, 405.0, 50.0, 22.0 ], - "style" : "", - "text" : "o.union" - } - } , { "box" : { @@ -96,7 +83,6 @@ "numoutlets" : 2, "outlettype" : [ "signal", "bang" ], "patching_rect" : [ 446.5, 300.0, 49.0, 22.0 ], - "presentation_rect" : [ 450.0, 308.0, 0.0, 0.0 ], "style" : "", "text" : "line~ 0." } @@ -110,7 +96,6 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 446.5, 270.0, 41.0, 22.0 ], - "presentation_rect" : [ 450.0, 263.0, 0.0, 0.0 ], "style" : "", "text" : "$1 50" } @@ -124,7 +109,6 @@ "numoutlets" : 1, "outlettype" : [ "signal" ], "patching_rect" : [ 112.5, 405.0, 116.5, 22.0 ], - "presentation_rect" : [ 303.5, 353.0, 0.0, 0.0 ], "style" : "", "text" : "*~ 0." } @@ -142,19 +126,6 @@ "style" : "" } - } -, { - "box" : { - "id" : "obj-6", - "maxclass" : "newobj", - "numinlets" : 1, - "numoutlets" : 2, - "outlettype" : [ "", "FullPacket" ], - "patching_rect" : [ 645.0, 360.0, 79.0, 22.0 ], - "style" : "", - "text" : "o.select /freq" - } - } , { "box" : { @@ -372,7 +343,7 @@ } , { "patchline" : { - "destination" : [ "obj-20", 0 ], + "destination" : [ "obj-9", 0 ], "source" : [ "obj-17", 0 ] } @@ -393,24 +364,17 @@ } , { "patchline" : { - "destination" : [ "obj-9", 0 ], - "source" : [ "obj-20", 0 ] + "destination" : [ "obj-8", 0 ], + "source" : [ "obj-21", 0 ] } } , { "patchline" : { - "destination" : [ "obj-6", 0 ], + "destination" : [ "obj-9", 0 ], "source" : [ "obj-21", 1 ] } - } -, { - "patchline" : { - "destination" : [ "obj-8", 0 ], - "source" : [ "obj-21", 0 ] - } - } , { "patchline" : { @@ -432,13 +396,6 @@ "source" : [ "obj-5", 0 ] } - } -, { - "patchline" : { - "destination" : [ "obj-20", 1 ], - "source" : [ "obj-6", 0 ] - } - } , { "patchline" : { @@ -501,14 +458,6 @@ "name" : "o.route.mxo", "type" : "iLaX" } -, { - "name" : "o.select.mxo", - "type" : "iLaX" - } -, { - "name" : "o.union.mxo", - "type" : "iLaX" - } ], "autosave" : 0, "bgfillcolor_type" : "gradient", diff --git a/max/util/parameter_interface.maxpat b/max/util/parameter_interface.maxpat index a51afc6..3c60835 100644 --- a/max/util/parameter_interface.maxpat +++ b/max/util/parameter_interface.maxpat @@ -44,7 +44,7 @@ "numoutlets" : 0, "patching_rect" : [ 572.0, 422.56604, 159.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 381.759705, 159.0, 20.0 ], + "presentation_rect" : [ 92.0, 381.642395, 159.0, 20.0 ], "style" : "", "text" : "/client*/hover/slip/scale/max", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -62,9 +62,9 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 422.56604, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 381.759705, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 381.642395, 50.0, 22.0 ], "style" : "", - "varname" : "all_slip_max[1]" + "varname" : "slip_scale_max" } } @@ -87,9 +87,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 840.0, 510.904175, 215.0, 20.0 ], + "patching_rect" : [ 572.0, 472.345367, 215.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 575.770813, 215.0, 20.0 ], + "presentation_rect" : [ 92.0, 405.877014, 215.0, 20.0 ], "style" : "", "text" : "/client*/hover/slip/phase/offset/max/ms", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -105,11 +105,11 @@ "numoutlets" : 2, "outlettype" : [ "", "bang" ], "parameter_enable" : 0, - "patching_rect" : [ 788.0, 509.014526, 50.0, 22.0 ], + "patching_rect" : [ 520.0, 470.455719, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 575.770813, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 405.877014, 50.0, 22.0 ], "style" : "", - "varname" : "migrate_m2_min[3]" + "varname" : "slip_phase_offset_max" } } @@ -120,7 +120,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 788.0, 532.904175, 254.0, 22.0 ], + "patching_rect" : [ 520.0, 494.345367, 254.0, 22.0 ], "style" : "", "text" : "o.pack /client*/hover/slip/phase/offset/max/ms" } @@ -134,7 +134,7 @@ "numoutlets" : 0, "patching_rect" : [ 840.0, 463.014526, 185.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 551.519409, 185.0, 20.0 ], + "presentation_rect" : [ 92.0, 575.519409, 185.0, 20.0 ], "style" : "", "text" : "/client*/gesture/summon/m2/max", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -147,9 +147,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 840.0, 413.345428, 185.0, 20.0 ], + "patching_rect" : [ 840.0, 413.345428, 182.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 527.268066, 185.0, 20.0 ], + "presentation_rect" : [ 92.0, 551.28479, 185.0, 20.0 ], "style" : "", "text" : "/client*/gesture/summon/m2/min", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -167,9 +167,9 @@ "parameter_enable" : 0, "patching_rect" : [ 788.0, 413.345428, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 527.268066, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 551.28479, 50.0, 22.0 ], "style" : "", - "varname" : "migrate_m1_freq[2]" + "varname" : "summon_m2_min" } } @@ -180,7 +180,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 788.0, 437.235138, 222.0, 22.0 ], + "patching_rect" : [ 788.0, 437.235138, 221.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/summon/m2/min" } @@ -197,9 +197,9 @@ "parameter_enable" : 0, "patching_rect" : [ 788.0, 461.124847, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 551.519409, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 575.519409, 50.0, 22.0 ], "style" : "", - "varname" : "migrate_m2_min[2]" + "varname" : "summon_m2_max" } } @@ -210,7 +210,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 788.0, 485.014526, 225.0, 22.0 ], + "patching_rect" : [ 788.0, 485.014526, 224.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/summon/m2/max" } @@ -224,7 +224,7 @@ "numoutlets" : 0, "patching_rect" : [ 840.0, 364.227875, 185.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 503.016663, 185.0, 20.0 ], + "presentation_rect" : [ 92.0, 527.050171, 185.0, 20.0 ], "style" : "", "text" : "/client*/gesture/summon/m1/max", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -237,9 +237,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 840.0, 314.558777, 181.0, 20.0 ], + "patching_rect" : [ 840.0, 314.558777, 182.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 478.765259, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 502.815521, 181.0, 20.0 ], "style" : "", "text" : "/client*/gesture/summon/m1/min", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -257,9 +257,9 @@ "parameter_enable" : 0, "patching_rect" : [ 788.0, 314.558777, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 478.765259, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 502.815521, 50.0, 22.0 ], "style" : "", - "varname" : "migrate_m1_freq[1]" + "varname" : "summon_m1_min" } } @@ -287,9 +287,9 @@ "parameter_enable" : 0, "patching_rect" : [ 788.0, 362.338196, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 503.016663, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 527.050171, 50.0, 22.0 ], "style" : "", - "varname" : "migrate_m2_min[1]" + "varname" : "summon_m1_max" } } @@ -300,7 +300,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 788.0, 386.227875, 225.0, 22.0 ], + "patching_rect" : [ 788.0, 386.227875, 224.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/summon/m1/max" } @@ -312,9 +312,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 328.786652, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 328.786652, 167.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 333.256927, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 333.173126, 181.0, 20.0 ], "style" : "", "text" : "/client*/hover/migrate/m2/freq", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -327,9 +327,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 281.007263, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 281.007263, 169.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 309.005554, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 308.938507, 181.0, 20.0 ], "style" : "", "text" : "/client*/hover/migrate/m2/max", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -342,9 +342,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 233.227875, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 233.227875, 166.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 284.75415, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 284.703888, 181.0, 20.0 ], "style" : "", "text" : "/client*/hover/migrate/m2/min", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -357,9 +357,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 183.558777, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 183.558777, 167.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 260.502777, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 260.469269, 181.0, 20.0 ], "style" : "", "text" : "/client*/hover/migrate/m1/freq", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -372,9 +372,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 135.779404, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 135.779404, 169.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 236.418976, 181.0, 20.0 ], + "presentation_rect" : [ 92.0, 236.234634, 181.0, 20.0 ], "style" : "", "text" : "/client*/hover/migrate/m1/max", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -387,7 +387,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 88.0, 181.0, 20.0 ], + "patching_rect" : [ 572.0, 88.0, 166.0, 20.0 ], "presentation" : 1, "presentation_rect" : [ 92.0, 212.0, 181.0, 20.0 ], "style" : "", @@ -402,7 +402,7 @@ "maxclass" : "newobj", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 460.0, 666.0, 39.0, 22.0 ], + "patching_rect" : [ 404.0, 659.0, 39.0, 22.0 ], "style" : "", "text" : "s osc" } @@ -416,7 +416,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 530.0, 50.0, 316.0, 20.0 ], + "patching_rect" : [ 530.0, 50.0, 147.0, 20.0 ], "presentation" : 1, "presentation_rect" : [ 20.0, 188.38002, 145.0, 20.0 ], "style" : "", @@ -433,7 +433,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 210.0, 50.0, 163.0, 20.0 ], + "patching_rect" : [ 210.0, 50.0, 79.0, 20.0 ], "presentation" : 1, "presentation_rect" : [ 16.5, 12.69001, 163.0, 20.0 ], "style" : "", @@ -453,7 +453,7 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 326.896973, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 333.256927, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 333.173126, 50.0, 22.0 ], "style" : "", "varname" : "migrate_m2_freq" } @@ -466,7 +466,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 520.0, 350.786652, 208.0, 22.0 ], + "patching_rect" : [ 520.0, 350.786652, 206.0, 22.0 ], "style" : "", "text" : "o.pack /client*/hover/migrate/m2/freq" } @@ -483,7 +483,7 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 183.558777, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 260.502777, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 260.469269, 50.0, 22.0 ], "style" : "", "varname" : "migrate_m1_freq" } @@ -508,9 +508,9 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 374.676361, 159.0, 20.0 ], + "patching_rect" : [ 572.0, 374.676361, 155.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 357.508331, 159.0, 20.0 ], + "presentation_rect" : [ 92.0, 357.407776, 159.0, 20.0 ], "style" : "", "text" : "/client*/hover/slip/scale/min", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -535,13 +535,12 @@ , { "box" : { "id" : "obj-34", - "linecount" : 2, "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 570.014526, 169.0, 33.0 ], + "patching_rect" : [ 572.0, 617.014526, 197.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 454.513885, 197.0, 20.0 ], + "presentation_rect" : [ 92.0, 478.580902, 197.0, 20.0 ], "style" : "", "text" : "/client*/gesture/openclose/gain/fold", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -551,13 +550,12 @@ , { "box" : { "id" : "obj-33", - "linecount" : 2, "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 522.235107, 177.0, 33.0 ], + "patching_rect" : [ 572.0, 569.235107, 205.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 430.262482, 205.0, 20.0 ], + "presentation_rect" : [ 92.0, 454.346283, 205.0, 20.0 ], "style" : "", "text" : "/client*/gesture/openclose/modulator", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -567,13 +565,12 @@ , { "box" : { "id" : "obj-31", - "linecount" : 2, "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 572.0, 474.345428, 133.0, 33.0 ], + "patching_rect" : [ 572.0, 521.345459, 161.0, 20.0 ], "presentation" : 1, - "presentation_rect" : [ 92.0, 406.011108, 161.0, 20.0 ], + "presentation_rect" : [ 92.0, 430.111633, 161.0, 20.0 ], "style" : "", "text" : "/client*/gesture/openclose/f0", "textcolor" : [ 1.0, 1.0, 1.0, 1.0 ] @@ -586,7 +583,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 242.0, 301.62738, 210.0, 20.0 ], + "patching_rect" : [ 242.0, 301.62738, 185.0, 20.0 ], "presentation" : 1, "presentation_rect" : [ 88.5, 130.849976, 210.0, 20.0 ], "style" : "", @@ -601,7 +598,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 242.0, 247.27272, 210.0, 20.0 ], + "patching_rect" : [ 242.0, 247.27272, 201.0, 20.0 ], "presentation" : 1, "presentation_rect" : [ 88.5, 107.30999, 210.0, 20.0 ], "style" : "", @@ -666,7 +663,7 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 135.779404, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 236.251389, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 236.234634, 50.0, 22.0 ], "style" : "", "varname" : "migrate_m1_max" } @@ -726,7 +723,7 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 279.117554, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 309.005554, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 308.938507, 50.0, 22.0 ], "style" : "", "varname" : "migrate_m2_max" } @@ -779,27 +776,33 @@ "outlettype" : [ "", "", "", "" ], "patching_rect" : [ 41.0, 30.0, 137.0, 22.0 ], "restore" : { - "all_gain_fold" : [ 0.0 ], - "all_migrate" : [ 87 ], - "all_modulator" : [ 0.0 ], - "all_openclose_f0" : [ 0.0 ], - "all_poke" : [ 74 ], - "all_slip" : [ 86 ], - "all_slip_max" : [ 0.0 ], - "all_summon" : [ 93 ], - "all_swipe" : [ 0 ], - "all_warp" : [ 65 ], + "gain_migrate" : [ 87 ], + "gain_poke" : [ 74 ], + "gain_slip" : [ 86 ], + "gain_summon" : [ 93 ], + "gain_swipe" : [ 0 ], + "gain_warp" : [ 65 ], "migrate_m1_freq" : [ 0.0 ], "migrate_m1_max" : [ 0.0 ], "migrate_m1_min" : [ 0.0 ], "migrate_m2_freq" : [ 0.0 ], "migrate_m2_max" : [ 0.0 ], - "migrate_m2_min" : [ 0.0 ] + "migrate_m2_min" : [ 0.0 ], + "slip_phase_offset_max" : [ 0.0 ], + "slip_scale_max" : [ 0.0 ], + "slip_scale_min" : [ 0.0 ], + "summon_m1_max" : [ 0.0 ], + "summon_m1_min" : [ 0.0 ], + "summon_m2_max" : [ 0.0 ], + "summon_m2_min" : [ 0.0 ], + "warp_f0" : [ 0.0 ], + "warp_gain_fold" : [ 0.0 ], + "warp_modulator" : [ 0.0 ] } , "style" : "", "text" : "autopattr @autoname 0", - "varname" : "u771006196" + "varname" : "u704003298" } } @@ -814,7 +817,7 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 231.338181, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 284.75415, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 284.703888, 50.0, 22.0 ], "style" : "", "varname" : "migrate_m2_min" } @@ -1231,11 +1234,11 @@ "numoutlets" : 2, "outlettype" : [ "", "bang" ], "parameter_enable" : 0, - "patching_rect" : [ 520.0, 520.235107, 50.0, 22.0 ], + "patching_rect" : [ 520.0, 567.235107, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 430.262482, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 454.346283, 50.0, 22.0 ], "style" : "", - "varname" : "all_modulator" + "varname" : "warp_modulator" } } @@ -1246,7 +1249,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 520.0, 544.124817, 241.0, 22.0 ], + "patching_rect" : [ 520.0, 591.124817, 243.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/openclose/modulator" } @@ -1261,11 +1264,11 @@ "numoutlets" : 2, "outlettype" : [ "", "bang" ], "parameter_enable" : 0, - "patching_rect" : [ 520.0, 568.014526, 50.0, 22.0 ], + "patching_rect" : [ 520.0, 615.014526, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 454.513885, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 478.580902, 50.0, 22.0 ], "style" : "", - "varname" : "all_gain_fold" + "varname" : "warp_gain_fold" } } @@ -1276,7 +1279,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 520.0, 591.904236, 233.0, 22.0 ], + "patching_rect" : [ 520.0, 638.904236, 235.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/openclose/gain/fold" } @@ -1291,11 +1294,11 @@ "numoutlets" : 2, "outlettype" : [ "", "bang" ], "parameter_enable" : 0, - "patching_rect" : [ 520.0, 472.45575, 50.0, 22.0 ], + "patching_rect" : [ 520.0, 519.45575, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 406.011108, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 430.111633, 50.0, 22.0 ], "style" : "", - "varname" : "all_openclose_f0" + "varname" : "warp_f0" } } @@ -1306,7 +1309,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "FullPacket" ], - "patching_rect" : [ 520.0, 496.345428, 198.0, 22.0 ], + "patching_rect" : [ 520.0, 543.345459, 200.0, 22.0 ], "style" : "", "text" : "o.pack /client*/gesture/openclose/f0" } @@ -1323,9 +1326,9 @@ "parameter_enable" : 0, "patching_rect" : [ 520.0, 374.676361, 50.0, 22.0 ], "presentation" : 1, - "presentation_rect" : [ 40.0, 357.508331, 50.0, 22.0 ], + "presentation_rect" : [ 40.0, 357.407776, 50.0, 22.0 ], "style" : "", - "varname" : "all_slip_max" + "varname" : "slip_scale_min" } } @@ -1356,7 +1359,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 154.389984, 50.0, 22.0 ], "style" : "", - "varname" : "all_slip" + "varname" : "gain_slip" } } @@ -1387,7 +1390,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 130.849976, 50.0, 22.0 ], "style" : "", - "varname" : "all_migrate" + "varname" : "gain_migrate" } } @@ -1418,7 +1421,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 107.30999, 50.0, 22.0 ], "style" : "", - "varname" : "all_summon" + "varname" : "gain_summon" } } @@ -1449,7 +1452,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 83.769997, 50.0, 22.0 ], "style" : "", - "varname" : "all_warp" + "varname" : "gain_warp" } } @@ -1480,7 +1483,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 60.230003, 50.0, 22.0 ], "style" : "", - "varname" : "all_swipe" + "varname" : "gain_swipe" } } @@ -1511,7 +1514,7 @@ "presentation" : 1, "presentation_rect" : [ 36.5, 36.69001, 50.0, 22.0 ], "style" : "", - "varname" : "all_poke" + "varname" : "gain_poke" } } @@ -1561,7 +1564,7 @@ "numoutlets" : 0, "patching_rect" : [ 840.0, 106.669083, 128.0, 128.0 ], "presentation" : 1, - "presentation_rect" : [ 10.0, 181.985901, 298.5, 424.380005 ], + "presentation_rect" : [ 10.0, 183.580811, 298.5, 424.380005 ], "proportion" : 0.39, "rounded" : 32, "style" : "" @@ -1570,134 +1573,6 @@ } ], "lines" : [ { - "patchline" : { - "destination" : [ "obj-10", 0 ], - "order" : 9, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-101", 0 ], - "order" : 13, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-103", 0 ], - "order" : 12, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-105", 0 ], - "order" : 11, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-107", 0 ], - "order" : 10, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-24", 0 ], - "order" : 0, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-30", 0 ], - "order" : 3, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-32", 0 ], - "order" : 6, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-37", 0 ], - "order" : 1, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-40", 0 ], - "order" : 7, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-42", 0 ], - "order" : 4, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-5", 0 ], - "order" : 2, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-6", 0 ], - "order" : 5, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-8", 0 ], - "order" : 8, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-98", 0 ], - "order" : 15, - "source" : [ "obj-1", 0 ] - } - - } -, { - "patchline" : { - "destination" : [ "obj-99", 0 ], - "order" : 14, - "source" : [ "obj-1", 0 ] - } - - } -, { "patchline" : { "destination" : [ "obj-12", 0 ], "source" : [ "obj-10", 0 ] diff --git a/max/zpn_presets.json b/max/zpn_presets.json index 7c044af..51fbe94 100644 --- a/max/zpn_presets.json +++ b/max/zpn_presets.json @@ -23,22 +23,28 @@ "client3::tog_slip" : [ 0 ], "client3::tog_summon" : [ 0 ], "client3::tog_swipe" : [ 0 ], - "parameter_interface::all_gain_fold" : [ 22.0 ], - "parameter_interface::all_migrate" : [ 0 ], - "parameter_interface::all_modulator" : [ 0.0 ], - "parameter_interface::all_openclose_f0" : [ 137.5 ], - "parameter_interface::all_poke" : [ 0 ], - "parameter_interface::all_slip" : [ 0 ], - "parameter_interface::all_slip_max" : [ 25.0 ], - "parameter_interface::all_summon" : [ 0 ], - "parameter_interface::all_swipe" : [ 0 ], - "parameter_interface::all_warp" : [ 0 ], + "parameter_interface::gain_migrate" : [ 0 ], + "parameter_interface::gain_poke" : [ 0 ], + "parameter_interface::gain_slip" : [ 0 ], + "parameter_interface::gain_summon" : [ 0 ], + "parameter_interface::gain_swipe" : [ 0 ], + "parameter_interface::gain_warp" : [ 0 ], "parameter_interface::migrate_m1_freq" : [ 0.1 ], "parameter_interface::migrate_m1_max" : [ 8.0 ], "parameter_interface::migrate_m1_min" : [ 0.0 ], "parameter_interface::migrate_m2_freq" : [ 0.3 ], "parameter_interface::migrate_m2_max" : [ 8.0 ], - "parameter_interface::migrate_m2_min" : [ 0.0 ] + "parameter_interface::migrate_m2_min" : [ 0.0 ], + "parameter_interface::slip_phase_offset_max" : [ 10.0 ], + "parameter_interface::slip_scale_max" : [ 240.0 ], + "parameter_interface::slip_scale_min" : [ 25.0 ], + "parameter_interface::summon_m1_max" : [ 8.0 ], + "parameter_interface::summon_m1_min" : [ 0.0 ], + "parameter_interface::summon_m2_max" : [ 8.0 ], + "parameter_interface::summon_m2_min" : [ 0.0 ], + "parameter_interface::warp_f0" : [ 137.5 ], + "parameter_interface::warp_gain_fold" : [ 22.0 ], + "parameter_interface::warp_modulator" : [ 12.0 ] } } @@ -64,22 +70,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } } @@ -105,22 +117,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } } @@ -146,22 +164,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } } @@ -187,22 +211,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } } @@ -228,22 +258,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } } @@ -269,22 +305,28 @@ "client3::tog_slip" : [ ], "client3::tog_summon" : [ ], "client3::tog_swipe" : [ ], - "parameter_interface::all_gain_fold" : [ ], - "parameter_interface::all_migrate" : [ ], - "parameter_interface::all_modulator" : [ ], - "parameter_interface::all_openclose_f0" : [ ], - "parameter_interface::all_poke" : [ ], - "parameter_interface::all_slip" : [ ], - "parameter_interface::all_slip_max" : [ ], - "parameter_interface::all_summon" : [ ], - "parameter_interface::all_swipe" : [ ], - "parameter_interface::all_warp" : [ ], + "parameter_interface::gain_migrate" : [ ], + "parameter_interface::gain_poke" : [ ], + "parameter_interface::gain_slip" : [ ], + "parameter_interface::gain_summon" : [ ], + "parameter_interface::gain_swipe" : [ ], + "parameter_interface::gain_warp" : [ ], "parameter_interface::migrate_m1_freq" : [ ], "parameter_interface::migrate_m1_max" : [ ], "parameter_interface::migrate_m1_min" : [ ], "parameter_interface::migrate_m2_freq" : [ ], "parameter_interface::migrate_m2_max" : [ ], - "parameter_interface::migrate_m2_min" : [ ] + "parameter_interface::migrate_m2_min" : [ ], + "parameter_interface::slip_phase_offset_max" : [ ], + "parameter_interface::slip_scale_max" : [ ], + "parameter_interface::slip_scale_min" : [ ], + "parameter_interface::summon_m1_max" : [ ], + "parameter_interface::summon_m1_min" : [ ], + "parameter_interface::summon_m2_max" : [ ], + "parameter_interface::summon_m2_min" : [ ], + "parameter_interface::warp_f0" : [ ], + "parameter_interface::warp_gain_fold" : [ ], + "parameter_interface::warp_modulator" : [ ] } }