diff --git a/Processing/TESTS/Sampler/Sampler.pde b/Processing/TESTS/Sampler/Sampler.pde index ba0f356..ef4d0e1 100644 --- a/Processing/TESTS/Sampler/Sampler.pde +++ b/Processing/TESTS/Sampler/Sampler.pde @@ -13,7 +13,7 @@ int beat = 0; boolean[][] samples; void setup() { - size(640, 360); + size(640, 460); background(255); loadData(); @@ -21,33 +21,42 @@ void setup() { } void draw() { - background(255); + background(50); stroke(255); + fill(200); - for(int i=0; i=divider){beat=0;} + + if(ereaseRow>0 && doErease && beat==0) { + for(int x=0; x=divider){beat=0;} - + delay(duration); } diff --git a/Processing/TESTS/Sampler/SetBeat.pde b/Processing/TESTS/Sampler/SetBeat.pde index b09c06d..65aca33 100644 --- a/Processing/TESTS/Sampler/SetBeat.pde +++ b/Processing/TESTS/Sampler/SetBeat.pde @@ -1,27 +1,24 @@ int ereaseRow = 0; +boolean doErease = false; void setBeat(int index, int sample) { samples[sample][index] = true; } - void keyPressed() { + println(keyCode); if(keyCode >= 48 && keyCode < 53) { ereaseRow = keyCode-48; - println("Set ereaseRow"+ereaseRow); + } else if(keyCode >= 74) { + if(key == 'p') { + controller[0] = controller[0] == "PLAY" ? "STOP" : "PLAY"; + beat=0; + } } else { int sample = keyCode-65; - println(sample); - if(sample >= 0 && sample < numSounds) { - println("ereaseRow"+ereaseRow); + doErease = ereaseRow>0; + if(sample >= 0 && sample < numSounds && !doErease) { setBeat(beat, sample); - - if(ereaseRow>0) { - for(int x=0; x