before working on new controls

examples/Violinist/Violinist.pde

@@ -0,0 +1 @@
+

examples/Violinist/data/violin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layers>
+	<layer id="forest" nmt="violin.nmt"/>
+</layers>
+

src/animata/Animata.java

@@ -31,7 +31,7 @@ public static void zoomCamera(Float delta) {
 		OscMessage message = new OscMessage("/cameradeltazoom");
 		message.add(delta);
 		oscP5.send(message, net);
-//		System.out.println("message:" + message + " to  " + net);
+		//System.out.println("message:" + message.toString() + delta + " to  " + net);
 	}
 
 	public static void panLayer(Float deltaX) {

src/animata/AnimataPlayback.java

@@ -7,6 +7,7 @@
 import rwmidi.MidiInput;
 import rwmidi.RWMidi;
 import animata.controls.ClockBobber;
+import animata.controls.LayerToggle;
 import animata.model.Layer;
 import animata.views.LayerView;
 
@@ -33,8 +34,9 @@ public AnimataPlayback(PApplet applet){
 	private void setup(PApplet applet) {
 		this.applet = applet;
 		Animator.init(applet);
+		LayerToggle.init(applet);
 		camera = new Camera(applet);
-		this.applet.hint(PApplet.ENABLE_OPENGL_2X_SMOOTH);
+
 		root = new Layer();
 		in = RWMidi.getInputDevice("IAC Bus 1 <MIn:0> Apple Computer, Inc.").createInput();
 		clock = new Clock("IAC Bus 2");
@@ -81,7 +83,7 @@ public Layer addScene(String xml, Layer parent){
 	}
 	public void draw(){
 		applet.camera(camera.x, camera.y, camera.z, camera.targetX, camera.targetY,camera.targetZ, 0f, 1f, 0f);
-		//root.simulate();
+		root.simulate();
 		applet.textureMode(PApplet.NORMAL);
 		applet.noStroke();
 		applet.fill(0,0);

src/animata/Controller.java

@@ -53,6 +53,7 @@ public boolean setBoneTempo(String name, Float tempo) {
 	public boolean animateBone(String name, float scale) {
 		ArrayList<Bone> bones = Skeleton.findBones(name);
 		for (Bone bone : bones) {
+			//System.out.println("Scaling a bone to " + scale);
 			bone.setScale(scale);
 		}
 		// TODO: extract interface for Animata calls

src/animata/FootController.java

@@ -0,0 +1,41 @@
+package animata;
+
+import rwmidi.Controller;
+import rwmidi.MidiInput;
+import rwmidi.RWMidi;
+import microkontrol.controls.Button;
+
+public class FootController {
+	public class FootSwitch {
+		private int cc;
+		public FootSwitch(int cc) {
+			this.cc = cc;
+			// all on channel 16
+			in.plug(this, "controllerChangeReceived",15);
+		}
+		public void controllerChangeReceived(Controller controller){
+			if(controller.getCC() == cc) button.press();
+		}
+		public Button button = new Button();
+
+	}
+
+	private static FootController instance;
+	public static FootSwitch[] footSwitches;
+	protected MidiInput in;
+	public FootController(String inputName) {
+		in = RWMidi.getInputDevice(inputName).createInput();
+		int[] ccs = {115,114,116,101,100};
+		footSwitches = new FootSwitch[ccs.length];
+		for (int i = 0; i < ccs.length; i++) {
+			int cc = ccs[i];
+			footSwitches[i] = new FootSwitch(cc);
+
+		}
+	}
+
+	public static FootController getInstance(){
+		if(instance == null) instance = new FootController("MIDI IN <MIn:3> KORG INC.");
+		return instance;
+	}
+}

src/animata/controls/ControlFactory.java

@@ -8,13 +8,15 @@ public class ControlFactory {
 	public static Control createControl(XMLElement element, MidiInput in) {
 		String name = element.getName();
 		if(name.equals("notebone")) return new NoteBone(element, in);
+		if(name.equals("layeralpha")) return new LayerFader(element,in);
 //		if(name.equals("faderbone")) return new FaderBone(element);
 //		if(name.equals("freqbone")) return new FreqBone(element);
 		if(name.equals("noterangebone")) return new NoteRangeBone(element,in);
 		if(name.equals("bonetempokeys")) return new BoneTempoKeys(element,in);
 		if(name.equals("bonetempokeyranges")) return new BoneTempoKeyRanges(element, in);
 		if(name.equals("camera")) return new CameraPosition(element, in);
 		if(name.equals("camerashake")) return new CameraShake(element,in);
+		if(name.equals("layertoggle")) return new LayerToggle(element, in);
 		return new Control(element, in);
 
 	}

src/animata/controls/LayerFader.java

@@ -0,0 +1,25 @@
+package animata.controls;
+
+import microkontrol.MicroKontrol;
+import microkontrol.controls.FaderListener;
+import processing.xml.XMLElement;
+import rwmidi.MidiInput;
+import animata.model.Layer;
+
+public class LayerFader extends Control implements FaderListener {
+
+	private String layer;
+
+	public LayerFader(XMLElement element, MidiInput in) {
+		super(element, in);
+		layer = element.getStringAttribute("layer");
+		MicroKontrol.getInstance().faders[element.getIntAttribute("fader")].listen(this);
+		Layer.setAlpha(layer,0f);
+	}
+
+	public void moved(Float value) {
+		Layer.setAlpha(layer,value);
+
+	}
+
+}

src/animata/controls/LayerToggle.java

@@ -0,0 +1,37 @@
+package animata.controls;
+
+import java.awt.event.KeyEvent;
+
+import animata.model.Layer;
+
+import processing.core.PApplet;
+import processing.xml.XMLElement;
+import rwmidi.MidiInput;
+
+public class LayerToggle extends Control {
+
+	private static PApplet applet;
+
+	private String layer;
+
+	private char toggle;
+
+	public LayerToggle(XMLElement element, MidiInput in) {
+		super(element,in);
+		toggle = element.getStringAttribute("key").charAt(0);
+		layer =  element.getStringAttribute("layer");
+		applet.registerKeyEvent(this);
+		Layer.setVisibility(layer, false); // TODO confirm this is desirable default behaviour
+	}
+	public void keyEvent(KeyEvent key){
+		if(key.getKeyChar() == toggle && key.getID() == KeyEvent.KEY_PRESSED ){
+			System.out.println("toggling " + layer);
+			Layer.toggle(layer);
+		}
+	}
+	public static void init(PApplet theApplet) {
+		applet = theApplet;
+
+	}
+
+}

src/animata/model/Layer.java

@@ -44,12 +44,15 @@ public PImage getImage(PApplet applet) {
 	public float scale = 1;
 	public boolean visible = true;
 
+	private static ArrayList<Layer> allLayers = new ArrayList<Layer>();
+
 	public Layer() {
 	}
 
 	public Layer(XMLElement element, String folder) {
 		setupAttributes(element);
 		addChildLayersIfPresent(element, folder);
+		allLayers.add(this);
 	}
 
 	private void addChildLayersIfPresent(XMLElement element, String folder) {
@@ -93,12 +96,30 @@ public Layer addLayer(String folder, XMLElement element) {
 	}
 
 	public void simulate() {
+		if(!visible || alpha == 0) return;
 		if(skeleton != null) skeleton.simulate(40);
 		for (Layer layer : layers) {
 			layer.simulate();
 		}
 
 	}
 
+	public static void toggle(String name) {
+		for(Layer layer : allLayers){
+			if(layer.name != null && layer.name.equals(name)) layer.visible = !layer.visible;
+		}
+	}
+	public static void setVisibility(String name, boolean visible){
+		for(Layer layer : allLayers){
+			if(layer.name != null && layer.name.equals(name)) layer.visible = visible;
+		}
+	}
+
+	public static void setAlpha(String name, Float value) {
+		for(Layer layer : allLayers){
+			if(layer.name != null && layer.name.equals(name)) layer.alpha = value;
+		}
+
+	}
 
 }

src/animata/views/LayerView.java

@@ -30,7 +30,8 @@ private void addChildLayers(ArrayList<Layer> layers) {
 	}
 
 	public void draw() {
-		//if(!layer.visible) return;
+		if(!layer.visible || layer.alpha == 0) return;
+		if(layer.alpha != 1) applet.tint(layer.alpha * 255);
 		applet.pushMatrix();
 		doTransformation();
 		applet.pushMatrix();
@@ -40,6 +41,7 @@ public void draw() {
 		applet.popMatrix();
 
 		applet.popMatrix();
+		if(layer.alpha != 1) applet.tint(255);
 	}
 	private void drawDebugStuff() {
 		if(layer.skeleton == null) return;

src/test/CrazyLandscape.java

@@ -0,0 +1,49 @@
+package test;
+
+import microkontrol.MicroKontrol;
+import microkontrol.controls.Button;
+import processing.core.PApplet;
+import animata.Animata;
+import animata.AnimataPlayback;
+import animata.FootController;
+
+public class CrazyLandscape extends PApplet {
+	private AnimataPlayback playback;
+	private MicroKontrol mk;
+
+	public void setup() {
+		size(950, 614, OPENGL);
+		MicroKontrol.init(this);
+		Animata.startOSC(this);
+		playback = new AnimataPlayback(this);
+
+		playback.loadSet("set.xml");
+		//playback.debug();
+		mk = MicroKontrol.getInstance();
+		FootController.getInstance().footSwitches[0].button.listen(Button.PRESSED, this, "doSomething");
+	}
+	public void doSomething(){
+		System.out.println("Pressed the switch!");
+	}
+	public void draw() {
+		if (keyPressed) {
+			if (keyCode == DOWN) playback.panCameraY(10);
+			if (keyCode == UP) playback.panCameraY(-10);
+			if (keyCode == LEFT) playback.panCameraX(-10);
+			if (keyCode == RIGHT) playback.panCameraX(10);
+			if( key == 'c') System.out.println("HASHS" + playback.camera);
+		}
+		playback.panCameraX(mk.joystick.getX() * 30);
+		playback.zoomCamera(mk.joystick.getY() * 30);
+		background(255);
+
+		playback.draw();
+
+	}
+
+	public static void main(String[] args) {
+		PApplet.main(new String[] { "--bgcolor=#c0c0c0", "TestScene" });
+
+	}
+
+}

src/test/TestScene.java

@@ -1,25 +1,30 @@
 package test;
 
 import microkontrol.MicroKontrol;
+import microkontrol.controls.Button;
 import processing.core.PApplet;
 import animata.Animata;
 import animata.AnimataPlayback;
+import animata.FootController;
 
 public class TestScene extends PApplet {
 	private AnimataPlayback playback;
 	private MicroKontrol mk;
 
 	public void setup() {
 		size(950, 614, OPENGL);
+		MicroKontrol.init(this);
 		Animata.startOSC(this);
 		playback = new AnimataPlayback(this);
 
 		playback.loadSet("set.xml");
 		playback.debug();
-		MicroKontrol.init(this);
 		mk = MicroKontrol.getInstance();
+		FootController.getInstance().footSwitches[0].button.listen(Button.PRESSED, this, "doSomething");
+	}
+	public void doSomething(){
+		System.out.println("Pressed the switch!");
 	}
-
 	public void draw() {
 		if (keyPressed) {
 			if (keyCode == DOWN) playback.panCameraY(10);