X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=_Mappings.pde;h=9ff93e6b962c86d0606cd8ee84b2badd15dd5562;hp=b7023192bf1075c668627301761806ff1c8bd15f;hb=df18145ff0149470136d51d6eab334800e7be9a9;hpb=7c7625ec088b93148f46adc19ba8f1cb4baa8321 diff --git a/_Mappings.pde b/_Mappings.pde index b702319..9ff93e6 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -56,7 +56,8 @@ public Model buildModel() { // Single cubes can be constructed directly here if you need them Cube[] singleCubes = new Cube[] { // 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(x, y, z, rx, ry, rz, wiring), + //new Cube(0,0,0,0,225,0, WRR), }; // The bass box! @@ -73,19 +74,121 @@ public Model buildModel() { //////////////////////////////////////////////////////////////////////// // dan's proposed lattice - ArrayList scubes = new ArrayList(); - if (NumBackTowers != 9) 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)); - } + 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!!!! // @@ -94,7 +197,7 @@ public Model buildModel() { // 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) { @@ -109,17 +212,19 @@ public Model buildModel() { towerList.add(new Tower(tower)); } - for (StaggeredTower st : scubes) { + + 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++) - tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, WRR)); + 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)); - } + } - for (Cube cube : singleCubes) cubes[cubeIndex++] = cube; - for (Cube cube : dcubes) cubes[cubeIndex++] = cube; - - return new Model(towerList, cubes, bassBox, speakers); + return new Model(towerList, cubes, bassBox, speakers); } /** @@ -132,51 +237,61 @@ 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.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 PandaMapping( "10.200.1.29", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,2,3,4}), // 29 J3 (not connected) - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,2,3,4 }), // 29 J4 (not connected) - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,2,3,4}), // 29 J7 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,2,3,4}), // 29 J8 //XXX - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8,9,10}), // 29 J13 //XX //bassbox (not working) - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8,9,10 }), // 29 J14 (not working) - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 14,15,16,17 }), // 29 J15 - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 14,15,16,17 }), // 29 J16 + 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[] { 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[] { 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 -*/ + "10.200.1.30", new ChannelMapping[] { + 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[] { }), // 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[] { 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 + // }), }; } @@ -214,7 +329,9 @@ 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;} + 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;} } /**