moved noteToScale conversion to individual instruments

tmhglnd · Jun 17, 2020 · a9e5335 · a9e5335
1 parent 0693d79
commit a9e5335
Show file tree

Hide file tree

Showing 5 changed files with 7,709 additions and 6,442 deletions.
diff --git a/mercury_ide/data/initials.json b/mercury_ide/data/initials.json
@@ -7,8 +7,8 @@
 		"pan" : 0,
 		"note" : [ 0, 0 ],
 		"res" : 0.9,
-		"fm_index" : 2,
-		"fm_depth" : 100,
+		"fm_index" : 1,
+		"fm_depth" : 0.5,
 		"fm_env" : [ 5, 200, 0, 0 ],
 		"stretch" : 0,
 		"slide" : 0,
@@ -28,8 +28,8 @@
 		"pan" : 0,
 		"note" : [ 0, 0 ],
 		"res" : 0.9,
-		"fm_index" : 2,
-		"fm_depth" : 100,
+		"fm_index" : 1,
+		"fm_depth" : 0.5,
 		"fm_env" : [ 5, 200, 0, 0 ],
 		"stretch" : 0,
 		"slide" : 0,

diff --git a/mercury_ide/dev/synth-dev.txt b/mercury_ide/dev/synth-dev.txt
@@ -1,12 +1,25 @@
 
 set tempo 100
 
-// new synth sine shape(1 2000) time(1) note(0.3 2) useDetune(1)
-// new synth sine shape(1 2000) time(1) note(0 2) 
+ring notes [[0.3 1 5.5 7]]
+
+// new synth sine shape(3 2000) time(1) note(notes 2) useDetune(1)
+// new synth sine shape(3 2000) time(1) note(1 2) 
 
 // killAll
 
-new synth saw note(0 0) time(1/2) shape(1 1/2) 
-new synth saw note(0 2) time(1/2) shape(1/4 1/64) 
+set scale lydian b
+// ring notes cosine(16 1 0 12)
+ring notes [0 0 [0 3 5 24] [0 7 12] [0 3 12]]
+ring speeds [1 1 [1 5] [1 7] [1 3]]
+
+new sample hat_min time(1/16) speed(speeds)
+// new synth saw note(notes 2) time(1/16) shape(1 100) resonance(0.95)
+// new synth blip note(notes 2) time(1/16) shape(1 100) resonance(0.95)
+// new poly_synth saw note(notes 1) time(1/4) shape(1 1/4) resonance(0.95)
+// new synth_fm sine 
+// new synth saw note(0 2) time(1/2) shape(1/4 1/64) 
+
+// new synth fm note(notes 1) fm_index(1) fm_depth(2) time(1/4) fm_env(2 450) shape(1000) fx(filter low 1000 0.3)
 
-killAll
+silence
diff --git a/mercury_ide/patchers/_mercury_main.maxpat b/mercury_ide/patchers/_mercury_main.maxpat
@@ -38,6 +38,30 @@
 		"style" : "",
 		"subpatcher_template" : "",
 		"boxes" : [ 			{
+				"box" : 				{
+					"id" : "obj-86",
+					"maxclass" : "number",
+					"numinlets" : 1,
+					"numoutlets" : 2,
+					"outlettype" : [ "", "bang" ],
+					"parameter_enable" : 0,
+					"patching_rect" : [ 68.5, 1725.0, 50.0, 22.0 ]
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"id" : "obj-45",
+					"maxclass" : "message",
+					"numinlets" : 2,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 68.5, 1755.0, 59.0, 22.0 ],
+					"text" : "voices $1"
+				}
+
+			}
+, 			{
 				"box" : 				{
 					"id" : "obj-16",
 					"maxclass" : "message",
@@ -15456,7 +15480,7 @@
 					"maxclass" : "newobj",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 2287.0, 954.0, 86.0, 22.0 ],
+					"patching_rect" : [ 2337.0, 960.0, 86.0, 22.0 ],
 					"text" : "send~ audioHi"
 				}
 
@@ -15467,7 +15491,7 @@
 					"maxclass" : "newobj",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 2218.333333333333485, 918.0, 88.0, 22.0 ],
+					"patching_rect" : [ 2251.666666666666515, 918.0, 88.0, 22.0 ],
 					"text" : "send~ audioLo"
 				}
 
@@ -15478,7 +15502,7 @@
 					"maxclass" : "newobj",
 					"numinlets" : 1,
 					"numoutlets" : 0,
-					"patching_rect" : [ 2149.66666666666697, 954.0, 98.0, 22.0 ],
+					"patching_rect" : [ 2166.333333333333485, 960.0, 98.0, 22.0 ],
 					"text" : "send~ audioSide"
 				}
 
@@ -15633,8 +15657,8 @@
 					"numinlets" : 2,
 					"numoutlets" : 4,
 					"outlettype" : [ "signal", "signal", "signal", "signal" ],
-					"patching_rect" : [ 2081.0, 866.0, 225.0, 35.0 ],
-					"text" : "poly~ analyseDisplay 1 down 4 @args sum 1280 720 @target 0 @parallel 1"
+					"patching_rect" : [ 2081.0, 866.0, 275.0, 35.0 ],
+					"text" : "poly~ analyseDisplay 1 down 4 @args sum 1280 720 @target 0 @parallel 1 @resampling 0"
 				}
 
 			}
@@ -39178,8 +39202,6 @@
 									"saved_object_attributes" : 									{
 										"autostart" : 1,
 										"defer" : 0,
-										"node_bin_path" : "",
-										"npm_bin_path" : "",
 										"watch" : 1
 									}
 ,
@@ -44666,6 +44688,8 @@
 									"saved_object_attributes" : 									{
 										"autostart" : 1,
 										"defer" : 1,
+										"node_bin_path" : "",
+										"npm_bin_path" : "",
 										"watch" : 1
 									}
 ,
@@ -59647,7 +59671,7 @@
 					"numinlets" : 2,
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
-					"patching_rect" : [ 235.263885333333349, 1605.0, 67.895859000000002, 35.0 ],
+					"patching_rect" : [ 230.263885333333349, 1605.0, 67.895859000000002, 35.0 ],
 					"text" : "target 0, silence 1"
 				}
 
@@ -59711,13 +59735,13 @@
 					"presentation_rect" : [ 210.0, 255.0, 135.0, 36.0 ],
 					"saved_attribute_attributes" : 					{
 						"valueof" : 						{
+							"parameter_initial" : [ 0.0 ],
+							"parameter_shortname" : "volume",
 							"parameter_type" : 0,
 							"parameter_unitstyle" : 4,
 							"parameter_mmin" : -70.0,
 							"parameter_longname" : "volume",
-							"parameter_mmax" : 6.0,
-							"parameter_initial" : [ 0.0 ],
-							"parameter_shortname" : "volume"
+							"parameter_mmax" : 6.0
 						}
 
 					}
@@ -61969,6 +61993,13 @@
 					"source" : [ "obj-446", 0 ]
 				}
 
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-301", 0 ],
+					"source" : [ "obj-45", 0 ]
+				}
+
 			}
 , 			{
 				"patchline" : 				{
@@ -62251,6 +62282,13 @@
 					"source" : [ "obj-82", 0 ]
 				}
 
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-45", 0 ],
+					"source" : [ "obj-86", 0 ]
+				}
+
 			}
 , 			{
 				"patchline" : 				{
@@ -62347,13 +62385,6 @@
 				"type" : "JSON",
 				"implicit" : 1
 			}
-, 			{
-				"name" : "argBindings.txt",
-				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/data",
-				"patcherrelativepath" : "../data",
-				"type" : "TEXT",
-				"implicit" : 1
-			}
 , 			{
 				"name" : "syncToScale.maxpat",
 				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/patchers",
@@ -62362,16 +62393,16 @@
 				"implicit" : 1
 			}
 , 			{
-				"name" : "th.yafr~.maxpat",
-				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/external",
-				"patcherrelativepath" : "../external",
-				"type" : "JSON",
+				"name" : "argBindings.txt",
+				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/data",
+				"patcherrelativepath" : "../data",
+				"type" : "TEXT",
 				"implicit" : 1
 			}
 , 			{
-				"name" : "gtep.maxpat",
-				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/patchers",
-				"patcherrelativepath" : ".",
+				"name" : "th.yafr~.maxpat",
+				"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/external",
+				"patcherrelativepath" : "../external",
 				"type" : "JSON",
 				"implicit" : 1
 			}