X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=_Mappings.pde;h=6877e63335415de61c1b2b2b483419743a06e6f5;hp=0824cc6f236f3c7924124f9c27409c086daccef7;hb=270a8b44cd8296bb40fa74e4fcf2e7f7c4f1192c;hpb=bdef287d097659a12c9573879d0e8a7e34cbdef6 diff --git a/_Mappings.pde b/_Mappings.pde index 0824cc6..6877e63 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -13,6 +13,9 @@ * 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 @@ -24,8 +27,6 @@ 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; @@ -75,12 +76,24 @@ public Model buildModel() { //////////////////////////////////////////////////////////////////////// // dan's proposed lattice ArrayList scubes = new ArrayList(); - if (NumBackTowers != 11) exit(); - // for (int i=0; i dcubes = new ArrayList(); // for (int i=1; i<6; i++) { @@ -89,82 +102,82 @@ public Model buildModel() { // } 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(//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 @@ -185,7 +198,7 @@ scubes.add(new StaggeredTower(//tower 13 // These guts just convert the shorthand mappings into usable objects ArrayList towerList = new ArrayList(); ArrayList tower; - Cube[] cubes = new Cube[100]; + Cube[] cubes = new Cube[200]; int cubeIndex = 1; float px, pz, ny; for (TowerMapping tm : towerCubes) { @@ -203,14 +216,14 @@ scubes.add(new StaggeredTower(//tower 13 for (Cube cube : singleCubes) cubes[cubeIndex++] = cube; for (Cube cube : dcubes) cubes[cubeIndex++] = cube; -for (StaggeredTower st : scubes) { + 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); } @@ -227,59 +240,73 @@ public PandaMapping[] buildPandaList() { return new PandaMapping[] { new PandaMapping( "10.200.1.28", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18}), - 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[] { 13, 14, 15}), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), + 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[] { 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 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.30", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // 30 J3 * - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // 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 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[] { }), // 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[] { }), // 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 - }), +// 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 + // }), }; } @@ -422,4 +449,4 @@ class ChannelMapping { objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT; } } -} \ No newline at end of file +}