Commit 474801bb authored by maybites's avatar maybites
Browse files

updated ultragrid and osc GUI

parent 8ef6804a
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 764.0, 385.0, 676.0, 480.0 ],
"rect" : [ 338.0, 346.0, 676.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -250,7 +250,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 585.75, 324.0, 121.0, 22.0 ],
"patching_rect" : [ 585.75, 318.0, 121.0, 22.0 ],
"text" : "textcolor $1 $2 $3 $4"
}
......@@ -262,7 +262,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 543.0, 294.0, 121.0, 22.0 ],
"patching_rect" : [ 538.5, 286.0, 121.0, 22.0 ],
"text" : "textcolor $1 $2 $3 $4"
}
......@@ -274,7 +274,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 414.0, 409.0, 55.0, 22.0 ],
"patching_rect" : [ 433.0, 409.0, 55.0, 22.0 ],
"text" : "hidden 1"
}
......@@ -298,7 +298,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 623.75, 352.0, 123.0, 22.0 ],
"patching_rect" : [ 381.75, 383.0, 123.0, 22.0 ],
"text" : "sprintf symout %s fps"
}
......@@ -310,7 +310,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 623.75, 376.0, 45.0, 22.0 ],
"patching_rect" : [ 381.75, 407.0, 45.0, 22.0 ],
"text" : "hint $1"
}
......@@ -375,7 +375,7 @@
"numoutlets" : 2,
"outlettype" : [ "", "bang" ],
"parameter_enable" : 0,
"patching_rect" : [ 450.0, 474.0, 35.0, 13.0 ],
"patching_rect" : [ 433.0, 472.0, 35.0, 13.0 ],
"presentation" : 1,
"presentation_rect" : [ 0.0, 0.0, 17.0, 13.0 ],
"textcolor" : [ 0.0, 0.5, 0.265625, 1.0 ],
......@@ -414,7 +414,7 @@
"numinlets" : 3,
"numoutlets" : 3,
"outlettype" : [ "", "", "" ],
"patching_rect" : [ 382.0, 151.0, 137.0, 22.0 ],
"patching_rect" : [ 382.0, 155.0, 137.0, 22.0 ],
"text" : "route colorON colorOFF"
}
......@@ -1426,7 +1426,7 @@
, {
"patchline" : {
"destination" : [ "obj-27", 0 ],
"order" : 1,
"order" : 0,
"source" : [ "obj-4", 5 ]
}
......@@ -1442,7 +1442,7 @@
, {
"patchline" : {
"destination" : [ "obj-36", 0 ],
"order" : 0,
"order" : 1,
"source" : [ "obj-4", 5 ]
}
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 118.0, 231.0, 416.0, 391.0 ],
"rect" : [ 56.0, 95.0, 416.0, 391.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -39,6 +39,19 @@
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-31",
"linecount" : 2,
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 29.0, 169.0, 69.0, 35.0 ],
"text" : "receiveR #1_pColor"
}
}
, {
"box" : {
"id" : "obj-26",
"maxclass" : "newobj",
......@@ -572,7 +585,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "int" ],
"patching_rect" : [ 168.0, 303.0, 19.0, 22.0 ],
"patching_rect" : [ 193.5, 339.0, 19.0, 22.0 ],
"text" : "t i"
}
......@@ -780,7 +793,7 @@
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 168.0, 465.0, 30.0, 30.0 ]
"patching_rect" : [ 193.5, 425.0, 30.0, 30.0 ]
}
}
......@@ -6085,6 +6098,22 @@
"usebgoncolor" : 1
}
}
, {
"box" : {
"angle" : 270.0,
"bgcolor" : [ 0.901960784313726, 0.901960784313726, 0.901960784313726, 1.0 ],
"id" : "obj-11",
"maxclass" : "panel",
"mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 29.0, 215.0, 95.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 324.0, 361.0 ],
"proportion" : 0.5
}
}
],
"lines" : [ {
......@@ -6267,6 +6296,13 @@
"source" : [ "obj-30", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-11", 0 ],
"source" : [ "obj-31", 0 ]
}
}
, {
"patchline" : {
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 226.0, 180.0, 268.0, 247.0 ],
"rect" : [ 236.0, 406.0, 268.0, 247.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -39,6 +39,46 @@
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-5",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 99.0, 22.0, 37.0, 22.0 ],
"text" : "osc 1"
}
}
, {
"box" : {
"id" : "obj-9",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 112.0, 81.0, 72.0, 22.0 ],
"text" : "prepend set"
}
}
, {
"box" : {
"fontsize" : 8.0,
"id" : "obj-8",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 112.0, 111.0, 109.0, 15.0 ],
"presentation" : 1,
"presentation_rect" : [ 0.0, 26.0, 98.0, 15.0 ],
"text" : "OSC",
"textcolor" : [ 0.901960784313726, 0.901960784313726, 0.901960784313726, 1.0 ],
"textjustification" : 1
}
}
, {
"box" : {
"handoff" : "",
"id" : "obj-11",
......@@ -55,6 +95,7 @@
}
, {
"box" : {
"args" : [ "@size", 25, 25, "@colorON", 0.5, 0.0, 0.875, 1.0, "@colorOFF", 0.26, 0.0, 0.5, 1.0 ],
"bgmode" : 0,
"border" : 0,
"clickthrough" : 0,
......@@ -66,12 +107,12 @@
"maxclass" : "bpatcher",
"name" : "deviceOSC_icon.maxpat",
"numinlets" : 1,
"numoutlets" : 1,
"numoutlets" : 2,
"offset" : [ 0.0, 0.0 ],
"outlettype" : [ "int" ],
"outlettype" : [ "int", "" ],
"patching_rect" : [ 24.0, 48.0, 34.0, 34.0 ],
"presentation" : 1,
"presentation_rect" : [ 33.0, 5.0, 30.0, 33.0 ],
"presentation_rect" : [ 35.0, 2.0, 25.0, 25.0 ],
"varname" : "direction",
"viewvisibility" : 1
}
......@@ -153,7 +194,7 @@
}
, {
"box" : {
"bgoncolor" : [ 0.235294117647059, 0.564705882352941, 0.250980392156863, 1.0 ],
"bgoncolor" : [ 0.125490196078431, 0.494117647058824, 0.894117647058824, 1.0 ],
"id" : "obj-6",
"ignoreclick" : 1,
"maxclass" : "textbutton",
......@@ -214,6 +255,27 @@
"source" : [ "obj-32", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-9", 0 ],
"source" : [ "obj-32", 1 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-32", 0 ],
"source" : [ "obj-5", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-8", 0 ],
"source" : [ "obj-9", 0 ]
}
}
],
"dependency_cache" : [ {
......@@ -265,7 +327,7 @@
, {
"name" : "rnbodefault",
"default" : {
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
......@@ -276,12 +338,12 @@
"autogradient" : 0.0
}
,
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"fontsize" : [ 12.0 ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"fontname" : [ "Lato" ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ]
"fontname" : [ "Lato" ]
}
,
"parentstyle" : "",
......@@ -290,8 +352,9 @@
, {
"name" : "rnbohighcontrast",
"default" : {
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ],
......@@ -302,16 +365,15 @@
"autogradient" : 0.0
}
,
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"fontsize" : [ 13.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ]
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ]
}
,
"parentstyle" : "",
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 556.0, 204.0, 622.0, 325.0 ],
"rect" : [ 363.0, 158.0, 622.0, 325.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -39,6 +39,90 @@
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"comment" : "",
"id" : "obj-20",
"index" : 0,
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 68.5, 246.0, 30.0, 30.0 ]
}
}
, {
"box" : {
"id" : "obj-16",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 602.0, 110.0, 105.0, 22.0 ],
"text" : "0. 0.5 0.265625 1."
}
}
, {
"box" : {
"id" : "obj-18",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 572.0, 82.0, 119.0, 22.0 ],
"text" : "0. 0.875 0.300781 1."
}
}
, {
"box" : {
"id" : "obj-19",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "bang" ],
"patching_rect" : [ 582.0, 21.0, 58.0, 22.0 ],
"text" : "loadbang"
}
}
, {
"box" : {
"id" : "obj-8",
"maxclass" : "newobj",
"numinlets" : 3,
"numoutlets" : 3,
"outlettype" : [ "", "", "" ],
"patching_rect" : [ 432.75, 68.0, 137.0, 22.0 ],
"text" : "route colorON colorOFF"
}
}
, {
"box" : {
"id" : "obj-11",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 365.75, 34.0, 86.0, 22.0 ],
"text" : "routepass size"
}
}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 312.75, 4.0, 72.0, 22.0 ],
"text" : "patcherargs"
}
}
, {
"box" : {
"comment" : "",
"id" : "obj-7",
......@@ -46,7 +130,7 @@
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 35.5, 251.0, 30.0, 30.0 ]
"patching_rect" : [ 30.5, 246.0, 30.0, 30.0 ]
}
}
......@@ -55,10 +139,10 @@
"id" : "obj-5",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 3,
"outlettype" : [ "int", "int", "int" ],
"patching_rect" : [ 35.5, 46.0, 167.0, 22.0 ],
"text" : "unpack i i i"
"numoutlets" : 4,
"outlettype" : [ "", "int", "int", "int" ],
"patching_rect" : [ 35.5, 46.0, 75.0, 22.0 ],
"text" : "unpack s i i i"
}
}
......@@ -109,18 +193,6 @@
"text" : "loadmess 0"
}
}
, {
"box" : {
"id" : "obj-26",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "bang" ],
"patching_rect" : [ 339.75, 20.0, 58.0, 22.0 ],
"text" : "loadbang"
}
}
, {
"box" : {
......@@ -130,8 +202,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 368.75, 107.0, 180.5, 35.0 ],
"text" : "remap_off 0. 0. 0. 1. 0. 0.5 0.265625 1."
"patching_rect" : [ 460.75, 188.0, 169.0, 35.0 ],
"text" : "remap_off 0. 0. 0. 1. $1 $2 $3 $4"
}
}
......@@ -142,8 +214,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 339.75, 71.0, 229.0, 22.0 ],
"text" : "remap_on 0. 0. 0. 1. 0. 0.875 0.300781 1."
"patching_rect" : [ 431.75, 152.0, 183.0, 22.0 ],
"text" : "remap_on 0. 0. 0. 1. $1 $2 $3 $4"
}
}
......@@ -251,6 +323,37 @@
"source" : [ "obj-10", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-1", 0 ],
"order" : 1,
"source" : [ "obj-11", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-2", 0 ],
"order" : 0,
"source" : [ "obj-11", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-23", 0 ],
"order" : 2,
"source" : [ "obj-11", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-8", 0 ],
"source" : [ "obj-11", 1 ]
}
}
, {
"patchline" : {
......@@ -258,6 +361,13 @@
"source" : [ "obj-12", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-11", 0 ],
"source" : [ "obj-13", 1 ]
}
}
, {
"patchline" : {
......@@ -306,6 +416,13 @@
"source" : [ "obj-15", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-17", 0 ],
"source" : [ "obj-16", 0 ]
}
}
, {
"patchline" : {
......@@ -334,16 +451,23 @@
, {
"patchline" : {
"destination" : [ "obj-15", 0 ],
"order" : 1,
"source" : [ "obj-26", 0 ]
"source" : [ "obj-18", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-17", 0 ],
"destination" : [ "obj-16", 0 ],
"order" : 0,
"source" : [ "obj-26", 0 ]
"source" : [ "obj-19", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-18", 0 ],
"order" : 1,
"source" : [ "obj-19", 0 ]
}
}
......@@ -390,7 +514,7 @@
"patchline" : {
"destination" : [ "obj-1", 0 ],
"order" : 0,
"source" : [ "obj-5", 1 ]
"source" : [ "obj-5", 2 ]
}
}
......@@ -398,7 +522,14 @@
"patchline" : {
"destination" : [ "obj-2", 0 ],
"order" : 0,
"source" : [ "obj-5", 2 ]
"source" : [ "obj-5", 3 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-20", 0 ],
"source" : [ "obj-5", 0 ]
}
}
......@@ -406,7 +537,7 @@
"patchline" : {
"destination" : [ "obj-23", 0 ],
"order" : 0,
"source" : [ "obj-5", 0 ]
"source" : [ "obj-5", 1 ]
}
}
......@@ -414,7 +545,7 @@
"patchline" : {
"destination" : [ "obj-4", 1 ],
"order" : 1,
"source" : [ "obj-5", 2 ]
"source" : [ "obj-5", 3 ]
}
}
......@@ -422,7 +553,7 @@
"patchline" : {
"destination" : [ "obj-4", 0 ],
"order" : 1,
"source" : [ "obj-5", 1 ]
"source" : [ "obj-5", 2 ]
}
}
......@@ -430,7 +561,7 @@
"patchline" : {
"destination" : [ "obj-7", 0 ],
"order" : 2,
"source" : [ "obj-5", 0 ]
"source" : [ "obj-5", 1 ]
}
}
......@@ -438,7 +569,7 @@
"patchline" : {
"destination" : [ "obj-9", 0 ],
"order" : 1,
"source" : [ "obj-5", 0 ]
"source" : [ "obj-5", 1 ]