2.2.6 release

LICENSE.md

@@ -471,7 +471,7 @@ convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
     controlP5 is a processing gui library.
-    Copyright (C) 2006-2014  andreas schlegel
+    Copyright (C) 2006-2015  andreas schlegel
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public

examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde

@@ -42,13 +42,13 @@ public void controlEvent(ControlEvent c) {
     int b = int(c.getArrayValue(2));
     int a = int(c.getArrayValue(3));
     color col = color(r,g,b,a);
-    println("event\talpha:"+a+"\tred:"+r+"\tgreen:"+g+"\tblue:"+b+"\tcol"+col);
+    println("event \talpha:"+a+"\tred:"+r+"\tgreen:"+g+"\tblue:"+b+"\tcol"+col);
   }
 }
 
 // color information from ColorPicker 'picker' are forwarded to the picker(int) function
 void picker(int col) {
-  println("picker\talpha:"+alpha(col)+"\tred:"+red(col)+"\tgreen:"+green(col)+"\tblue:"+blue(col)+"\tcol"+col);
+  println("picker\talpha:"+int(alpha(col))+"\tred:"+int(red(col))+"\tgreen:"+int(green(col))+"\tblue:"+int(blue(col))+"\tcol"+col);
 }
 
 
@@ -183,6 +183,4 @@ java.lang.Object : boolean equals(Object)
 
 created: 2015/03/24 12:20:58
 
-*/
-
-
+*/

examples/extra/ControlP5frame/ControlP5frame.pde

@@ -1,98 +1,112 @@
 /**
  * ControlP5 Controlframe
- * with controlP5 2.0 all java.awt dependencies have been removed
- * as a consequence the option to display controllers in a separate
- * window had to be removed as well. 
- * this example shows you how to create a java.awt.frame and use controlP5
  *
- * by Andreas Schlegel, 2012
+ * this example shows you how to create separate window to 
+ * display and use controllers with  processing 3
+ *
+ * by Andreas Schlegel, 2016
  * www.sojamo.de/libraries/controlp5
  *
  */
 
-import java.awt.Frame;
-import java.awt.BorderLayout;
 import controlP5.*;
 
-private ControlP5 cp5;
-
 ControlFrame cf;
 
-int def;
+float speed;
+float pos;
+float c0, c1, c2, c3;
+boolean auto;
 
-void setup() {
-  size(400, 400);
-  cp5 = new ControlP5(this);
-
-  // by calling function addControlFrame() a
-  // new frame is created and an instance of class
-  // ControlFrame is instanziated.
-  cf = addControlFrame("extra", 200,200);
+void settings() {
+  size(400, 400, P3D);
+}
 
-  // add Controllers to the 'extra' Frame inside 
-  // the ControlFrame class setup() method below.
-
-
+void setup() {
+  cf = new ControlFrame(this, 400, 800, "Controls");
+  surface.setLocation(420, 10);
+  noStroke();
 }
 
 void draw() {
-  background(def);
+  if (auto) pos += speed;
+  background(0);
+  translate(width/2, height/2);
+  rotateY(pos);
+  lights();
+  fill(c0, c1, c2, c3);
+  box(100);
 }
 
-ControlFrame addControlFrame(String theName, int theWidth, int theHeight) {
-  Frame f = new Frame(theName);
-  ControlFrame p = new ControlFrame(this, theWidth, theHeight);
-  f.add(p);
-  p.init();
-  f.setTitle(theName);
-  f.setSize(p.w, p.h);
-  f.setLocation(100, 100);
-  f.setResizable(false);
-  f.setVisible(true);
-  return p;
-}
 
 
-// the ControlFrame class extends PApplet, so we 
-// are creating a new processing applet inside a
-// new frame with a controlP5 object loaded
-public class ControlFrame extends PApplet {
+
+class ControlFrame extends PApplet {
 
   int w, h;
+  PApplet parent;
+  ControlP5 cp5;
 
-  int abc = 100;
-
-  public void setup() {
-    size(w, h);
-    frameRate(25);
-    cp5 = new ControlP5(this);
-    cp5.addSlider("abc").setRange(0, 255).setPosition(10,10);
-    cp5.addSlider("def").plugTo(parent,"def").setRange(0, 255).setPosition(10,30);
+  public ControlFrame(PApplet _parent, int _w, int _h, String _name) {
+    super();   
+    parent = _parent;
+    w=_w;
+    h=_h;
+    PApplet.runSketch(new String[]{this.getClass().getName()}, this);
   }
 
-  public void draw() {
-      background(abc);
-  }
-
-  private ControlFrame() {
+  public void settings() {
+    size(w, h);
   }
 
-  public ControlFrame(Object theParent, int theWidth, int theHeight) {
-    parent = theParent;
-    w = theWidth;
-    h = theHeight;
+  public void setup() {
+    surface.setLocation(10, 10);
+    cp5 = new ControlP5(this);
+
+    cp5.addToggle("auto")
+       .plugTo(parent, "auto")
+       .setPosition(10, 70)
+       .setSize(50, 50)
+       .setValue(true);
+
+    cp5.addKnob("blend")
+       .plugTo(parent, "c3")
+       .setPosition(100, 300)
+       .setSize(200, 200)
+       .setRange(0, 255)
+       .setValue(200);
+
+    cp5.addNumberbox("color-red")
+       .plugTo(parent, "c0")
+       .setRange(0, 255)
+       .setValue(255)
+       .setPosition(100, 10)
+       .setSize(100, 20);
+
+    cp5.addNumberbox("color-green")
+       .plugTo(parent, "c1")
+       .setRange(0, 255)
+       .setValue(128)
+       .setPosition(100, 70)
+       .setSize(100, 20);
+
+    cp5.addNumberbox("color-blue")
+       .plugTo(parent, "c2")
+       .setRange(0, 255)
+       .setValue(0)
+       .setPosition(100, 130)
+       .setSize(100, 20);
+
+    cp5.addSlider("speed")
+       .plugTo(parent, "speed")
+       .setRange(0, 0.1)
+       .setValue(0.01)
+       .setPosition(100, 240)
+       .setSize(200, 30);
+
   }
 
-
-  public ControlP5 control() {
-    return cp5;
+  void draw() {
+    background(190);
   }
-
-
-  ControlP5 cp5;
-
-  Object parent;
-
-
-}
-
+}