Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 97df3a0cff8d25f0064ca649ba284a695a5d5cd9..1ecb640dbd10c7bd59581ea3f34f3a6660171719 100644 (file)
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -335,7 +335,7 @@ public class PianoKeyPattern extends SCPattern {
     for (Cube c : model.cubes) {
       float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef());
       setColor(c, color(
-        (huef + 20*v + abs(c.fx-model.xMax/2.)*.3 + c.fy) % 360,
+        (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360,
         min(100, 120*v),
         100*v
       ));

diff --git a/SugarCubes.pde b/SugarCubes.pde
index c0ab10403b646a78790993fac57d7c4565d661d2..1af65b01e93997966fa974f1e649e4556ab24e49 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -37,12 +37,13 @@ LXPattern[] patterns(GLucose glucose) {
     new WarmPlasma(glucose),
     new FireTest(glucose),
     
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
+    // Basic test patterns for reference, not art    
+    new TestCubePattern(glucose),
+    new TestHuePattern(glucose),
+    new TestProjectionPattern(glucose),
 //    new TestXPattern(glucose),
 //    new TestYPattern(glucose),
 //    new TestZPattern(glucose),
-//    new TestProjectionPattern(glucose),
 
   };
 }

diff --git a/TestPatterns.pde b/TestPatterns.pde
index 9b465311b62be1a0cfa1b65ef035541971358f36..c4432ab0baa1d7cc976b5fcddecfcb43cce67529 100644 (file)
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -112,7 +112,7 @@ class TestProjectionPattern extends SCPattern {
     projection.reset(model)
     
       // Translate so the center of the car is the origin, offset by yPos
-      .translateCenter(0, yPos.getValuef(), 0)
+      .translateCenter(model, 0, yPos.getValuef(), 0)
 
       // Rotate around the origin (now the center of the car) about an X-vector
       .rotate(angle.getValuef(), 1, 0, 0)
@@ -134,6 +134,31 @@ class TestProjectionPattern extends SCPattern {
   } 
 }
 
+class TestCubePattern extends SCPattern {
+  
+  private int POINTS_PER_CUBE = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE * Strip.POINTS_PER_STRIP;
+  private SawLFO index = new SawLFO(0, POINTS_PER_CUBE, POINTS_PER_CUBE*60);
+  
+  TestCubePattern(GLucose glucose) {
+    super(glucose);
+    addModulator(index).start();
+  }
+  
+  public void run(int deltaMs) {
+    for (Cube c : model.cubes) {
+      int i = 0;
+      for (Point p : c.points) {
+        colors[p.index] = color(
+          lx.getBaseHuef(),
+          100,
+          max(0, 100 - 80.*abs(i - index.getValuef()))
+        );
+        ++i;
+      }
+    }
+  }
+}
+
 class MappingTool extends SCPattern {
     
   private int cubeIndex = 0;
@@ -197,7 +222,7 @@ class MappingTool extends SCPattern {
   }
   
   public void strip(int delta) {
-    int len = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP;
+    int len = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
     stripIndex = (len + stripIndex + delta) % len;
     printInfo();
   }
@@ -236,14 +261,14 @@ class MappingTool extends SCPattern {
           int si = 0;
           color sc = off;
           for (Strip strip : cube.strips) {
-            int clipI = si / Clip.STRIPS_PER_CLIP;
-            switch (clipI) {
+            int faceI = si / Face.STRIPS_PER_FACE;
+            switch (faceI) {
               case 0: sc = r; break;
               case 1: sc = g; break;
               case 2: sc = b; break;
               case 3: sc = r|g|b; break;
             }
-            if (si % Clip.STRIPS_PER_CLIP == 2) {
+            if (si % Face.STRIPS_PER_FACE == 2) {
               sc = r|g;
             }
             setColor(strip, sc);
@@ -288,12 +313,12 @@ class MappingTool extends SCPattern {
   }
   
   public void incStrip() {
-    int stripsPerCube = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP;
+    int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
     stripIndex = (stripIndex + 1) % stripsPerCube;
   }
   
   public void decStrip() {
-    int stripsPerCube = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP;
+    int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
     --stripIndex;
     if (stripIndex < 0) {
       stripIndex += stripsPerCube;

diff --git a/_Internals.pde b/_Internals.pde
index dab8bdd920a665e768cceda90fda4dc681d72be6..abfe6be9c22eb11013bfec53b1b2936b3f6576ab 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -34,7 +34,17 @@ import rwmidi.*;
 final int VIEWPORT_WIDTH = 900;
 final int VIEWPORT_HEIGHT = 700;
 
-int targetFramerate = 45;
+final float TRAILER_WIDTH = 240;
+final float TRAILER_DEPTH = 97;
+final float TRAILER_HEIGHT = 33;
+
+final float BASS_WIDTH = 124;
+final float BASS_HEIGHT = 31.5;
+final float BASS_DEPTH = 66;
+final float BASS_X = (TRAILER_WIDTH - BASS_WIDTH) / 2.;
+final float BASS_Z = (TRAILER_DEPTH - BASS_DEPTH) / 2.;
+
+int targetFramerate = 60;
 
 int startMillis, lastMillis;
 GLucose glucose;
@@ -85,10 +95,9 @@ void setup() {
   // Build output driver
   int[][] frontChannels = glucose.mapping.buildFrontChannelList();
   int[][] rearChannels = glucose.mapping.buildRearChannelList();
-  int[][] flippedRGB = glucose.mapping.buildFlippedRGBList();
   mappingTool = new MappingTool(glucose, frontChannels, rearChannels);
-  pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels, flippedRGB);
-  pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels, flippedRGB);
+  pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels);
+  pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels);
   logTime("Build PandaDriver");
   
   // Build overlay UI
@@ -105,10 +114,10 @@ void setup() {
   logTime("Setup MIDI devices");
     
   // Setup camera
-  midX = glucose.model.xMax/2 + 20;
+  midX = TRAILER_WIDTH/2. + 20;
   midY = glucose.model.yMax/2;
-  midZ = glucose.model.zMax/2;
-  eyeR = -270;
+  midZ = TRAILER_DEPTH/2.;
+  eyeR = -290;
   eyeA = .15;
   eyeY = midY + 20;
   eyeX = midX + eyeR*sin(eyeA);
@@ -154,34 +163,45 @@ void draw() {
   if (debugMode) {
     debugUI.maskColors(colors);
   }
-  
+
   camera(
     eyeX, eyeY, eyeZ,
     midX, midY, midZ,
     0, -1, 0
   );
-  stroke(#333333);
-  fill(#292929);
-  float yFloor = -3;
+
+  noStroke();
+  fill(#141414);
+  drawBox(0, -TRAILER_HEIGHT, 0, 0, 0, 0, TRAILER_WIDTH, TRAILER_HEIGHT, TRAILER_DEPTH, TRAILER_HEIGHT/2.);
+  fill(#070707);
+  stroke(#222222);
   beginShape();
-  vertex(0, yFloor, 0);
-  vertex(glucose.model.xMax, yFloor, 0);
-  vertex(glucose.model.xMax, yFloor, glucose.model.zMax);
-  vertex(0, yFloor, glucose.model.zMax);  
-  endShape(CLOSE);
+  vertex(0, 0, 0);
+  vertex(TRAILER_WIDTH, 0, 0);
+  vertex(TRAILER_WIDTH, 0, TRAILER_DEPTH);
+  vertex(0, 0, TRAILER_DEPTH);
+  endShape();
   
+  noStroke();
+  fill(#292929);
+  drawBox(BASS_X, 0, BASS_Z, 0, 0, 0, BASS_WIDTH, BASS_HEIGHT, BASS_DEPTH, Cube.CHANNEL_WIDTH);
+  for (Cube c : glucose.model.cubes) {
+    drawCube(c);
+  }
+
   noFill();
   strokeWeight(2);
   beginShape(POINTS);
   for (Point p : glucose.model.points) {
     stroke(colors[p.index]);
     vertex(p.fx, p.fy, p.fz);
+    // println(p.fx + ":" + p.fy + ":" + p.fz);
   }
   endShape();
   
   // 2D Overlay
   camera();
-  javax.media.opengl.GL gl= ((PGraphicsOpenGL)g).beginGL();
+  javax.media.opengl.GL gl = ((PGraphicsOpenGL)g).beginGL();
   gl.glClear(javax.media.opengl.GL.GL_DEPTH_BUFFER_BIT);
   ((PGraphicsOpenGL)g).endGL();
   strokeWeight(1);
@@ -190,12 +210,49 @@ void draw() {
   if (debugMode) {
     debugUI.draw();
   }
-    
+  
   // TODO(mcslee): move into GLucose engine
   if (pandaBoardsEnabled) {
     pandaFront.send(colors);
-    pandaRear.send(colors);
+    // pandaRear.send(colors);
+  }
+}
+
+void drawCube(Cube c) {
+  float in = .15;
+  drawBox(c.x+in, c.y+in, c.z+in, c.rx, c.ry, c.rz, Cube.EDGE_WIDTH-in*2, Cube.EDGE_HEIGHT-in*2, Cube.EDGE_WIDTH-in*2, Cube.CHANNEL_WIDTH-in);
+}
+
+void drawBox(float x, float y, float z, float rx, float ry, float rz, float xd, float yd, float zd, float sw) {
+  pushMatrix();
+  translate(x, y, z);
+  rotate(rx / 180. * PI, -1, 0, 0);
+  rotate(ry / 180. * PI, 0, -1, 0);
+  rotate(rz / 180. * PI, 0, 0, -1);
+  for (int i = 0; i < 4; ++i) {
+    float wid = (i % 2 == 0) ? xd : zd;
+    
+    beginShape();
+    vertex(0, 0);
+    vertex(wid, 0);
+    vertex(wid, yd);
+    vertex(wid - sw, yd);
+    vertex(wid - sw, sw);
+    vertex(0, sw);
+    endShape();
+    beginShape();
+    vertex(0, sw);
+    vertex(0, yd);
+    vertex(wid - sw, yd);
+    vertex(wid - sw, yd - sw);
+    vertex(sw, yd - sw);
+    vertex(sw, sw);
+    endShape();
+
+    translate(wid, 0, 0);
+    rotate(HALF_PI, 0, -1, 0);
   }
+  popMatrix();
 }
 
 void drawUI() {
@@ -291,8 +348,12 @@ void mouseReleased() {
 }
  
 void mouseWheel(int delta) {
-  eyeR = constrain(eyeR - delta, -500, -80);
-  eyeX = midX + eyeR*sin(eyeA);
-  eyeZ = midZ + eyeR*cos(eyeA);
+  if (mouseX > ui.leftPos) {
+    ui.mouseWheel(delta);
+  } else {
+    eyeR = constrain(eyeR - delta, -500, -80);
+    eyeX = midX + eyeR*sin(eyeA);
+    eyeZ = midZ + eyeR*cos(eyeA);
+  }
 }
 

diff --git a/_Mappings.pde b/_Mappings.pde
index 10c1083fe0b810c468bde8471676195df1037b5d..0809a70fb90266a7258adcb192a1b6530bd76e57 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -18,256 +18,81 @@ class SCMapping implements GLucose.Mapping {
     // serialized in some more neutral form. also figure out what's going on
     // with the indexing starting at 1 and some indices missing.
     Cube[] cubes = new Cube[79];
-    cubes[1]  = new Cube(17.25, 0, 0, 0, 0, 80, true, 2, 3);
-    cubes[2]  = new Cube(50.625, -1.5, 0, 0, 0, 55, false, 4, 0);
-    cubes[3]  = new Cube(70.75, 12.375, 0, 0, 0, 55, false, 4, 0);
-    cubes[4]  = new Cube(49.75, 24.375, 0, 0, 0, 48, false, 0, 0);//dnw
-    cubes[5]  = new Cube(14.25, 32, 0, 0, 0, 80, false, 2, 1);
-    cubes[6]  = new Cube(50.375, 44.375, 0, 0, 0, 0, false, 0, 0);//dnw
-    cubes[7]  = new Cube(67.5, 64.25, 0, 27, 0, 0, false, 0, 0);//dnw
-    cubes[8]  = new Cube(44, 136, 0, 0, 0, 0, false, 1, 2);
-    cubes[9]  = new Cube(39, 162, 0, 0, 0, 0, false, 1, 0);
-    cubes[10] = new Cube(58, 182, -4, 12, 0, 0, false, 3, 3);
-    cubes[11] = new Cube(28, 182, -4, 12, 0, 0, false, 0, 0);
-    cubes[12] = new Cube(0, 182, -4, 12, 0, 0, false, 0, 2);
-    cubes[13] = new Cube(18.75, 162, 0, 0, 0, 0, false, 0, 0);
-    cubes[14] = new Cube(13.5, 136, 0, 0, 0, 0, false, 1, 1);
-    cubes[15] = new Cube(6.5, -8.25, 20, 0, 0, 25, false, 5, 3);
-    cubes[16] = new Cube(42, 15, 20, 0, 0, 4, true, 2, 2);
-    cubes[17] = new Cube(67, 24, 20, 0, 0, 25);
-    cubes[18] = new Cube(56, 41, 20, 0, 0, 30, false, 3, 1);
-    cubes[19] = new Cube(24, 2, 20, 0, 0, 25, true, 0, 3);
-    cubes[20] = new Cube(26, 26, 20, 0, 0, 70, true, 2, 3);
-    cubes[21] = new Cube(3.5, 10.5, 20, 0, 0, 35, true, 1, 0);
-    cubes[22] = new Cube(63, 133, 20, 0, 0, 80, false, 0, 2);
-    cubes[23] = new Cube(56, 159, 20, 0, 0, 65);
-    cubes[24] = new Cube(68, 194, 20, 0, -45, 0);
-    cubes[25] = new Cube(34, 194, 20, 20, 0, 35 );
-    cubes[26] = new Cube(10, 194, 20, 0, -45, 0 ); // wired a bit funky
-    cubes[27] = new Cube(28, 162, 20, 0, 0, 65);
-    cubes[28] = new Cube(15.5, 134, 20, 0, 0, 20);
-    cubes[29] = new Cube(13, 29, 40, 0, 0, 0, true, 0, 0);
-    cubes[30] = new Cube(55, 15, 40, 0, 0, 50, false, 0, 2);
-    cubes[31] = new Cube(78, 9, 40, 0, 0, 60, true, 5, 2);
-    cubes[32] = new Cube(80, 39, 40, 0, 0, 80, false, 0, 3);
-    cubes[33] = new Cube(34, 134, 40, 0, 0, 50, false, 0, 3);
-    cubes[34] = new Cube(42, 177, 40, 0, 0, 0);
-    cubes[35] = new Cube(41, 202, 40, 20, 0, 80);
-    cubes[36] = new Cube(21, 178, 40, 0, 0, 35);
-    cubes[37] = new Cube(18, 32, 60, 0, 0, 65, true, 0, 1);
-    cubes[38] = new Cube(44, 20, 60, 0, 0, 20); //front power cube
-    cubes[39] = new Cube(39, 149, 60, 0, 0, 15);
-    cubes[40] = new Cube(60, 186, 60, 0, 0, 45);
-    cubes[41] = new Cube(48, 213, 56, 20, 0, 25);
-    cubes[42] = new Cube(22, 222, 60, 10, 10, 15, false, 0, 3);
-    cubes[43] = new Cube(28, 198, 60, 20, 0, 20, true, 5, 0);
-    cubes[44] = new Cube(12, 178, 60, 0, 0, 50, false, 4, 1);
-    cubes[45] = new Cube(18, 156, 60, 0, 0, 40);
-    cubes[46] = new Cube(30, 135, 60, 0, 0, 45);
-    cubes[47] = new Cube(10, 42, 80, 0, 0, 17, true, 0, 2);
-    cubes[48] = new Cube(34, 23, 80, 0, 0, 45, false, 0, 1);
-    cubes[49] = new Cube(77, 28, 80, 0, 0, 45);
-    cubes[50] = new Cube(53, 22, 80, 0, 0, 45);
-    cubes[51] = new Cube(48, 175, 80, 0, 0, 45); 
-    cubes[52] = new Cube(66, 172, 80, 0, 0, 355, true, 5, 1);// _,195,_ originally
-    cubes[53] = new Cube(33, 202, 80, 25, 0, 85, false, 1, 3);
-    cubes[54] = new Cube(32, 176, 100, 0, 0, 20, false, 0, 2);
-    cubes[55] = new Cube(5.75, 69.5, 0, 0, 0, 80);
-    cubes[56] = new Cube(1, 53, 0, 40, 70, 70);
-    cubes[57] = new Cube(-15, 24, 0, 15, 0, 0);
-    //cubes[58] what the heck happened here? never noticed before 4/8/2013
-    cubes[59] = new Cube(40, 46, 100, 0, 0, 355, false, 2, 3); // copies from 75
-    cubes[60] = new Cube(40, 164, 120, 0, 0, 12.5, false, 4, 3);
-    cubes[61] = new Cube(32, 148, 100, 0, 0, 3, false, 4, 2);
-    cubes[62] = new Cube(30, 132, 90, 10, 350, 5);
-    cubes[63] = new Cube(22, 112, 100, 0, 20, 0, false, 4, 0);
-    cubes[64] = new Cube(35, 70, 95, 15, 345, 20);
-    cubes[65] = new Cube(38, 112, 98, 25, 0, 0, false, 4, 3);
-    cubes[66] = new Cube(70, 164, 100, 0, 0, 22);
-    cubes[68] = new Cube(29, 94, 105, 15, 20, 10, false, 4, 0);
-    cubes[69] = new Cube(30, 77, 100, 15, 345, 20, false, 2, 1);
-    cubes[70] = new Cube(38, 96, 95, 30, 0, 355);
-    //cubes[71] = new Cube(38,96,95,30,0,355); //old power cube
-    cubes[72] = new Cube(44, 20, 100, 0, 0, 345);
-    cubes[73] = new Cube(28, 24, 100, 0, 0, 13, true, 5, 1);
-    cubes[74] = new Cube(8, 38, 100, 10, 0, 0, true, 5, 1);
-    cubes[75] = new Cube(20, 58, 100, 0, 0, 355, false, 2, 3);
-    cubes[76] = new Cube(22, 32, 120, 15, 327, 345, false, 4, 0); 
-    cubes[77] = new Cube(50, 132, 80, 0, 0, 0, false, 0, 2); 
-    cubes[78] = new Cube(20, 140, 80, 0, 0, 0, false, 0, 3);
+    
+    int cubeIndex = 1;
+    
+    cubes[cubeIndex++] = new Cube(0, 0, 0, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(5, Cube.EDGE_HEIGHT, -10, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, -6, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(-5, 3*Cube.EDGE_HEIGHT, -2, 0, -20, 0);
+
+    cubes[cubeIndex++] = new Cube(15, 0, 50, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(20, Cube.EDGE_HEIGHT, 40, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(15, 2*Cube.EDGE_HEIGHT, 46, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(10, 3*Cube.EDGE_HEIGHT, 42, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(15, 4*Cube.EDGE_HEIGHT, 42, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5, 20, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(45, BASS_HEIGHT + 5+Cube.EDGE_HEIGHT, 10, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5+2*Cube.EDGE_HEIGHT, 14, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(35, BASS_HEIGHT + 5+3*Cube.EDGE_HEIGHT, 18, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5+4*Cube.EDGE_HEIGHT, 13, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 0, 10, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(85, BASS_HEIGHT + Cube.EDGE_HEIGHT, 0, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(75, BASS_HEIGHT + 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10, 10, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(125, BASS_HEIGHT + 10+Cube.EDGE_HEIGHT, 0, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10+2*Cube.EDGE_HEIGHT, 4, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(115, BASS_HEIGHT + 10+3*Cube.EDGE_HEIGHT, 8, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10+4*Cube.EDGE_HEIGHT, 3, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 0, 30, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(165, BASS_HEIGHT + Cube.EDGE_HEIGHT, 20, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 2*Cube.EDGE_HEIGHT, 24, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(155, BASS_HEIGHT + 3*Cube.EDGE_HEIGHT, 28, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 4*Cube.EDGE_HEIGHT, 23, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(200, 0, 10, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(205, Cube.EDGE_HEIGHT, 0, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(200, 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0);
+    cubes[cubeIndex++] = new Cube(200, 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0);
+
+    cubes[cubeIndex++] = new Cube(210, 0, 60, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 50, 0, 20, 0);
+    cubes[cubeIndex++] = new Cube(210, 2*Cube.EDGE_HEIGHT, 54, 0, 0, 0);
+    cubes[cubeIndex++] = new Cube(205, 3*Cube.EDGE_HEIGHT, 58, 0, -20, 0);
+    
     return cubes;
   }
 
   public int[][] buildFrontChannelList() {
     return new int[][] {
-      {
-        1, 57, 56, 55, 0  // Pandaboard A, structural channel 1
-      }
-      , 
-      {
-        31, 32, 17, 3, 0  // Pandaboard B, structural channel 2,  normally 30, 31, 32, 17, 3 (disconnected 30)
-      }
-      , 
-      {
-        20, 21, 15, 19, 0  // Pandaboard C, structural channel 3
-      }
-      , 
-      {
-        69, 75, 74, 76, 73  // Pandaboard D, structural channel 4, normally 64 first
-      }
-      , 
-      {
-        16, 2, 5, 0, 0  // Pandaboard E, structural channel 5
-      }
-      , 
-      {
-        48, 47, 37, 29, 0  // Pandaboard F, structural channel 6 (is there a 5th?)
-      }
-      , 
-      {
-        68, 63, 62, 78, 45  // Pandaboard G, structural channel 7, left top front side
-      }
-      , 
-      {
-        18, 6, 7, 0, 0  // Pandaboard H, structural channel 8
-      }
+      { 1, 2, 3, 0, 0 }, // ch1
+      { 4, 5, 6, 0, 0 }, // ch2
+      { 0, 0, 0, 0, 0 }, // ch3
+      { 0, 0, 0, 0, 0 }, // ch4
+      { 0, 0, 0, 0, 0 }, // ch5
+      { 0, 0, 0, 0, 0 }, // ch6
+      { 0, 0, 0, 0, 0 }, // ch7
+      { 0, 0, 0, 0, 0 }, // ch8 
     };
   }
 
   public int[][] buildRearChannelList() {
     return new int[][] {
-      {
-        22, 8, 14, 28, 0  // Pandaboard A, structural channel 9
-      }
-      , 
-      {
-        36, 34, 40, 52, 66  // Pandaboard B, structural channel 10
-      }
-      , 
-      {
-        65, 61, 60, 54, 51  // Pandaboard C, structural channel 11
-      }
-      , 
-      {
-        35, 25, 11, 10, 24  // Pandaboard D, structural channel 12
-      }
-      , 
-      {
-        23, 9, 13, 27, 12  // Pandaboard E, structural channel 13, missing taillight?
-      }
-      , 
-      {
-        64, 59, 72, 49, 50  // Pandaboard F, structural channel 14, right top backside (second cube is missing from sim)
-      }
-      , 
-      {
-        77, 39, 46, 33, 26  // Pandaboard G, structural channel 15
-      }
-      , 
-      {
-        44, 53, 42, 43, 41  // Pandaboard H, structural channel 16, last cube busted?
-      }
-    };
-  }
-
-  public int[][] buildFlippedRGBList() {
-    // syntax is {cube #, strip #, strip #, . . . }
-    return new int[][] { 
-      {
-        22, 4, 7
-      }
-      , 
-      {
-        50, 1, 3
-      }
-      , 
-      {
-        7, 1, 2, 11
-      }
-      , 
-      {
-        49, 1
-      }
-      , 
-      {
-        39, 1
-      }
-      , 
-      {
-        41, 1
-      }
-      , 
-      {
-        26, 3, 5
-      }
-      , 
-      {
-        64, 1
-      }
-      , 
-      {
-        32, 2
-      }
-      , 
-      {
-        20, 6, 7
-      }
-      , 
-      {
-        19, 1, 2
-      }
-      , 
-      {
-        15, 6, 8, 9
-      }
-      , 
-      {
-        29, 3, 10
-      }
-      , 
-      {
-        68, 4, 9
-      }
-      , 
-      {
-        18, 12
-      }
-      , 
-      {
-        6, 2, 4
-      }
-      , 
-      {
-        78, 11
-      }
-      , 
-      {
-        56, 2
-      }
-      , 
-      {
-        57, 3
-      }
-      , 
-      {
-        74, 6, 7
-      }
-      , 
-      {
-        21, 10
-      }
-      , 
-      {
-        37, 11
-      }
-      , 
-      {
-        61, 5
-      }
-      , 
-      {
-        33, 12
-      }
+      { 0, 0, 0, 0, 0 }, // ch9
+      { 0, 0, 0, 0, 0 }, // ch10
+      { 0, 0, 0, 0, 0 }, // ch11
+      { 0, 0, 0, 0, 0 }, // ch12
+      { 0, 0, 0, 0, 0 }, // ch13
+      { 0, 0, 0, 0, 0 }, // ch14
+      { 0, 0, 0, 0, 0 }, // ch15
+      { 0, 0, 0, 0, 0 }, // ch16
     };
   }
 }

diff --git a/_Overlay.pde b/_Overlay.pde
index 08e0befa89606f9d7ccfb8aaebd0e6682b822cca..2ff364dc8060c9c20dc9b2626615b7614ba1fb59 100644 (file)
--- a/_Overlay.pde
+++ b/_Overlay.pde
@@ -30,6 +30,7 @@ abstract class OverlayUI {
   protected final float knobIndent = .4;  
   protected final int knobSpacing = 6;
   protected final int knobLabelHeight = 14;
+  protected final int scrollWidth = 14;
   protected final color lightBlue = #666699;
   protected final color lightGreen = #669966;
   
@@ -76,13 +77,29 @@ abstract class OverlayUI {
     rect(104, height-16, 20, 12);
     fill(#666666);
     text("" + targetFramerate, 108, height-6);
+    text("PandaOutput (p):", 134, height-6);
+    fill(#000000);
+    rect(214, height-16, 26, 12);
+    fill(#666666);
+    text(pandaBoardsEnabled ? "ON" : "OFF", 218, height-6);
+
   }
 
   protected int drawObjectList(int yPos, String title, Object[] items, Method stateMethod) {
-    return drawObjectList(yPos, title, items, classNameArray(items, null), stateMethod);
+    int sz = (items != null) ? items.length : 0;
+    return drawObjectList(yPos, title, items, stateMethod, sz, 0);
   }
-  
+
+  protected int drawObjectList(int yPos, String title, Object[] items, Method stateMethod, int scrollLength, int scrollPos) {
+    return drawObjectList(yPos, title, items, classNameArray(items, null), stateMethod, scrollLength, scrollPos);
+  }
+
   protected int drawObjectList(int yPos, String title, Object[] items, String[] names, Method stateMethod) {
+    int sz = (items != null) ? items.length : 0;
+    return drawObjectList(yPos, title, items, names, stateMethod, sz, 0);
+  }
+  
+  protected int drawObjectList(int yPos, String title, Object[] items, String[] names, Method stateMethod, int scrollLength, int scrollPos) {
     noStroke();
     fill(titleColor);
     textFont(titleFont);
@@ -92,7 +109,8 @@ abstract class OverlayUI {
       textFont(itemFont);
       color textColor;      
       boolean even = true;
-      for (int i = 0; i < items.length; ++i) {
+      int yTop = yPos+6;
+      for (int i = scrollPos; i < items.length && i < (scrollPos + scrollLength); ++i) {
         Object o = items[i];
         int state = STATE_DEFAULT;
         try {
@@ -114,11 +132,21 @@ abstract class OverlayUI {
             fill(even ? #666666 : #777777);
             break;
         }
-        rect(leftPos, yPos+6, width, lineHeight);
+        rect(leftPos, yPos+6, w, lineHeight);
         fill(textColor);
         text(names[i], leftTextPos, yPos += lineHeight);
         even = !even;       
       }
+      if ((scrollPos > 0) || (scrollLength < items.length)) {
+        int yHere = yPos+6;
+        noStroke();
+        fill(color(0, 0, 0, 50));
+        rect(leftPos + w - scrollWidth, yTop, scrollWidth, yHere - yTop);
+        fill(#666666);
+        rect(leftPos + w - scrollWidth + 2, yTop + (yHere-yTop) * (scrollPos / (float)items.length), scrollWidth - 4, (yHere - yTop) * (scrollLength / (float)items.length));
+        
+      }
+      
     }
     return yPos;
   }
@@ -157,6 +185,7 @@ abstract class OverlayUI {
   abstract public void mousePressed();
   abstract public void mouseDragged();
   abstract public void mouseReleased();
+  abstract public void mouseWheel(int delta);
 }
 
 /**
@@ -173,6 +202,9 @@ class ControlUI extends OverlayUI {
   private int firstTransitionKnobY;
   private int firstEffectY;
   private int firstEffectKnobY;
+  
+  private final int PATTERN_LIST_LENGTH = 8;
+  private int patternScrollPos = 0;
 
   private int tempoY;
   
@@ -198,7 +230,7 @@ class ControlUI extends OverlayUI {
     drawLogoAndBackground();
     int yPos = 0;
     firstPatternY = yPos + lineHeight + 6;
-    yPos = drawObjectList(yPos, "PATTERN", patterns, patternNames, patternStateMethod);
+    yPos = drawObjectList(yPos, "PATTERN", patterns, patternNames, patternStateMethod, PATTERN_LIST_LENGTH, patternScrollPos);
     yPos += controlSpacing;
     firstPatternKnobY = yPos;
     int xPos = leftTextPos;
@@ -327,6 +359,7 @@ class ControlUI extends OverlayUI {
   private int patternKnobIndex = -1;
   private int transitionKnobIndex = -1;
   private int effectKnobIndex = -1;
+  private boolean patternScrolling = false;
   
   private int lastY;
   private int releaseEffect = -1;
@@ -336,6 +369,7 @@ class ControlUI extends OverlayUI {
     lastY = mouseY;
     patternKnobIndex = transitionKnobIndex = effectKnobIndex = -1;
     releaseEffect = -1;
+    patternScrolling = false;
     if (mouseY > tempoY) {
       if (mouseY - tempoY < tempoHeight) {
         lx.tempo.tap();
@@ -365,15 +399,21 @@ class ControlUI extends OverlayUI {
         patternKnobIndex += glucose.NUM_PATTERN_KNOBS / 2;
       }      
     } else if (mouseY > firstPatternY) {
-      int patternIndex = objectClickIndex(firstPatternY);
-      if (patternIndex < patterns.length) {
-        lx.goIndex(patternIndex);
+      if ((patterns.length > PATTERN_LIST_LENGTH) && (mouseX > width - scrollWidth)) {
+        patternScrolling = true;
+      } else {
+        int patternIndex = objectClickIndex(firstPatternY);
+        if (patternIndex < patterns.length) {
+          lx.goIndex(patternIndex + patternScrollPos);
+        }
       }
     }
   }
   
+  int scrolldy = 0;
   public void mouseDragged() {
     int dy = lastY - mouseY;
+    scrolldy += dy;
     lastY = mouseY;
     if (patternKnobIndex >= 0 && patternKnobIndex < glucose.NUM_PATTERN_KNOBS) {
       LXParameter p = glucose.patternKnobs.get(patternKnobIndex);
@@ -384,10 +424,15 @@ class ControlUI extends OverlayUI {
     } else if (transitionKnobIndex >= 0 && transitionKnobIndex < glucose.NUM_TRANSITION_KNOBS) {
       LXParameter p = glucose.transitionKnobs.get(transitionKnobIndex);
       p.setValue(constrain(p.getValuef() + dy*.01, 0, 1));
+    } else if (patternScrolling) {
+      int scroll = scrolldy / lineHeight;
+      scrolldy = scrolldy % lineHeight;
+      patternScrollPos = constrain(patternScrollPos - scroll, 0, patterns.length - PATTERN_LIST_LENGTH);
     }
   }
     
   public void mouseReleased() {
+    patternScrolling = false;
     tempoDown = false;
     if (releaseEffect >= 0) {
       effects[releaseEffect].trigger();
@@ -395,6 +440,15 @@ class ControlUI extends OverlayUI {
     }
   }
   
+  public void mouseWheel(int delta) {
+    if (mouseY > firstPatternY) {
+      int patternIndex = objectClickIndex(firstPatternY);
+      if (patternIndex < PATTERN_LIST_LENGTH) {
+        patternScrollPos = constrain(patternScrollPos + delta, 0, patterns.length - PATTERN_LIST_LENGTH);
+      }
+    }
+  }
+  
 }
 
 /**
@@ -582,8 +636,8 @@ class MappingUI extends OverlayUI {
     }
   }
 
-  public void mouseReleased() {
-  }
+  public void mouseReleased() {}
+  public void mouseWheel(int delta) {}
 
   public void mouseDragged() {
     final int DRAG_THRESHOLD = 5;

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index 6a4a3da021c760c15873fda6583fc155fa16b9b8..01b7169c345f49c5ac8aee12b4c27d370fa9050c 100644 (file)
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -25,13 +25,10 @@ public class PandaDriver {
   // List of point indices on the board
   private final int[] points;
 
-  // Bit for flipped status of each point index
-  private final boolean[] flipped;
-
   // Packet data
   private final byte[] packet = new byte[4*352]; // TODO: de-magic-number
 
-  public PandaDriver(NetAddress address, Model model, int[][] channelList, int[][] flippedList) {
+  public PandaDriver(NetAddress address, Model model, int[][] channelList) {
     this.address = address;
     message = new OscMessage("/shady/pointbuffer");
     List<Integer> pointList = buildMappedList(model, channelList);
@@ -40,7 +37,6 @@ public class PandaDriver {
     for (int value : pointList) {
       points[i++] = value;
     }
-    flipped = buildFlippedList(model, flippedList);
   }
 
   private ArrayList<Integer> buildMappedList(Model model, int[][] channelList) {
@@ -48,7 +44,7 @@ public class PandaDriver {
     for (int[] channel : channelList) {
       for (int cubeNumber : channel) {
         if (cubeNumber == 0) {
-          for (int i = 0; i < (Cube.CLIPS_PER_CUBE*Clip.STRIPS_PER_CLIP*Strip.POINTS_PER_STRIP); ++i) {
+          for (int i = 0; i < (Cube.FACES_PER_CUBE*Face.STRIPS_PER_FACE*Strip.POINTS_PER_STRIP); ++i) {
             points.add(0);
           }
         } else {
@@ -56,8 +52,14 @@ public class PandaDriver {
           if (cube == null) {
             throw new RuntimeException("Non-zero, non-existing cube specified in channel mapping (" + cubeNumber + ")");
           }
-          for (Point p : cube.points) {
-            points.add(p.index);
+          final int[] stripOrder = new int[] {
+            2, 1, 0, 3, 13, 12, 15, 14, 4, 7, 6, 5, 11, 10, 9, 8
+          };
+          for (int stripIndex : stripOrder) {
+            Strip s = cube.strips.get(stripIndex);
+            for (int j = s.points.size() - 1; j >= 0; --j) {
+              points.add(s.points.get(j).index);
+            }
           }
         }
       }
@@ -65,27 +67,6 @@ public class PandaDriver {
     return points;
   }
 
-  private boolean[] buildFlippedList(Model model, int[][] flippedRGBList) {
-    boolean[] flipped = new boolean[model.points.size()];
-    for (int i = 0; i < flipped.length; ++i) {
-      flipped[i] = false;
-    }
-    for (int[] cubeInfo : flippedRGBList) {
-      int cubeNumber = cubeInfo[0];
-      Cube cube = model.getCubeByRawIndex(cubeNumber);
-      if (cube == null) {
-        throw new RuntimeException("Non-existing cube specified in flipped RGB mapping (" + cubeNumber + ")");
-      }
-      for (int i = 1; i < cubeInfo.length; ++i) {
-        int stripIndex = cubeInfo[i];
-        for (Point p : cube.strips.get(stripIndex-1).points) {
-          flipped[p.index] = true;
-        }
-      }
-    }
-    return flipped;
-  } 
-
   public final void send(int[] colors) {
     int len = 0;
     int packetNum = 0;
@@ -94,11 +75,6 @@ public class PandaDriver {
       byte r = (byte) ((c >> 16) & 0xFF);
       byte g = (byte) ((c >> 8) & 0xFF);
       byte b = (byte) ((c) & 0xFF);
-      if (flipped[index]) {
-        byte tmp = r;
-        r = g;
-        g = tmp;
-      }
       packet[len++] = 0;
       packet[len++] = r;
       packet[len++] = g;
@@ -106,24 +82,24 @@ public class PandaDriver {
 
       // Flush once packet is full buffer size
       if (len >= packet.length) {
-        sendPacket(packetNum++, len);
+        sendPacket(packetNum++);
         len = 0;
       }
     }
 
     // Flush any remaining data
     if (len > 0) {
-      sendPacket(packetNum++, len);
+      sendPacket(packetNum++);
     }
   }
   
-  private void sendPacket(int packetNum, int len) {
+  private void sendPacket(int packetNum) {
     message.clearArguments();
     message.add(packetNum);
-    message.add(len);
+    message.add(packet.length);
     message.add(packet);
     try {
-      OscP5.flush(message, address);     
+      OscP5.flush(message, address);
     } catch (Exception x) {
       x.printStackTrace();
     }

diff --git a/code/GLucose.jar b/code/GLucose.jar
index bffecfd5f58bf6d8f8a3ce5fc5996cd21278d41e..171f7eaefe93851a1c49fceac20cdb9edeffdefd 100644 (file)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ