diff --git a/Processing/Sampler/Sampler.pde b/Processing/Sampler/Sampler.pde index 4728b46..4ade07d 100644 --- a/Processing/Sampler/Sampler.pde +++ b/Processing/Sampler/Sampler.pde @@ -20,6 +20,7 @@ boolean[][] samples; void setup() { size(640, 460); background(255); + loadData(); setData(); } diff --git a/Processing/Sampler/data/1.aif b/Processing/Sampler/data/1.aif deleted file mode 100644 index fd65b31..0000000 Binary files a/Processing/Sampler/data/1.aif and /dev/null differ diff --git a/Processing/Sampler/data/2.aif b/Processing/Sampler/data/2.aif deleted file mode 100644 index 742301e..0000000 Binary files a/Processing/Sampler/data/2.aif and /dev/null differ diff --git a/Processing/Sampler/data/3.aif b/Processing/Sampler/data/3.aif deleted file mode 100644 index 7b8da50..0000000 Binary files a/Processing/Sampler/data/3.aif and /dev/null differ diff --git a/Processing/Sampler/data/4.aif b/Processing/Sampler/data/4.aif deleted file mode 100644 index 7884a34..0000000 Binary files a/Processing/Sampler/data/4.aif and /dev/null differ diff --git a/Processing/Sampler/data/5.aif b/Processing/Sampler/data/5.aif deleted file mode 100644 index 5664dad..0000000 Binary files a/Processing/Sampler/data/5.aif and /dev/null differ diff --git a/Processing/Sampler/data/data.json b/Processing/Sampler/data/data.json new file mode 100644 index 0000000..4c0a841 --- /dev/null +++ b/Processing/Sampler/data/data.json @@ -0,0 +1,24 @@ +{ + "patterns": [ + { + "name": "Pattern 1", + "pattern": [ + [false, false, false, false, false, false, false, false], + [false, false, false, false, false, false, false, false], + [false, false, false, false, false, false, false, false], + [false, false, false, false, false, false, false, false], + [false, false, false, false, false, false, false, false] + ] + }, + { + "name": "Pattern 2", + "pattern": [ + [false, true, false, false, false, false], + [false, false, true, false, false, true], + [false, false, false, true, false, false], + [false, false, true, false, false, false], + [true, false, false, false, true, false] + ] + } + ] +} diff --git a/Processing/Sampler/loadData.pde b/Processing/Sampler/loadData.pde new file mode 100644 index 0000000..22f5655 --- /dev/null +++ b/Processing/Sampler/loadData.pde @@ -0,0 +1,50 @@ +String[] patternLabels = {}; +boolean[][][] samplesArray = {}; + +void loadData() { + + JSONObject json; + json = loadJSONObject("data.json"); + + JSONArray patternsArray = json.getJSONArray("patterns"); + + for(int pat=0; pat