diff --git a/README.md b/README.md index 1a98034..878978b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ the default mappings, along with the controls available on the grid, are designe - **amp [a/b/c]**: the amplitude or volume of the three sine waves in the synth voice - by default, the amplitutes are: + by default, the amplitudes are: | a | b | c | | - | - | - | diff --git a/lib/Engine_Orgn.sc b/lib/Engine_Orgn.sc old mode 100644 new mode 100755 index c1fa3c3..7906cb5 --- a/lib/Engine_Orgn.sc +++ b/lib/Engine_Orgn.sc @@ -7,7 +7,7 @@ Engine_Orgn : CroneEngine { var = 16) then - _patrec{ - x = wide and 16 or { 1, 2 }, y = wide and { 4, 7 + lr } or 2, - pattern = pattern, varibright = varibright, - } - end - end end diff --git a/orgn.lua b/orgn.lua old mode 100644 new mode 100755 index 60ba4d5..8db744c --- a/orgn.lua +++ b/orgn.lua @@ -43,6 +43,7 @@ Key, Enc = include 'lib/nest/norns' Text = include 'lib/nest/text' Grid = include 'lib/nest/grid' + multipattern = include 'lib/nest/util/pattern-tools/multipattern' of = include 'lib/nest/util/of' to = include 'lib/nest/util/to' @@ -59,6 +60,9 @@ Orgn = include 'orgn/lib/ui' --nest v2 UI components (norns scr map = include 'orgn/lib/params' --create script params m = include 'orgn/lib/midi' --midi keyboard input +--nb lib or orgn +nb = include 'orgn/lib/nb/lib/nb' + engine.name = "Orgn" --set up global patterns @@ -94,12 +98,23 @@ nest.connect_screen(_app.norns, 24) --init/cleanup function init() + print("orgn init") orgn.init() params:read() params:set('demo start/stop', 0) + + nb:init() + params:add_separator("externals") + -- nb:add_param("voice_t"..t, "OUTPUT") + nb:add_param("nb_voice1", "OUTPUT1") + nb:add_param("nb_voice2", "OUTPUT2") + params:add_separator("VOICE CONTROLS") + nb:add_player_params() + + params:bang() -end +end function cleanup() params:write() end