proposed new lattice, plus dpat changes

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
index 6c46e69b415213113408ff16a07b740136a0db48..3d72b5fddfd68c49beff96b763fc5a713c708284 100755 (executable)
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -21,6 +21,7 @@ public class Pong extends DPat {
        void    StartRun(double deltaMs)        { cRad = mMax.x*pSize.Val()/6; }\r
        color   CalcPoint(xyz p)                {\r
                v.set(x.getValuef(), y.getValuef(), z.getValuef());\r
+               v.z=0;p.z=0;// ignore z dimension\r
                switch(pChoose.Cur()) {\r
                case 0: vMir.set(mMax); vMir.subtract(p);\r
                                return color(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad));        // balls\r
@@ -162,7 +163,7 @@ public class Play extends DPat
        DParam  pAmp, pRadius, pBounce;\r
 \r
        float   t,amp,rad,bnc;\r
-       \r
+       float   zTheta=0;\r
        ArrayList<rWave> waves = new ArrayList<rWave>(10);\r
        \r
        rAngle  a1 = new rAngle(), a2 = new rAngle(),\r
@@ -184,7 +185,7 @@ public class Play extends DPat
                pBounce         = addParam("Bnc"        , .2    );\r
            pAmp                = addParam("Amp"        , .2    );\r
                pTempoMult      = addPick ("TMult"      , 0 , 5         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );\r
-               pTimePattern= addPick ("TPat"   , 6 , 7         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}   );\r             pShape          = addPick ("Shape"      , 2 , 15        , new String[] {"Line", "Tap", "V", "RandV",\r
+               pTimePattern= addPick ("TPat"   , 6 , 7         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}   );\r             pShape          = addPick ("Shape"      , 3 , 15        , new String[] {"Line", "Tap", "V", "RandV",\r
                                                                                                                                        "Pyramid", "Wings", "W2", "Clock",\r
                                                                                                                                        "Triangle", "Quad", "Sphere", "Cone",\r
                                                                                                                                        "Noise", "Wave", "?", "?"}                                              );\r
@@ -208,13 +209,15 @@ public class Play extends DPat
                }\r
        }\r
 \r
+       void StartPattern() { zTheta=0; }\r
        void StartRun(double deltaMs) {\r
                t       = lx.tempo.rampf();\r
                amp = pAmp.Val();\r
                rad     = pRadius.getValuef();\r
                bnc     = pBounce.getValuef();          \r
+               zTheta  += deltaMs*(pSpin .Val()-.5)*.01;\r
 \r
-               Theta   .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2);\r
+               Theta   .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta);\r
                TSin    .set(sin(Theta.x), sin(Theta.y), sin(Theta.z));\r
                TCos    .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));\r
 \r
@@ -278,7 +281,7 @@ public class Play extends DPat
 \r
                float mp        = min(Pn.x, Pn.z);\r
                float yt        = map(t,0,1,.5-bnc/2,.5+bnc/2);\r
-               float r;\r
+               float r,d;\r
 \r
                switch (pShape.Cur()) {\r
                case 0:         V.set(Pn.x, yt                                                          , Pn.z);                                                        break;  // bouncing line\r
@@ -295,30 +298,38 @@ public class Play extends DPat
                case 5:         V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
                case 6:         V.set(Pn.x, bnc*map((mp  -.5)*(mp  -.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
 \r
-\r
-\r
-               case 7:         return color(0,0, min(\r
+               case 7:         d = min(\r
                                                distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y),\r
-                                               distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y)) <rad*40?100:0); // clock\r
+                                               distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y));\r
+                                       d = constrain(30*(rad*40-d),0,100);\r
+                                       return color(0,max(0,150-d), d); // clock\r
 \r
-               case 8:         r = amp*200 * map(bnc,0,1,1,sin(PI*t)); return color(0,0, min(\r
+               case 8:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));\r
+                                       d = min(\r
                                                distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),\r
                                                distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),\r
                                                distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r))                             // triangle\r
-                                               ) <rad*40?100:0);\r
-                                               \r
-               case 9:         r = amp*200 * map(bnc,0,1,1,sin(PI*t)); return color(0,0, min(\r
+                                               );\r
+                                       d = constrain(30*(rad*40-d),0,100);\r
+                                       return color(0,max(0,150-d), d); // clock\r
+\r
+               case 9:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));\r
+                                       d = min(\r
                                                distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),\r
                                                distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),\r
                                                distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),\r
                                                distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r))                             // quad\r
-                                               ) <rad*40?100:0); // shape\r
+                                       );\r
+                                       d = constrain(30*(rad*40-d),0,100);\r
+                                       return color(0,max(0,150-d), d); // clock\r
 \r
-                                               \r
-               case 10:        r = map(bnc,0,1,a1.r,amp*200*sin(PI*t)); \r
+               case 10:\r
+                                       r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));\r
                                        return color(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) );           // sphere\r
 \r
-               case 11:        return color(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0));                              // cone\r
+               case 11:\r
+                                       Px.z=mCtr.z; cMid.z=mCtr.z;\r
+                                       return color(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0));                              // cone\r
 \r
                case 12:        return color(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200,\r
                                                85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0));   // noise\r
@@ -330,7 +341,9 @@ public class Play extends DPat
                default:        return color(0,0,0);\r
                }\r
 \r
-               return color(0,0,c1c(1 - V.distance(Pn)/rad));\r
+               return color(0,\r
+                               150-c1c(1 - V.distance(Pn)/rad),\r
+                               c1c(1 - V.distance(Pn)/rad));\r
        }\r
 }\r
 //----------------------------------------------------------------------------------------------------------------------------------\r

diff --git a/DanUtil.pde b/DanUtil.pde
index 9bc52185541638b619efa11955527ccd8f34eb4c..4ce685ad68f0d63e56d08e1a366378f80700e63f 100644 (file)
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -114,6 +114,7 @@ public class DGlobals {
        MidiInput       APCIn                   = null,         OxygenIn                = null;
        DPat            CurPat                  = null;
        int                     KeyPressed              = -1;
+       boolean         bSustain                = false;
 
        
        float           Sliders[]               = new float [] {1,0,0,0,0,0,0,0};
@@ -144,6 +145,7 @@ public class DGlobals {
        boolean         isFocused  ()           { return CurPat != null && CurPat == midiEngine.getFocusedDeck().getActivePattern(); }
        void            Deactivate (DPat p) { if (p != CurPat) return; uiDebugText.setText(""); CurPat = null;                                   }
        void            Activate   (DPat p) {
+               bSustain = false;
                CurPat = p;
                while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
                for (int i=0; i<p.params.size(); i++) GetParam(i).reset();
@@ -181,12 +183,17 @@ public class DGlobals {
                int row = note.getPitch(), col = note.getChannel();
                for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, false)) return;
                UpdateLights();
+               bSustain=false;
        }
 
        void noteOnReceived (Note note) { if (!isFocused()) return;
                int row = note.getPitch(), col = note.getChannel();
                for (int i=0; i<CurPat.picks.size(); i++) if (GetPick(i).set(row, col))           return;
                for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, true)) return;
+
+               if (row == 84 && col==0) { Activate(CurPat); CurPat.StartPattern(); return; }
+               if (row == 85 && col==0) { bSustain=true; return; }
+               
                if (row == 52) { KeyPressed = col; return; }
                println("row: " + row + "  col:   " + col);
        }
@@ -208,7 +215,7 @@ public class DPat extends SCPattern
        float           NoiseMove       = random(10000);
        DParam          pRotX, pRotY, pRotZ, pSpin, pSharp, pSaturate, pTransX, pTransY;
        
-       DBool           pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pKey;
+       DBool           pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pKey, pInvert;
        float           Dist     (xyz a, xyz b)                         { return dist(a.x,a.y,a.z,b.x,b.y,b.z);         }
        int                     c1c              (float a)                                      { return round(100*constrain(a,0,1));           }
        float           interpWv(float i, float[] vals)         { return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); }
@@ -256,15 +263,17 @@ public class DPat extends SCPattern
                pYsym           =       new DBool("Y-SYM", false, 49, 1);       bools.add(pYsym );
                pRsym           =       new DBool("R-SYM", false, 49, 2);       bools.add(pRsym );
                pXdup           =       new DBool("X-DUP", false, 49, 3);       bools.add(pXdup );
-               pJog            =       new DBool("JOGGER",false, 49, 4);       bools.add(pJog  );
-               pKey            =       new DBool("KBD"   ,false, 49, 5);       bools.add(pKey  );
+               pJog            =       new DBool("JOG"  ,false, 49,  4);       bools.add(pJog  );
+               pKey            =       new DBool("KBD"  ,false, 49,  5);       bools.add(pKey  );
+               pInvert         =       new DBool("INVRT",false, 49,  6);       bools.add(pInvert);
+
                modmin          =       new xyz(model.xMin, model.yMin, model.zMin);
                mMax            =       new xyz(model.xMax, model.yMax, model.zMax); mMax.subtract(modmin);
                mCtr            =       new xyz(mMax); mCtr.scale(.5);
                mHalf           =       new xyz(.5,.5,.5);
                xWaveNz         =       new float[ceil(mMax.y)+1];
                yWaveNz         =       new float[ceil(mMax.x)+1];
-               
+
                //println (model.xMin + " " + model.yMin + " " +  model.zMin);
                //println (model.xMax + " " + model.yMax + " " +  model.zMax);
                DG.Init();
@@ -321,13 +330,17 @@ public class DPat extends SCPattern
                        if (pRsym.b)    { tP.set(mMax.x-P.x,mMax.y-P.y,mMax.z-P.z);             cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
                        if (pXdup.b)    { tP.set((P.x+mMax.x*.5)%mMax.x,P.y,P.z);               cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
 
+                       float                                                           s =     saturation(cNew) + 100*(fSaturate*2-1);
                        float                                                           b = brightness(cNew)/100.;
                        if (pSharp.Val()>0)                             b = b < .5 ? pow(b,fSharp) : 1-pow(1-b,fSharp);
                        if (DG._Trails()>0 && fQuant == 0)      b = max(b, (float) (brightness(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
+                       if (DG.bSustain == true)                        b = max(b, (float) (brightness(cOld)/100.));
+
+                       if (pInvert.b)  { b = 1-b; s = 1-s; }
 
                        colors[p.index] = color(
                                (hue(cNew) + zSpinHue) % 360,
-                               saturation(cNew) + 100*(fSaturate*2-1),
+                               s,
                                100 *  b * DG._Level()
                        );
 

diff --git a/_Internals.pde b/_Internals.pde
index f25f74a89473cece0229c6e052d65296ec1377e4..4dd145a80d62964c190e6ff1bea08d84261c53a6 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -508,8 +508,8 @@ void mouseReleased() {
     context.mouseReleased(mouseX, mouseY);
   }
 }
- 
-void mouseWheel(int delta) {
+
+void mouseWheel(int delta) {delta*=20;
   boolean wheeled = false;
   for (UIContext context : overlays) {
     wheeled |= context.mouseWheel(mouseX, mouseY, delta);

diff --git a/_Mappings.pde b/_Mappings.pde
index 5daf703331ffcfd86212e0c917772d219698b303..6a6294edab9c02fd8a6a44de714451f65867a441 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -15,7 +15,6 @@
 
 public Model buildModel() {
 
-  
   // Shorthand helpers for specifying wiring more quickly
   final Cube.Wiring WFL = Cube.Wiring.FRONT_LEFT;
   final Cube.Wiring WFR = Cube.Wiring.FRONT_RIGHT;
@@ -24,13 +23,13 @@ public Model buildModel() {
   
   // Utility value if you need the height of a cube shorthand
   final float CH = Cube.EDGE_HEIGHT;
+  final float CW = Cube.EDGE_WIDTH ;
   
   // Positions for the bass box
   final float BBY = BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH;
   final float BBX = 56;
   final float BBZ = 2;
 
-
   // The model is represented as an array of towers. The cubes in the tower
   // are represenented relatively. Each tower has an x, y, z reference position,
   // which is typically the base cube's bottom left corner.
@@ -45,227 +44,46 @@ public Model buildModel() {
   //
   // The cubes automatically increment their y-position by Cube.EDGE_HEIGHT.
 
-  // To-Do:  (Mark Slee, Alex Green, or Ben Morrow):   The Cube # is determined by the order in this list.  "raw object index" is serialized by running through towermapping and then individual cube mapping below.
-  //  We can do better than this.  The raw object index should be obvious from the code-- looking through the rendered simulation and counting through cubes in mapping mode is grossly inefficient. 
-  TowerMapping[] towerCubes = new TowerMapping[] {
-    
-   
-  
-   //back left cubes: temp Channel 1 
-  new TowerMapping(0, 3*Cube.EDGE_HEIGHT, 72, new CubeMapping[] {
-      new CubeMapping(0, 14,  -45 , WRL), // #1
-      new CubeMapping(10, -12, -20, WFL), //#2
-      new CubeMapping(5, 9, 45, WRR),  //#3
-     
-      
-    }),
-    //back left cube tower: Channel 2 
-    new TowerMapping(0, Cube.EDGE_HEIGHT, 70, new CubeMapping[] {
-     new CubeMapping(18, -2.5, 45, WRL),  //#4
-     new CubeMapping(15, -6, 45, WFR),  //#5
-      new CubeMapping(-6 , 7, 5,  WRR),  //#6
-      new CubeMapping(18, 11, -5, WFL)
-     
-   }),
-    
-     //second from left back tower: Channel 3
-      new TowerMapping(31, Cube.EDGE_HEIGHT, 73.5, new CubeMapping[] {
-       new CubeMapping( 12.5, 5.5 , 10 , WRR),
-       new CubeMapping( 16.5, 2.5 , 30, WRR),
-      new CubeMapping( 16.5, 3, 10, WRR),
-      new CubeMapping(.5, 4.5, -10 , WFL)
-    } ), 
-    
-          //center tower,  Channel 4
-     new TowerMapping(106, Cube.EDGE_HEIGHT, 84, new CubeMapping[] {
-       new CubeMapping( -3.5, -2, 10, WFL),
-       new CubeMapping( -11, 5, 30, WFR),
-      new CubeMapping( 13.5, 2, 15, WRR),
-      new CubeMapping(20.75, -4, 35 , WRL)
-    } ), 
-    
-        //second from back right tower,  Channel 5
-   
-    new TowerMapping(160, Cube.EDGE_HEIGHT, 78, new CubeMapping[] {
-       new CubeMapping( -31.5, -.5 , 5 , WFR),
-       new CubeMapping( 7, -.5, 60, WRL),
-      new CubeMapping( -5.5, -3, 0, WFR),
-      new CubeMapping(22 , 2 , 30 , WRL)
-    }), 
-     
-    
-  //back right cubes: temp Channel 6
-   new TowerMapping(201, Cube.EDGE_HEIGHT, 72, new CubeMapping[] {
-     new CubeMapping(7.5, 6, 25, WRL),
-     new CubeMapping(-4.5, -0.5, 18, WFR),
-      new CubeMapping(8.5, .5, 30,  WRL),
-      new CubeMapping(-7, -14, 10, WFR)
-     
-   }),
-
-    
-   
-   
-         
-       //tower to the right of BASS BOX
-     new TowerMapping (192, Cube.EDGE_HEIGHT, 40, new CubeMapping[] {
-       new CubeMapping(-6, 4, -10, WRL), 
-       new CubeMapping(5 ,5 , 5, WFR ), 
-       new CubeMapping(-2, .5 , -3, WFL), 
-       new CubeMapping(-10, 5.5 , -20, WRR )
-     }),
-     
-     //end right tower in middle, right of previous tower
-      //new TowerMapping (214, Cube.EDGE_HEIGHT, 37, new CubeMapping[] {
-       //new CubeMapping(10,0 ,  50, WRR), 
-       //new CubeMapping(5 ,5 , 65, WFL)
-     //}),
-//    // DJ booth, from back left to back right
+  // To-Do:  (Mark Slee, Alex Green, or Ben Morrow):   The Cube # is determined by the order in this list.
+  // "raw object index" is serialized by running through towermapping and then individual cube mapping below.
+  //  We can do better than this.  The raw object index should be obvious from the code-- looking through the
+  //  rendered simulation and counting through cubes in mapping mode is grossly inefficient. 
 
- new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(3, 28, 3, WFL),
-      new CubeMapping(-4, -8, 10, WFR),
-      new CubeMapping(-15, 8, 40, WFR)
-     
-      
-    }),
-
-    
- 
-    new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(-7.25, 7.5, -25, WFR),
-      new CubeMapping(7.5, -15.75, 12, WRL),
-     
-      
-    }),
-    new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(19.625, 5.375, -22, WFR),
-      new CubeMapping(8, -14.5, 10, WRR),
-    }),
-    new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(48, 4.75, -35, WRL),
-      new CubeMapping(8, -15, 10, WRR),
-    }),
-    new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(78.75, 3.75, -28, WRR),
-      new CubeMapping(8, -15, 10, WRR),
-    }),
-    
-    // next two are right DJ channel
-    
-   new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(105, 20.5, 20, WRR),
-      new CubeMapping(6, -6, 30, WFR),
-   }),
-   
-      new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] {
-      new CubeMapping(104.75, 0, -27, WRL),
-      new CubeMapping(8, -15, 10, WFL),      
-    }),    
-    
-   
-  };
+  TowerMapping[] towerCubes = new TowerMapping[] {};
   
   // Single cubes can be constructed directly here if you need them
   Cube[] singleCubes = new Cube[] {
-    // Back left channel behind speaker
-    new Cube(15, int( Cube.EDGE_HEIGHT), 39, 0, 10, 0,  WRL), 
-    
-    // Top left Channel Above DJ booth
-    
-    //new Cube(35, int(5*Cube.EDGE_HEIGHT ),  52, 0, 10, 0, WRR), 
-    //new Cube(56, int(5*Cube.EDGE_HEIGHT ),  69, 0, 10, 0, WFL), 
-    //new Cube(76, int(5*Cube.EDGE_HEIGHT ),  61, 0, -45, 0, WRL), 
-    
-    // Next channel to the right, same height
-    //new Cube(85, int(5*Cube.EDGE_HEIGHT ),  77, 0, 20, 0, WRL), 
-    //new Cube(92, int(6*Cube.EDGE_HEIGHT ),  63, 0,20, 0, WRR), 
-    //new Cube(86, int(6*Cube.EDGE_HEIGHT ),  47, 0, -45, 0, WRL), 
-    //new Cube(123, int(6*Cube.EDGE_HEIGHT ),  31, 0, 20, 0, WFR), 
-     
-    // Next channel to right, same height
-    //new Cube(111, int(5*Cube.EDGE_HEIGHT ),  79, 0, 30, 0, WRL), 
-    //new Cube(125, int(6*Cube.EDGE_HEIGHT ),  76, 0,27, 0, WRL), 
-    //new Cube(144, int(5*Cube.EDGE_HEIGHT ),  44, 0, 45, 0, WRR), 
-    //new Cube(134, int(5*Cube.EDGE_HEIGHT ),  42, 0, 45, 0, WRL), 
-     
-    // Next channel to right
-    new Cube(185, int(4*Cube.EDGE_HEIGHT ),  73, 0, -45, 0, WRR), 
-    //new Cube(170, int(5*Cube.EDGE_HEIGHT ),  58, 0,40, 0, WRL), 
-    //new Cube(158, int(6*Cube.EDGE_HEIGHT ),  34, 0, 40, 0, WFR), 
-    //new Cube(130, int(6*Cube.EDGE_HEIGHT ),  10, 0, -5, 30, WRL), 
-     
-    // Next channel highest to the right
-    //new Cube(203, int(5*Cube.EDGE_HEIGHT ),  55, 0, 35, 0, WRR), 
-    //new Cube(174, int(5*Cube.EDGE_HEIGHT ),  32, 0,35, 0, WFR), 
-    //new Cube(178, int(6.5*Cube.EDGE_HEIGHT ),  16, 0, 20 , 30, WRL), 
-    //new Cube(212, int(6.5*Cube.EDGE_HEIGHT ), 23, 0, 20 ,30, WRR), 
-     
-    // Last channel
-    //new Cube(204, int(5*Cube.EDGE_HEIGHT ),  28, 0, 25, 0, WFR), 
-    //new Cube(185, int(6*Cube.EDGE_HEIGHT ),  38, 0,40, 0, WRR), 
-    
-    // New cubes above DJ deck
-    new Cube(BBX + 78.5, BBY + 2*Cube.EDGE_HEIGHT, BBZ, 0, 10, 0, WRR), 
-    new Cube(BBX + 49.5, BBY + 2*Cube.EDGE_HEIGHT, BBZ - 7, 0, 10, 0, WRR),
-    new Cube(BBX + 13, BBY + 2*Cube.EDGE_HEIGHT, BBZ + 11, 0, -30, 0, WRL), 
-    new Cube(BBX - 15, BBY + 2*Cube.EDGE_HEIGHT, BBZ + 30, 0, -35, 0, WRR), 
-       
-    // New cubes above DJ deck at crazy angles
-    new Cube(BBX - 5, BBY + 3*Cube.EDGE_HEIGHT, BBZ + 15.5, 0, -15, 0, WRL), 
-    new Cube(BBX + 27, BBY + 3*Cube.EDGE_HEIGHT, BBZ + 12.5, 0, -18, -15, WRR),
-    new Cube(BBX + 59, BBY + 3*Cube.EDGE_HEIGHT + 4, BBZ + 12.5, -12, 10, -10, WRL), 
-    new Cube(BBX + 93, BBY + 3*Cube.EDGE_HEIGHT + 7, BBZ + 20.5, -15, 20, -35, WRR), 
-       
-    // New cubes on right side of DJ deck
-    new Cube(161, BBY + 2*Cube.EDGE_HEIGHT, 15, 0, -40, 0, WFR), 
-    new Cube(161, BBY + 3*Cube.EDGE_HEIGHT, 24, 0, -30, 0, WFL),
-    new Cube(165, BBY + 4*Cube.EDGE_HEIGHT, 41, 0, 5, 0, WFR), 
-     
-    // New cubes top back left
-    new Cube(BBX + 32, 5*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 7, 0, -25, 0, WFR), 
-    new Cube(BBX + 5.5,  5*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH +7, 0, -25, 0, WFL),
-    new Cube(BBX - 23,  5*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 11, 0, -25, 0, WFL), 
-    new Cube(BBX - 33,  5*Cube.EDGE_HEIGHT + 8, BBZ +BassBox.EDGE_DEPTH- 29, 0, 10, 0, WFL), 
-      
-    // On top of previous channel
-    new Cube(BBX + 22, 6*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH , 0, 5, 0, WRL), 
-    new Cube(BBX + 27,  6*Cube.EDGE_HEIGHT - 13, BBZ + BassBox.EDGE_DEPTH- 25, 0, 3, -20, WRR),
-    new Cube(BBX +5,  6*Cube.EDGE_HEIGHT - 13, BBZ + BassBox.EDGE_DEPTH -27, 0, 5, -15, WRL), 
-    new Cube(BBX - 11,  6*Cube.EDGE_HEIGHT -1.5, BBZ +BassBox.EDGE_DEPTH - 11, 0, 30, 0, WRR), 
-      
-    // Top center
-    new Cube(BBX +37, 6*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH +13 , 0, 15, 0, WRR), 
-    new Cube(BBX + 64,  6*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 25, 0, 15, 0, WFR),
-    new Cube(BBX + 64,  6*Cube.EDGE_HEIGHT - 3, BBZ + BassBox.EDGE_DEPTH -4 , 0, 0, -30, WRL), 
-    new Cube(BBX + 87.5,  6*Cube.EDGE_HEIGHT + 13, BBZ +BassBox.EDGE_DEPTH - 10, 0, 0, 0, WRL), 
-      
-    // Top right
-    new Cube(BBX + 76, 107.5, BBZ + BassBox.EDGE_DEPTH + 23, 0, -40, 0, WRR), 
-    new Cube(BBX +  98, 129, BBZ + BassBox.EDGE_DEPTH - 5, 0, 10, 0, WRR),
-    new Cube(BBX + 104,  107.5, BBZ + BassBox.EDGE_DEPTH + 17, 0, -35, 0, WRR), 
-    new Cube(BBX + 129,  107.5, BBZ +BassBox.EDGE_DEPTH +10, 0, -35, 0, WFL), 
-      
-    new Cube(179, 4*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 14,0, -20, 0 , WFR),
-
-    // Lonely cube at top left, one cube channel
-    new Cube(BBX - 36,  4*Cube.EDGE_HEIGHT + 8, BBZ +BassBox.EDGE_DEPTH- 38, 0, 10, 0, WFL)
-
+    // new Cube(15, int( Cube.EDGE_HEIGHT), 39, 0, 10, 0,  WRL),     // Back left channel behind speaker
     // new Cube(x, y, z, rx, ry, rz, wiring),
   };
 
   // The bass box!
-  BassBox bassBox = BassBox.unlitBassBox(BBX, 0, BBZ); // frame exists, no lights
-  // BassBox bassBox = BassBox.noBassBox(); // no bass box at all
+  // BassBox bassBox = BassBox.unlitBassBox(BBX, 0, BBZ); // frame exists, no lights
+     BassBox bassBox = BassBox.noBassBox(); // no bass box at all
   // BassBox bassBox = new BassBox(BBX, 0, BBZ); // bass box with lights
  
   // The speakers!
   List<Speaker> speakers = Arrays.asList(new Speaker[] {
      // Each speaker parameter is x, y, z, rotation, the left speaker comes first
-//     new Speaker(-12, 6, 0, 15),
-//     new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15)
+     // new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15)
   });
 
+
+  ////////////////////////////////////////////////////////////////////////
+  // dan's proposed lattice
+  ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
+  for (int i=0; i<9; i++) scubes.add(new StaggeredTower(
+               (i+1)*CW,                                                // x
+               (i % 2 == 0) ? 0 : CH * 2./3.,   // y
+        - ((i % 2 == 0) ? 0 : 11) + 97  ,   // z
+          -135, (i % 2 == 0) ? 7 : 6));         // num cubes
+
+  ArrayList<Cube> dcubes = new ArrayList<Cube>();
+  for (int i=0; i<7; i++) {
+       if (i>0) dcubes.add(new Cube(-6+CW*4/3*i             , 0, 0, 0, 0, 0, WRR));    
+                        dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR));     
+  }
+
   //////////////////////////////////////////////////////////////////////
   //      BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!!        //
   //////////////////////////////////////////////////////////////////////
@@ -287,8 +105,15 @@ public Model buildModel() {
     }
     towerList.add(new Tower(tower));
   }
-  for (Cube cube : singleCubes) {
-    cubes[cubeIndex++] = cube;
+
+  for (Cube cube : singleCubes) cubes[cubeIndex++] = cube;
+  for (Cube cube : dcubes)             cubes[cubeIndex++] = cube;
+
+  for (StaggeredTower st : scubes) {
+    tower = new ArrayList<Cube>();
+    for (int i=0; i < st.n; i++)
+      tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, WRR));
+    towerList.add(new Tower(tower));
   }
 
   return new Model(towerList, cubes, bassBox, speakers);
@@ -304,50 +129,51 @@ public PandaMapping[] buildPandaList() {
   
   // 8 channels map to:  3, 4, 7, 8, 13, 14, 15, 16.
   return new PandaMapping[] {
-    new PandaMapping(
-      "10.200.1.30", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39, 40, 41, 42 }), // 30 J3 *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 36, 35}),  // 30 J4 //ORIG *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J7 *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18, 19}),  // 30 J8 *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J13 (not working)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 (unplugged)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J15 (unplugged)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 53, 54, 55, 72 }), // 30 J16
-    }),
-    new PandaMapping(
-      "10.200.1.29", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J3  (not connected)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J4  (not connected)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30,  2}),  // 29 J7
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33, 34, 32, 31}),  // 29 J8  //XXX   
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J13 //XX //bassbox  (not working)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J14 (not working)
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12, 13, 14, 15 }), // 29 J15
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  8,  9, 10, 11 }), // 29 J16
-    }),    
+    // new PandaMapping(
+    //   "10.200.1.30", new ChannelMapping[] {
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39, 40, 41, 42 }), // 30 J3 *
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 36, 35}),  // 30 J4 //ORIG *
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J7 *
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18, 19}),  // 30 J8 *
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J13 (not working)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 (unplugged)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J15 (unplugged)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 53, 54, 55, 72 }), // 30 J16
+    // }),
+    // new PandaMapping(
+    //   "10.200.1.29", new ChannelMapping[] {
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J3  (not connected)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J4  (not connected)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30,  2}),  // 29 J7
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33, 34, 32, 31}),  // 29 J8  //XXX   
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J13 //XX //bassbox  (not working)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 29 J14 (not working)
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12, 13, 14, 15 }), // 29 J15
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  8,  9, 10, 11 }), // 29 J16
+    // }),    
     new PandaMapping(
       "10.200.1.28", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 60, 61, 62, 63 }), // 28 J3
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 28 J4
+/*        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 60, 61, 62, 63 }), // 28 J3
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33, 34, 32, 31}),                // 28 J4
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45, 46, 47, 48 }), // 28 J7
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 28 J8
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}),                // 28 J8
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  4,  5,  6,  7}),  // 28 J13
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 64, 65, 66, 67 }), // 28 J14
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 68, 69, 70, 71 }), // 28 J15
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49, 50, 51, 52}),  // 28 J16
-    }),    
-    new PandaMapping(
-      "10.200.1.31", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J3
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J4
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 73}),                // 31 J7
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}),  // 31 J8
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J13
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}),  // 31 J14
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}),  // 31 J15
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J16
-    }),
+*/
+   }),    
+    // new PandaMapping(
+    //   "10.200.1.31", new ChannelMapping[] {
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J3
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J4
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 73}),                // 31 J7
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}),  // 31 J8
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J13
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}),  // 31 J14
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}),  // 31 J15
+    //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J16
+    // }),
   };
 }
 
@@ -368,9 +194,8 @@ class CubeMapping {
   public final Cube.Wiring wiring;
   
   CubeMapping(float dx, float dz, Cube.Wiring wiring) {
-    this(dx, dz, 0, wiring);
+    this(dx, dz, 0., wiring);
   }
-
   CubeMapping(float dx, float dz, float ry) {
     this(dz, dz, ry, Cube.Wiring.FRONT_LEFT);
   }
@@ -383,6 +208,12 @@ class CubeMapping {
   }
 }
 
+class StaggeredTower {
+  public final float x, y, z, r;
+  public final int n;
+  StaggeredTower(float _x, float _y, float _z, float _r, int _n) { x=_x; y=_y; z=_z; r=_r; n=_n;}
+}
+
 /**
  * Each panda board has an IP address and a fixed number of channels. The channels
  * each have a fixed number of pixels on them. Whether or not that many physical