From e2aaa655722cdf1c879d9429b3943841f99f72b2 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Fri, 23 Aug 2013 19:09:42 -0400 Subject: [PATCH] updates and bug-fixes --- .../K12/demos/demo_sequencer_complex.pd | 34 ++++++++++++------- .../K12/demos/demo_sequencer_simple.pd | 5 +-- l2ork_addons/K12/logic_counter.pd | 2 +- l2ork_addons/K12/signal_sampler-help.pd | 12 ++++--- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/l2ork_addons/K12/demos/demo_sequencer_complex.pd b/l2ork_addons/K12/demos/demo_sequencer_complex.pd index 3d8f7a8cb..bb40791ba 100755 --- a/l2ork_addons/K12/demos/demo_sequencer_complex.pd +++ b/l2ork_addons/K12/demos/demo_sequencer_complex.pd @@ -102,8 +102,8 @@ 8 %preset% 0 442.26 %preset% 1 442.26 %preset% 2 442.26 %preset% 3 442.26 %node% 2 36 16 %preset% 0 653.425 %preset% 1 653.425 %preset% 2 653.425 %preset% 3 653.425 %node% 2 40 10 %node% 2 38 4 %preset% -0 46 %node% 2 41 4 %preset% 0 46 %node% 2 37 5 %preset% 0 48.02 %preset% -1 67.02 %preset% 2 67.02 %preset% 3 67.02 %node% 2 38 7 %preset% 0 +0 46 %node% 2 41 4 %preset% 0 46 %node% 2 37 5 %preset% 0 67.02 %preset% +1 67.02 %preset% 2 55.02 %preset% 3 60.02 %node% 2 38 7 %preset% 0 12.04 %preset% 1 12.04 %preset% 2 12.04 %preset% 3 12.04 %node% 2 44 4 %preset% 0 58.04 %node% 2 42 10 %preset% 0 0 %preset% 1 0 %preset% 2 0 %preset% 3 0 %node% 2 43 14 %preset% 0 68.4419 %preset% 1 68.4419 @@ -119,10 +119,10 @@ 2 56.8182 %preset% 3 56.8182 %node% 2 54 16 %preset% 0 5 %preset% 1 5 %preset% 2 5 %preset% 3 5 %node% 2 56 7 %preset% 0 0.5 %preset% 1 0.5 %preset% 2 0.5 %preset% 3 0.5 %node% 2 58 7 %preset% 0 0 %preset% -1 0 %preset% 2 1 %preset% 3 1 %node% 2 59 10 %preset% 0 4687.5 %preset% -1 4140.62 %preset% 2 78.125 %preset% 3 1015.62 %node% 2 61 7 %preset% +1 0 %preset% 2 1 %preset% 3 1 %node% 2 59 10 %preset% 0 468.75 %preset% +1 781.25 %preset% 2 2734.38 %preset% 3 1718.75 %node% 2 61 7 %preset% 0 0 %preset% 1 1 %preset% 2 1 %preset% 3 1 %node% 2 62 5 %preset% 0 -46 %preset% 1 24 %preset% 2 36 %preset% 3 36 %node% 2 63 15 %preset% +46 %preset% 1 24 %preset% 2 24 %preset% 3 48 %node% 2 63 15 %preset% 0 290 %preset% 1 290 %preset% 2 290 %preset% 3 290 %node% 2 63 16 %preset% 0 56.8182 %preset% 1 56.8182 %preset% 2 56.8182 %preset% 3 56.8182 %node% 2 69 2 %node% 2 69 14 %node% 2 64 3 %preset% 0 1 %preset% 1 @@ -136,21 +136,27 @@ 2 456.164 %preset% 3 456.164 %node% 2 69 7 %preset% 0 0.01 %preset% 1 0.01 %preset% 2 0.01 %preset% 3 0.01 %node% 2 71 7 %preset% 0 -0.02 %preset% 1 -0.02 %preset% 2 -0.02 %preset% 3 -0.02 %node% 2 73 5 %preset% -0 46.01 %preset% 1 24.01 %preset% 2 36.01 %preset% 3 36.01 %node% 2 -74 5 %preset% 0 45.98 %preset% 1 23.98 %preset% 2 35.98 %preset% 3 -35.98 %node% 2 76 7 %preset% 0 0.25 %preset% 1 0.2 %preset% 2 0.2 %preset% +0 46.01 %preset% 1 24.01 %preset% 2 24.01 %preset% 3 48.01 %node% 2 +74 5 %preset% 0 45.98 %preset% 1 23.98 %preset% 2 23.98 %preset% 3 +47.98 %node% 2 76 7 %preset% 0 0.25 %preset% 1 0.2 %preset% 2 0.2 %preset% 3 0.2 %node% 2 77 7 %preset% 0 0 %preset% 1 0 %preset% 2 0 %preset% 3 0 %node% 2 79 7 %preset% 0 -12 %preset% 1 -12 %preset% 2 -12 %preset% -3 -12 %node% 2 81 4 %preset% 0 34 %preset% 1 12 %preset% 2 24 %preset% -3 24 %node% 2 83 7 %preset% 0 10 %preset% 1 10 %preset% 2 10 %preset% -3 10 %node% 2 87 5 %preset% 0 41.07 %preset% 1 41.07 %preset% 2 41.07 -%preset% 3 41.07 %node% 2 93 3 %preset% 0 1 %preset% 1 1 %preset% 2 +3 -12 %node% 2 81 4 %preset% 0 34 %preset% 1 12 %preset% 2 12 %preset% +3 36 %node% 2 83 7 %preset% 0 10 %preset% 1 10 %preset% 2 10 %preset% +3 10 %node% 2 87 5 %preset% 0 41.07 %preset% 1 41.07 %preset% 2 48.07 +%preset% 3 53.07 %node% 2 93 3 %preset% 0 1 %preset% 1 1 %preset% 2 1 %preset% 3 1 %node% 2 93 19 %preset% 0 64 %preset% 1 64 %preset% 2 64 %preset% 3 64 %node% 2 94 7 %preset% 0 128 %preset% 1 128 %preset% 2 128 %preset% 3 128 %node% 2 92 3 %preset% 0 1 %preset% 1 1 %preset% 2 1 %preset% 3 1 %node% 2 92 19 %preset% 0 64 %preset% 1 64 %preset% 2 64 %preset% 3 64 %node% 2 93 7 %preset% 0 128 %preset% 1 128 %preset% -2 128 %preset% 3 128; +2 128 %preset% 3 128 %node% 2 1 0 %preset% 3 30 %preset% 2 30 %preset% +1 30 %preset% 0 30 %node% 2 1 4 %preset% 3 1 %preset% 2 1 %preset% +1 1 %preset% 0 1 %node% 2 6 0 %preset% 3 480 %preset% 2 480 %preset% +1 480 %preset% 0 480 %node% 2 6 4 %preset% 3 1 %preset% 2 1 %preset% +1 1 %preset% 0 1 %node% 2 9 0 %preset% 3 240 %preset% 2 240 %preset% +1 240 %preset% 0 240 %node% 2 9 4 %preset% 3 1 %preset% 2 1 %preset% +1 1 %preset% 0 1; #X obj 29 169 K12/logic_metronome 0; #X obj 29 32 K12/preset 0; #X obj 709 32 K12/math_number 0; @@ -248,11 +254,13 @@ #X text 261 270 use this to toggle different parts (0=off \, 1=on) OR recall presets 1-4 above; #X text 261 244 by Ivica Ico Bukvic <ico@vt.edu>; +#X obj 109 400 print; #X connect 1 0 4 0; #X connect 3 0 1 0; #X connect 3 0 6 0; #X connect 3 0 9 0; #X connect 4 0 30 0; +#X connect 4 0 97 0; #X connect 5 0 78 0; #X connect 6 0 7 0; #X connect 6 0 92 0; diff --git a/l2ork_addons/K12/demos/demo_sequencer_simple.pd b/l2ork_addons/K12/demos/demo_sequencer_simple.pd index 6ef790a6f..50a36d317 100644 --- a/l2ork_addons/K12/demos/demo_sequencer_simple.pd +++ b/l2ork_addons/K12/demos/demo_sequencer_simple.pd @@ -1,5 +1,5 @@ #N canvas 177 69 609 614 10; -#X obj -30 -30 preset_hub k12 1 %hidden% %node% 2 1 7 %preset% 0 67 +#X obj -30 -30 preset_hub k12 1 %hidden% %node% 2 1 7 %preset% 0 65 %node% 2 3 7 %preset% 0 1 %node% 2 4 10 %preset% 0 2 %node% 2 5 14 %preset% 0 100 %node% 2 5 28 %preset% 0 1 %node% 2 6 15 %preset% 0 290 %node% 2 6 16 %preset% 0 5 %node% 2 7 7 %preset% 0 1 %node% 2 8 @@ -12,7 +12,8 @@ 0 69 %node% 2 9 81 %preset% 0 55 %node% 2 10 7 %node% 2 10 3 %preset% 0 1 %node% 2 10 11 %preset% 0 240 %node% 2 11 3 %preset% 0 1 %node% 2 11 19 %preset% 0 16 %node% 2 12 8 %preset% 0 223.63 %node% 2 12 16 -%preset% 0 801.37; +%preset% 0 801.37 %node% 2 10 0 %preset% 0 240 %node% 2 10 4 %preset% +0 1; #X obj 168 47 K12/math_number 0; #X obj 86 121 K12/instr_sustained2 0; #X obj 37 25 K12/math_number 0; diff --git a/l2ork_addons/K12/logic_counter.pd b/l2ork_addons/K12/logic_counter.pd index c5bd92943..b08949d60 100755 --- a/l2ork_addons/K12/logic_counter.pd +++ b/l2ork_addons/K12/logic_counter.pd @@ -1,6 +1,6 @@ #N canvas 146 67 452 406 10; #X obj 162 55 loadbang; -#X obj 162 159 ggee/image @pd_extra/K12/objects/logic_counter.png 1; +#X obj 162 159 ggee/image @pd_extra/K12/objects/logic_counter.png; #X obj 121 157 nbx 5 19 -1e+37 1e+37 0 1 empty empty empty 0 -8 0 16 -262144 -1 -1 1 256 1; #X obj 62 86 preset_node k12; diff --git a/l2ork_addons/K12/signal_sampler-help.pd b/l2ork_addons/K12/signal_sampler-help.pd index 8bb5a0872..c01262340 100755 --- a/l2ork_addons/K12/signal_sampler-help.pd +++ b/l2ork_addons/K12/signal_sampler-help.pd @@ -1,9 +1,13 @@ #N canvas 318 94 502 570 10; #X obj 347 -21 preset_hub k12 %hidden% %node% 2 6 14 %preset% 0 100 -%node% 2 7 37 %preset% 0 1 %node% 2 7 38 %preset% 0 25.974 %node% 2 -7 39 %preset% 0 0 %node% 2 8 7 %preset% 0 60 %node% 2 9 8 %node% 2 -14 1 %preset% 0 100 %node% 2 6 28 %preset% 0 1 %node% 2 13 1 %preset% -0 100 %node% 2 12 1; +%preset% 1 100 %preset% 2 100 %preset% 3 100 %node% 2 7 37 %preset% +0 1 %preset% 1 29.5714 %preset% 2 29.5714 %preset% 3 29.5714 %node% +2 7 38 %preset% 0 25.974 %preset% 1 0 %preset% 2 0 %preset% 3 12.987 +%node% 2 7 39 %preset% 0 0 %node% 2 8 7 %preset% 0 60 %preset% 1 60 +%preset% 2 72 %preset% 3 48 %node% 2 9 8 %node% 2 14 1 %preset% 0 100 +%node% 2 6 28 %preset% 0 1 %preset% 1 1 %preset% 2 1 %preset% 3 1 %node% +2 13 1 %preset% 0 100 %node% 2 12 1 %node% 2 7 36 %preset% 0 1 %preset% +1 1 %preset% 2 1 %preset% 3 1; #X obj 120 160 cnv 15 480 295 empty empty empty 20 12 0 14 -233017 -66577 0; #X obj 112 -3 cnv 3 501 3 empty empty empty 5 14 0 20 -260097 -191407 -- GitLab