From 89623ef43ff0545eb013fff89eeb8f11c61b0481 Mon Sep 17 00:00:00 2001
From: Michael Forrest <michael.forrest@gmail.com>
Date: Sun, 25 Jan 2009 19:58:10 +0000
Subject: [PATCH] fixed Forest example

---
 examples/Forest/Forest.pde                     |   4 +++-
 examples/Forest/data/{ => forest}/bird.png     | Bin
 examples/Forest/data/{ => forest}/bird2.png    | Bin
 examples/Forest/data/{ => forest}/cellist.png  | Bin
 examples/Forest/data/{ => forest}/forest.nmt   |   0
 .../data/{ => forest}/pianotreebetter.png      | Bin
 .../data/{ => forest}/pianotreeleaves.png      | Bin
 .../Forest/data/{ => forest}/violaplayer.png   | Bin
 examples/Forest/data/set.xml                   |  17 +++++++++++++++++
 9 files changed, 20 insertions(+), 1 deletion(-)
 rename examples/Forest/data/{ => forest}/bird.png (100%)
 rename examples/Forest/data/{ => forest}/bird2.png (100%)
 rename examples/Forest/data/{ => forest}/cellist.png (100%)
 rename examples/Forest/data/{ => forest}/forest.nmt (100%)
 rename examples/Forest/data/{ => forest}/pianotreebetter.png (100%)
 rename examples/Forest/data/{ => forest}/pianotreeleaves.png (100%)
 rename examples/Forest/data/{ => forest}/violaplayer.png (100%)
 create mode 100644 examples/Forest/data/set.xml

diff --git a/examples/Forest/Forest.pde b/examples/Forest/Forest.pde
index 06effbe..8152725 100644
--- a/examples/Forest/Forest.pde
+++ b/examples/Forest/Forest.pde
@@ -1,3 +1,5 @@
+import rwmidi.*;
+
 import oscP5.*;
 import netP5.*;
 
@@ -10,7 +12,7 @@ void setup() {
   size(950,614,OPENGL);
   hint(ENABLE_OPENGL_4X_SMOOTH);
   playback = new AnimataPlayback(this);
-  playback.addScene("forest.nmt");
+  playback.loadSet("set.xml");
 }
 
 void draw() {
diff --git a/examples/Forest/data/bird.png b/examples/Forest/data/forest/bird.png
similarity index 100%
rename from examples/Forest/data/bird.png
rename to examples/Forest/data/forest/bird.png
diff --git a/examples/Forest/data/bird2.png b/examples/Forest/data/forest/bird2.png
similarity index 100%
rename from examples/Forest/data/bird2.png
rename to examples/Forest/data/forest/bird2.png
diff --git a/examples/Forest/data/cellist.png b/examples/Forest/data/forest/cellist.png
similarity index 100%
rename from examples/Forest/data/cellist.png
rename to examples/Forest/data/forest/cellist.png
diff --git a/examples/Forest/data/forest.nmt b/examples/Forest/data/forest/forest.nmt
similarity index 100%
rename from examples/Forest/data/forest.nmt
rename to examples/Forest/data/forest/forest.nmt
diff --git a/examples/Forest/data/pianotreebetter.png b/examples/Forest/data/forest/pianotreebetter.png
similarity index 100%
rename from examples/Forest/data/pianotreebetter.png
rename to examples/Forest/data/forest/pianotreebetter.png
diff --git a/examples/Forest/data/pianotreeleaves.png b/examples/Forest/data/forest/pianotreeleaves.png
similarity index 100%
rename from examples/Forest/data/pianotreeleaves.png
rename to examples/Forest/data/forest/pianotreeleaves.png
diff --git a/examples/Forest/data/violaplayer.png b/examples/Forest/data/forest/violaplayer.png
similarity index 100%
rename from examples/Forest/data/violaplayer.png
rename to examples/Forest/data/forest/violaplayer.png
diff --git a/examples/Forest/data/set.xml b/examples/Forest/data/set.xml
new file mode 100644
index 0000000..4730ffa
--- /dev/null
+++ b/examples/Forest/data/set.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layers>
+	<layer id="forest" nmt="forest/forest.nmt" channel="3" vis="true">
+		<bonetempokeys tempo="0.15" low="40" high="F3" bone="cello"/>
+		<bonetempokeys tempo="0.2" low="F#3" high="100" bone="viola"/>
+		<noterangebone low="40" high="F3" bone="cellopitch"/>
+		<noterangebone low="F#3" high="100" bone="violapitch"/>
+		<bonetempokeyranges tempo="1" low="48" step="2" bone="piano" bonecount="23" channel="3"/>
+		<camera x="65.625" y="487.0" z="251.25" id="birds_left"/>
+		<camera x="867.8125" y="467.0" z="377.8125" id="birds_right"/>
+		<camera x="255.0" y="677.0" z="362.65625" id="viola"/>
+		<camera x="-51.09375" y="647.0" z="292.8125"  id="cello"/>
+		<camera x="100.78125" y="477.0" z="257.65625" id="birds"/>
+		<camera x="731.25" y="527.0" z="217.8125" id="birds"/>
+		<camera x="1069.6875" y="527.0" z="198.125" id="birds"/>
+	</layer>
+</layers>