From 41fcfe2755ed5dc0b81f9502157deacc3f6ec169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20O=CC=88stlin?= Date: Thu, 14 Apr 2016 16:47:55 +0200 Subject: [PATCH 1/3] Adds .gitignore Includes .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store From 4e2e88d79e3ff4784ecc620fd0b3a4416dd3fd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20O=CC=88stlin?= Date: Thu, 14 Apr 2016 16:49:57 +0200 Subject: [PATCH 2/3] Moves sketches into separate folders This is done with Processing 3 auto-migration --- files/{ => grid_studies_2}/grid_studies_2.pde | 0 files/{ => grid_studies_2_3}/grid_studies_2_3.pde | 0 files/{ => grid_studies_3_1}/grid_studies_3_1.pde | 0 files/{ => grid_studies_3_2}/grid_studies_3_2.pde | 0 files/{ => grid_studies_3_3}/grid_studies_3_3.pde | 0 files/{ => grid_studies_3_4}/grid_studies_3_4.pde | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename files/{ => grid_studies_2}/grid_studies_2.pde (100%) rename files/{ => grid_studies_2_3}/grid_studies_2_3.pde (100%) rename files/{ => grid_studies_3_1}/grid_studies_3_1.pde (100%) rename files/{ => grid_studies_3_2}/grid_studies_3_2.pde (100%) rename files/{ => grid_studies_3_3}/grid_studies_3_3.pde (100%) rename files/{ => grid_studies_3_4}/grid_studies_3_4.pde (100%) diff --git a/files/grid_studies_2.pde b/files/grid_studies_2/grid_studies_2.pde similarity index 100% rename from files/grid_studies_2.pde rename to files/grid_studies_2/grid_studies_2.pde diff --git a/files/grid_studies_2_3.pde b/files/grid_studies_2_3/grid_studies_2_3.pde similarity index 100% rename from files/grid_studies_2_3.pde rename to files/grid_studies_2_3/grid_studies_2_3.pde diff --git a/files/grid_studies_3_1.pde b/files/grid_studies_3_1/grid_studies_3_1.pde similarity index 100% rename from files/grid_studies_3_1.pde rename to files/grid_studies_3_1/grid_studies_3_1.pde diff --git a/files/grid_studies_3_2.pde b/files/grid_studies_3_2/grid_studies_3_2.pde similarity index 100% rename from files/grid_studies_3_2.pde rename to files/grid_studies_3_2/grid_studies_3_2.pde diff --git a/files/grid_studies_3_3.pde b/files/grid_studies_3_3/grid_studies_3_3.pde similarity index 100% rename from files/grid_studies_3_3.pde rename to files/grid_studies_3_3/grid_studies_3_3.pde diff --git a/files/grid_studies_3_4.pde b/files/grid_studies_3_4/grid_studies_3_4.pde similarity index 100% rename from files/grid_studies_3_4.pde rename to files/grid_studies_3_4/grid_studies_3_4.pde From a9f7184881298c6f83e93d25b54f526825c4097b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20O=CC=88stlin?= Date: Thu, 14 Apr 2016 16:53:24 +0200 Subject: [PATCH 3/3] Removes redundant import Processing 3 gives a compiler error if a library is imported more than once. import oscP5.*; is removed from sketches since it's imported in monome. This fixes the compiler error. --- files/grid_studies_2/grid_studies_2.pde | 4 +--- files/grid_studies_2_3/grid_studies_2_3.pde | 4 +--- files/grid_studies_3_1/grid_studies_3_1.pde | 4 +--- files/grid_studies_3_2/grid_studies_3_2.pde | 4 +--- files/grid_studies_3_3/grid_studies_3_3.pde | 3 +-- files/grid_studies_3_4/grid_studies_3_4.pde | 3 +-- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/files/grid_studies_2/grid_studies_2.pde b/files/grid_studies_2/grid_studies_2.pde index ce465ee..2337194 100644 --- a/files/grid_studies_2/grid_studies_2.pde +++ b/files/grid_studies_2/grid_studies_2.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; @@ -18,5 +17,4 @@ public void draw() { public void key(int x, int y, int s) { System.out.println("key received: " + x + ", " + y + ", " + s); -} - +} \ No newline at end of file diff --git a/files/grid_studies_2_3/grid_studies_2_3.pde b/files/grid_studies_2_3/grid_studies_2_3.pde index ed24c99..6d2f5b8 100644 --- a/files/grid_studies_2_3/grid_studies_2_3.pde +++ b/files/grid_studies_2_3/grid_studies_2_3.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; int[][] led; @@ -21,5 +20,4 @@ public void draw() { public void key(int x, int y, int s) { led[y][x] = s * 15; dirty = true; -} - +} \ No newline at end of file diff --git a/files/grid_studies_3_1/grid_studies_3_1.pde b/files/grid_studies_3_1/grid_studies_3_1.pde index deb728c..898ffe7 100644 --- a/files/grid_studies_3_1/grid_studies_3_1.pde +++ b/files/grid_studies_3_1/grid_studies_3_1.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; boolean dirty; @@ -36,5 +35,4 @@ public void key(int x, int y, int s) { dirty = true; } -} - +} \ No newline at end of file diff --git a/files/grid_studies_3_2/grid_studies_3_2.pde b/files/grid_studies_3_2/grid_studies_3_2.pde index 1343158..f5d7827 100644 --- a/files/grid_studies_3_2/grid_studies_3_2.pde +++ b/files/grid_studies_3_2/grid_studies_3_2.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; boolean dirty; @@ -59,5 +58,4 @@ public void key(int x, int y, int s) { dirty = true; } -} - +} \ No newline at end of file diff --git a/files/grid_studies_3_3/grid_studies_3_3.pde b/files/grid_studies_3_3/grid_studies_3_3.pde index 88f7c0c..bbd23ee 100644 --- a/files/grid_studies_3_3/grid_studies_3_3.pde +++ b/files/grid_studies_3_3/grid_studies_3_3.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; boolean dirty; @@ -82,4 +81,4 @@ public void key(int x, int y, int s) { public void trigger(int i) { line(20,20+i*20,width-20,20+i*20); -} +} \ No newline at end of file diff --git a/files/grid_studies_3_4/grid_studies_3_4.pde b/files/grid_studies_3_4/grid_studies_3_4.pde index 9904f9e..e39c39d 100644 --- a/files/grid_studies_3_4/grid_studies_3_4.pde +++ b/files/grid_studies_3_4/grid_studies_3_4.pde @@ -1,5 +1,4 @@ import org.monome.Monome; -import oscP5.*; Monome m; boolean dirty; @@ -110,4 +109,4 @@ public void key(int x, int y, int s) { public void trigger(int i) { line(20,20+i*20,width-20,20+i*20); -} +} \ No newline at end of file