X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=_Mappings.pde;h=6877e63335415de61c1b2b2b483419743a06e6f5;hp=a07c6d4448efb47360f9ab68c24276596b475d18;hb=270a8b44cd8296bb40fa74e4fcf2e7f7c4f1192c;hpb=e28f168cec8ae5a8c25cae159af94f5b0aa7b342 diff --git a/_Mappings.pde b/_Mappings.pde index a07c6d4..6877e63 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -13,9 +13,11 @@ * when physical changes or tuning is being done to the structure. */ +final int MaxCubeHeight = 6; +final int NumBackTowers = 16; + 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 +26,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. @@ -44,179 +46,150 @@ public Model buildModel() { // y-axis. // // The cubes automatically increment their y-position by Cube.EDGE_HEIGHT. - TowerMapping[] towerCubes = new TowerMapping[] { - - - - //back left cubes: temp Channel 1 - new TowerMapping(0, Cube.EDGE_HEIGHT, 72, new CubeMapping[] { - new CubeMapping(0, 14, -45 , WRL), - new CubeMapping(18, -12, -20, WFL), - new CubeMapping(5, 9, 45, WRR), - - - }), - //back left cube tower: Channel 2 - new TowerMapping(0, Cube.EDGE_HEIGHT, 70, new CubeMapping[] { - new CubeMapping(18, -2.5, 45, WRL), - new CubeMapping(15, -6, 45, WFR), - new CubeMapping(-6 , 7, 5, WRR), - 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 - - new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] { - new CubeMapping(3, 28, 3, WFL), - new CubeMapping(-2, 11.5, 10, WFR), - new CubeMapping(10.5, 4.5, 40, WFR) - - - }), + // 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(-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), - new Cube(-6, int(Cube.EDGE_HEIGHT), 47, 0, 20, 0, WFR), - new Cube(0, int(2*Cube.EDGE_HEIGHT), 46, 0, 40, 0, WRR), - - // Top left Channel Above DJ booth - new Cube(33, int(4.5*Cube.EDGE_HEIGHT ), 28, 0, 10, 0, WRR), - 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 Cube(x, y, z, rx, ry, rz, wiring), + // 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), + //new Cube(0,0,0,0,225,0, WRR), }; // The bass box! - //BassBox bassBox = new BassBox(BBX, 0, BBZ); - //test for Alex, should be commented out + // 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 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) - // }); + List speakers = Arrays.asList(new Speaker[] { + // Each speaker parameter is x, y, z, rotation, the left speaker comes first + // new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15) + }); + + + //////////////////////////////////////////////////////////////////////// + // dan's proposed lattice + ArrayList scubes = new ArrayList(); + //if (NumBackTowers != 25) exit(); + for (int i=0; i dcubes = new ArrayList(); + // for (int i=1; i<6; i++) { + // if (i>1) 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)); + // } + +float current_x_position = 0; +// scubes.add(new StaggeredTower(//tower 1 +// current_x_position, // x +// 15 , // y +// 0 , // z +// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(// tower 2 +// current_x_position, // x +// 0 , // y +// -10.5 , // z +// 45, 6, new Cube.Wiring[] { WFR, WFL, WRR, WRR, WFL, WRR}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(//tower 3 +// current_x_position, // x +// 15 , // y +// 0, // z +// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WRR, WFL, WRR}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(//tower 4 +// current_x_position, // x +// 0, // y +// -10.5 , // z +// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); +// current_x_position += 28; +// scubes.add(new StaggeredTower(//tower 5 +// current_x_position, // x +// 15 , // y +// -4.5 , // z +// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) ); +// current_x_position += 28; +// scubes.add(new StaggeredTower(//tower 6 +// current_x_position, // x +// 0 , // y +// -10.5, // z +// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(// tower 7 +// current_x_position, // x +// 15 , // y +// 0, // z +// 45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(//tower 8 +// current_x_position, // x +// 0 , // y +// -10.5 , // z +// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); +// current_x_position += 25.25; +// scubes.add(new StaggeredTower(//tower 9 +// current_x_position, // x +// 15 , // y +// 0, // z +// 45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) ); +// current_x_position += 25.25; + +// //TOWERS ON DANCE FLOOR +// scubes.add(new StaggeredTower(//tower 10 +// 83.75+39+43-124.5, // x +// 0, // y +// -47.5-43, // z +// 45, 4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR}) ); +// scubes.add(new StaggeredTower(//tower 11 +// 83.75, // x +// 0, // y +// -47.5, // z +// 45, 4, new Cube.Wiring[]{ WFL, WRR, WRR, WFL}) ); +// scubes.add(new StaggeredTower(//tower 12 +// 83.75+39, // x +// 0, // y +// -47.5, // z +// 45, 4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR}) ); +// scubes.add(new StaggeredTower(//tower 13 +// 83.75+39+43, // x +// 0, // y +// -47.5-43, // z +// 45, 4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR}) ); + +// scubes.add(new StaggeredTower(// Single cube on top of tower 4 +// 42, // x +// 112 , // y +// 72, // z +// -10, 1, new Cube.Wiring[]{ WRL}) ); + + + + + + ////////////////////////////////////////////////////////////////////// // BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!! // @@ -225,7 +198,7 @@ public Model buildModel() { // These guts just convert the shorthand mappings into usable objects ArrayList towerList = new ArrayList(); ArrayList tower; - Cube[] cubes = new Cube[80]; + Cube[] cubes = new Cube[200]; int cubeIndex = 1; float px, pz, ny; for (TowerMapping tm : towerCubes) { @@ -239,11 +212,20 @@ public Model buildModel() { } towerList.add(new Tower(tower)); } - for (Cube cube : singleCubes) { - cubes[cubeIndex++] = cube; - } - return new Model(towerList, cubes, null, null); + + for (Cube cube : singleCubes) cubes[cubeIndex++] = cube; + for (Cube cube : dcubes) cubes[cubeIndex++] = cube; + for (StaggeredTower st : scubes) { + tower = new ArrayList(); + for (int i=0; i < st.n; i++) { + Cube.Wiring w = (i < st.wiring.length) ? st.wiring[i] : WRR; + tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w)); + } + towerList.add(new Tower(tower)); + } + + return new Model(towerList, cubes, bassBox, speakers); } /** @@ -254,47 +236,80 @@ public PandaMapping[] buildPandaList() { final int LEFT_SPEAKER = 0; final int RIGHT_SPEAKER = 1; + // 8 channels map to: 3, 4, 7, 8, 13, 14, 15, 16. return new PandaMapping[] { new PandaMapping( - // 8 maps to: 3, 4, 7, 8, 13, 14, 15, 16. So if it's J4, - "10.200.1.30", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 52, 53, 54, 55}), //30 J3 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 64, 65, 66, 67}), //30 J4 //ORIG - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,2,3,7 }), //30 J7 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39, 40, 38, 37}), //30 J8 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18, 19 }), //30 J13 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}), //30 J14 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27 }), // 30 J15 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29 }), // 30 J16 + "10.200.1.28", new ChannelMapping[] { + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 46, 47, 48 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // new front thing + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // new back thing + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13, 14, 15 }), // new back thing }), new PandaMapping( "10.200.1.29", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 68, 65, 66, 67 }), //29 J3 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 30,31 }), //29 J4 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23 }), // 29 J7 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 60, 61 , 62, 63 }), //29 J8 //XXX - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 17, 18, 19, 20 }), //29 J13 //XX //bassbox - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}), //29 J14 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 41,42,43,44 }), //29 J15 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17,18,19 }), //29 J16 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19, 20, 21 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1, 2, 3 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4, 5, 6 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7, 8, 9 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10, 11, 12 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18 }), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34, 35, 36}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19, 20, 21}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22, 23, 24}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25, 26, 27}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31, 32, 33}), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), }), new PandaMapping( - "10.200.1.28", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59 }), //28 J3 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 64, 69 }), //28 J4 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 48, 49, 50, 51 }), //28 J7 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13, 14 , 15, 16 }), //28 J8 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8,9,10,11 }), //28 J13 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 35,36,34,33}), //28 J14 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12, 13, 14, 15 }), //28 J15 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 30, 31, 32, 48 }), //28 J16 - }), - }; + "10.200.1.30", new ChannelMapping[] { + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22, 23, 24 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25, 26, 27 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31, 32, 33 }), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34, 35, 36 }), +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}), // 30 J3 * +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}), // 30 J4 //ORIG * +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39}), // 30 J7 * +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42}), // 30 J8 * +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45}), // 30 J13 (not working) +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 46, 47, 48}), // 30 J14 (unplugged) +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49, 50, 51}), // 30 J15 (unplugged) +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 52, 53, 54}), // 30 J16 + }), +// new PandaMapping( +// "10.200.1.31", new ChannelMapping[] { +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}), // J3 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1}), // J4 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 55, 56}), // 30 J7 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 57, 58}), // J8 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 59, 60}), // J13 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 61, 62}), // 30 J14 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 63, 64}), // J15 +// new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1}), // J16 +// }), + // new PandaMapping( + // "10.200.1.32", new ChannelMapping[] { + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J3 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J4 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 67, 68}), // 30 J7 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 69, 70}), // J8 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J13 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // 30 J14 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J15 + // new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J16 + // }), + }; } - - class TowerMapping { public final float x, y, z; public final CubeMapping[] cubeMappings; @@ -312,9 +327,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); } @@ -327,6 +341,14 @@ class CubeMapping { } } +class StaggeredTower { + public final float x, y, z, r; + public final int n; + public final Cube.Wiring[] wiring; + StaggeredTower(float _x, float _y, float _z, float _r, int _n) { this(_x, _y, _z, _r, _n, new Cube.Wiring[]{}); } + StaggeredTower(float _x, float _y, float _z, float _r, int _n, Cube.Wiring[] _wiring) { x=_x; y=_y; z=_z; r=_r; n=_n; wiring=_wiring;} +} + /** * 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 @@ -357,7 +379,7 @@ class PandaMapping { } /** - * Each channel on a pandaboard can be mapped in a number of modes. The typial is + * Each channel on a pandaboard can be mapped in a number of modes. The typical is * to a series of connected cubes, but we also have special mappings for the bass box, * the speaker enclosures, and the DJ booth floor. * @@ -408,11 +430,11 @@ class ChannelMapping { } int speakerIndex = rawObjectIndices[0]; if (speakerIndex < 0 || speakerIndex >= glucose.model.speakers.size()) { - //throw new RuntimeException("Invalid speaker channel mapping: " + speakerIndex); + throw new RuntimeException("Invalid speaker channel mapping: " + speakerIndex); } } else if ((mode == MODE_STRUTS_AND_FLOOR) || (mode == MODE_BASS) || (mode == MODE_NULL)) { if (rawObjectIndices.length > 0) { - //throw new RuntimeException("Bass/floor/null mappings cannot specify object indices"); + throw new RuntimeException("Bass/floor/null mappings cannot specify object indices"); } } else if (mode == MODE_CUBES) { for (int rawCubeIndex : rawObjectIndices) {