upgrade to processing 2.2.1 and JOGL2

codingjoe · codingjoe · commit 0bc9eb3ef226 · 2014-07-20T14:43:26.000+02:00
diff --git a/Beat.pde b/Beat.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/Blackout_Effect.pde b/Blackout_Effect.pde
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the follocontrolGroupg conditions:
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
diff --git a/Derby_Effect.pde b/Derby_Effect.pde
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the follocontrolGroupg conditions:
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
diff --git a/Effect.pde b/Effect.pde
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the follocontrolGroupg conditions:
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  *
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/LaserBurst_Effect.pde b/LaserBurst_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/Moonflower_Effect.pde b/Moonflower_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/MusicBeam.pde b/MusicBeam.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -24,7 +24,7 @@ import controlP5.*;
 import ddf.minim.*;
 import ddf.minim.analysis.*;
 
-String version = "1.0.1";
+String version = "1.1.0";
 
 public Boolean debugMode = false;
 
diff --git a/Polygon_Effect.pde b/Polygon_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@ MusicBeam
 =========
 
 MusicBeam is a multi plattform software that allows using a projector as a rgb laser.
-MusicBeam is written in [Processing 1.5.1](http://processing.org) a JAVA based language that is easy to learn to enable users to contribute new effects.
+MusicBeam is written in [Processing 2.2.1](http://processing.org) a JAVA based language that is easy to learn to enable users to contribute new effects.
 
 
 Download
@@ -16,7 +16,7 @@ _______
 License
 -------
 
-Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/RGBSpot_Effect.pde b/RGBSpot_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/Scanner_Effect.pde b/Scanner_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/Snowstorm_Effect.pde b/Snowstorm_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
diff --git a/Stage.pde b/Stage.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -12,12 +12,10 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
-import processing.opengl.*;
 import java.awt.GraphicsDevice;
 import java.awt.DisplayMode;
 import java.awt.Frame;
-import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
 
 public class Stage extends PApplet {
   
@@ -36,9 +34,8 @@ public class Stage extends PApplet {
   float minRadius;
 
   DisplayMode dm;
-
-  PGraphicsOpenGL pgl;
-
+  
+  GL2 gl;
 
   Stage (MusicBeam main, int gd)
   {
@@ -66,7 +63,7 @@ public class Stage extends PApplet {
 
   void setup() {
     frameRate(getRefreshRate());
-    pgl = (PGraphicsOpenGL) g;
+    gl = ((PJOGL)beginPGL()).gl.getGL2();
     noStroke();
     colorMode(HSB, 360, 100, 100);
   }
@@ -94,11 +91,9 @@ public class Stage extends PApplet {
    *
    */
   private void enableGLBlending() {
-    GL gl = pgl.beginGL(); 
-    gl.glDisable(GL.GL_DEPTH_TEST);
-    gl.glEnable(GL.GL_BLEND);
-    gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
-    pgl.endGL();
+    gl.glDisable(GL2.GL_DEPTH_TEST);
+    gl.glEnable(GL2.GL_BLEND);
+    gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE);
   }
 
   public int sketchWidth() {
diff --git a/Strobe_Effect.pde b/Strobe_Effect.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <info@johanneshoppe.com>
+ * Copyright (c) 2012-2014 Johannes Hoppe <info@johanneshoppe.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <[email protected]>`
	`2`	`+ * Copyright (c) 2012-2014 Johannes Hoppe <[email protected]>`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),`
`5`	`5`	`* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2012-2013 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <[email protected]>`
	`2`	`+ * Copyright (c) 2012-2014 Johannes Hoppe <[email protected]>`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),`
`5`	`5`	`* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,`
`6`		`- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the follocontrolGroupg conditions:`
	`6`	`+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:`
`7`	`7`	`*`
`8`	`8`	`* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2012 Zepp Lab UG (haftungsbeschränkt) <www.zepplab.net>, Johannes Hoppe <[email protected]>`
	`1`	`+Copyright (c) 2012-2014 Johannes Hoppe <[email protected]>`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:`
`4`	`4`