Compatibility adjustments

bohnacker · bohnacker · commit 005ef42b3055 · 2015-09-02T11:41:18.000+02:00
diff --git a/01_P/P_3_1_2_02/P_3_1_2_02.pde b/01_P/P_3_1_2_02/P_3_1_2_02.pde
@@ -59,7 +59,7 @@ int actColorIndex = 0;
 void setup() {
   size(800, 600);
   // make window resizable
-  frame.setResizable(true); 
+  surface.setResizable(true); 
 
   centerX = width/2;
   centerY = height/2;  
@@ -292,23 +292,4 @@ void keyPressed() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_3_1_2_02/data/comma.svg b/01_P/P_3_1_2_02/data/comma.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
-<path fill="#0082A4" d="M44.505,4.958L41.129,1.64C31.254-8.61,17.314-15.009,1.953-15.007H0.008v14.94l1.945,0.062
-	c11.167,0.004,21.185,4.612,28.38,12.059l0.005-0.005l3.375,3.24L44.505,4.958z"/>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#0082A4" d="M44.497,4.958L41.121,1.64C31.246-8.61,17.306-15.009,1.945-15.007H0v14.94l1.945,0.062
+	c11.167,0.004,21.185,4.612,28.38,12.059l0.005-0.005l3.375,3.24L44.497,4.958z"/>
 </svg>
diff --git a/01_P/P_3_1_2_02/data/exclamationmark.svg b/01_P/P_3_1_2_02/data/exclamationmark.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
-<path fill="#572381" d="M42.386-17.969L31.492-28.215l-1.136,1.208l-0.035-0.034c-7.197,7.446-17.214,12.054-28.38,12.058H0.055
-	v14.956H1.94v0.045h0.008C17.293,0.02,31.217-6.369,41.089-16.6l0.005,0.005L42.386-17.969z"/>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#572381" d="M42.331-17.969L31.437-28.215l-1.136,1.208l-0.035-0.034c-7.197,7.446-17.214,12.054-28.38,12.058H0v14.956
+	h1.885v0.045h0.008C17.238,0.02,31.162-6.369,41.034-16.6l0.005,0.005L42.331-17.969z"/>
 </svg>
diff --git a/01_P/P_3_1_2_02/data/icon1.svg b/01_P/P_3_1_2_02/data/icon1.svg
diff --git a/01_P/P_3_1_2_02/data/icon2.svg b/01_P/P_3_1_2_02/data/icon2.svg
diff --git a/01_P/P_3_1_2_02/data/icon3.svg b/01_P/P_3_1_2_02/data/icon3.svg
diff --git a/01_P/P_3_1_2_02/data/icon4.svg b/01_P/P_3_1_2_02/data/icon4.svg
diff --git a/01_P/P_3_1_2_02/data/icon5.svg b/01_P/P_3_1_2_02/data/icon5.svg
diff --git a/01_P/P_3_1_2_02/data/period.svg b/01_P/P_3_1_2_02/data/period.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
 <path d="M56.247-56.248H41.242v1.846h0.004c-0.004,10.909-4.401,20.716-11.548,27.874C22.54-19.383,12.733-14.986,1.823-14.982
 	h-1.846V0.023h1.846V0.018C31.88,0.011,56.24-24.345,56.246-54.402h0.001V-56.248z"/>
 </svg>
diff --git a/01_P/P_3_1_2_02/data/questionmark.svg b/01_P/P_3_1_2_02/data/questionmark.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
-<path fill="#572381" d="M42.333-17.966L31.686-28.515l-1.414,1.437L30.27-27.08c-7.195,7.448-17.212,12.056-28.379,12.06H0.003
-	v14.988h1.888v0.013h0.007c15.358,0,29.295-6.398,39.167-16.646l-0.011-0.011L42.333-17.966z"/>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#572381" d="M42.33-17.966L31.683-28.515l-1.414,1.437l-0.002-0.002c-7.195,7.448-17.212,12.056-28.379,12.06H0v14.988
+	h1.888v0.013h0.007c15.358,0,29.295-6.398,39.167-16.646l-0.011-0.011L42.33-17.966z"/>
 </svg>
diff --git a/01_P/P_3_1_2_02/data/return.svg b/01_P/P_3_1_2_02/data/return.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-371.303 333.118 100 100" enable-background="new -371.303 333.118 100 100"
-	 xml:space="preserve">
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
 <path d="M-0.363,10h2.121c2.756-0.004,4.993-2.24,4.999-4.999l0,0C6.751,2.242,4.515,0.005,1.758,0l0,0h-2.121v-15h2.121
 	c11.047,0.006,19.993,8.952,19.999,20.001l0,0C21.751,16.048,12.805,24.996,1.758,25l0,0l-2.121,0.002V10L-0.363,10z M-0.363,0
 	v0.002V0L-0.363,0z"/>
diff --git a/01_P/P_3_1_2_02/data/space.svg b/01_P/P_3_1_2_02/data/space.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
-<path fill="#B59D00" d="M13.149-9.334l-0.905-0.959l0.009-0.008c-2.771-2.887-6.741-4.705-11.061-4.702v0.012H0v14.989h1.192v0
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#B59D00" d="M13.149-9.334l-0.905-0.959l0.009-0.008c-2.771-2.887-6.741-4.705-11.061-4.702v0.012H0v14.989h1.192l0,0
 	c0.125,0.004,0.17,0.029,0.262,0.112l0.021-0.02l0.793,0.841L13.149-9.334z"/>
 </svg>
diff --git a/01_P/P_3_1_2_02/data/space2.svg b/01_P/P_3_1_2_02/data/space2.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="-20.826 -16.359 100 100" enable-background="new -20.826 -16.359 100 100"
-	 xml:space="preserve">
-<path fill="#B59D00" d="M0.05-0.05l1.319-0.001v0.012c4.001-0.037,8.046-1.68,11.007-4.825l-0.008-0.008l0.817-0.868L2.277-16.02
-	l-0.818,0.868l0,0c-0.088,0.088-0.137,0.104-0.261,0.114v0.029l-1.156,0L0.05-0.05z"/>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#B59D00" d="M0.008-0.05l1.319-0.001v0.012c4.001-0.037,8.046-1.68,11.007-4.825l-0.008-0.008l0.817-0.868L2.235-16.02
+	l-0.818,0.868l0,0c-0.088,0.088-0.137,0.104-0.261,0.114v0.029H0L0.008-0.05z"/>
 </svg>
diff --git a/01_P/P_3_2_1_01/P_3_2_1_01.pde b/01_P/P_3_2_1_01/P_3_2_1_01.pde
@@ -38,7 +38,7 @@ boolean doSave = false;
 void setup() {
   size(1324,350);  
   // make window resizable
-  frame.setResizable(true); 
+  surface.setResizable(true); 
   smooth();
 
   // allways initialize the library in setup
@@ -126,10 +126,4 @@ void keyPressed() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
+}
diff --git a/01_P/P_3_2_1_02/P_3_2_1_02.pde b/01_P/P_3_2_1_02/P_3_2_1_02.pde
@@ -52,7 +52,7 @@ PShape module1, module2;
 void setup() {
   size(1024,500);  
   // make window resizable
-  frame.setResizable(true); 
+  surface.setResizable(true); 
   smooth();
 
   module1 = loadShape("A_01.svg");
@@ -191,22 +191,4 @@ void keyPressed() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_3_2_2_01/P_3_2_2_01.pde b/01_P/P_3_2_2_01/P_3_2_2_01.pde
@@ -60,7 +60,7 @@ boolean filled = false;
 void setup() {
   size(1824,400);  
   // make window resizable
-  frame.setResizable(true); 
+  surface.setResizable(true); 
   smooth();
 
   // allways initialize the library in setup
@@ -159,22 +159,4 @@ void keyPressed() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_3_2_3_01/P_3_2_3_01.pde b/01_P/P_3_2_3_01/P_3_2_3_01.pde
@@ -62,7 +62,7 @@ boolean freeze = false;
 void setup() {
   size(1200,800); 
   // make window resizable
-  frame.setResizable(true);  
+  surface.setResizable(true);  
   smooth();
 
   frameRate(15);
@@ -212,37 +212,4 @@ void keyPressed() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_4_2_1_01/P_4_2_1_01.pde b/01_P/P_4_2_1_01/P_4_2_1_01.pde
@@ -42,7 +42,7 @@ void setup() {
 
   // ------ load images ------
   // replace this location with a folder on your machine or use selectInput()
-  File dir = new File(sketchPath,"../P_4_2_1_footage");
+  File dir = new File(sketchPath(""),"../P_4_2_1_footage");
 
   if (dir.isDirectory()) {
     String[] contents = dir.list();
@@ -152,21 +152,4 @@ void drawCollageItems(CollageItem[] theItems) {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_4_2_1_02/P_4_2_1_02.pde b/01_P/P_4_2_1_02/P_4_2_1_02.pde
@@ -42,7 +42,7 @@ void setup() {
 
   // ------ load images ------
   // replace this location with a folder on your machine or use selectInput()
-  File dir = new File(sketchPath,"../P_4_2_1_footage");
+  File dir = new File(sketchPath(""),"../P_4_2_1_footage");
 
   if (dir.isDirectory()) {
     String[] contents = dir.list();
@@ -154,18 +154,4 @@ void drawCollageItems(CollageItem[] theItems) {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_4_2_2_01/P_4_2_2_01.pde b/01_P/P_4_2_2_01/P_4_2_2_01.pde
@@ -86,8 +86,4 @@ void keyReleased() {
 String timestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
+}
diff --git a/01_P/P_4_2_2_02/P_4_2_2_02.pde b/01_P/P_4_2_2_02/P_4_2_2_02.pde
@@ -72,11 +72,4 @@ void draw() {
 String getTimestamp() {
   Calendar now = Calendar.getInstance();
   return String.format("%1$ty%1$tm%1$td_%1$tH%1$tM%1$tS", now);
-}
-
-
-
-
-
-
-
+}
diff --git a/01_P/P_4_3_1_02/P_4_3_1_02.pde b/01_P/P_4_3_1_02/P_4_3_1_02.pde
