X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=46a7da5768e452b40b71ee5c576b8664ce6659f4;hb=1d7460a8b6ea6cbbb1c2b1db056235140607c336;hp=94d50bbf449f522688c222315dfb47eefc89b7de;hpb=b30f14fdacdcccafe123e00f20a4d6df46e6995c;p=SugarCubes.git diff --git a/_Mappings.pde b/_Mappings.pde index 94d50bb..46a7da5 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -51,12 +51,31 @@ public Model buildModel() { // 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. + + //////////////////////////////////////////////////////////////////////// + // 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)); + } + + TowerMapping[] towerCubes = new TowerMapping[] {}; // 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(0, 0, 0, 0, 45, 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,-135,0, WRR), }; // The bass box! @@ -70,23 +89,6 @@ public Model buildModel() { // new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15) }); - - //////////////////////////////////////////////////////////////////////// - // 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)); - } - ////////////////////////////////////////////////////////////////////// // BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!! // ////////////////////////////////////////////////////////////////////// @@ -109,17 +111,17 @@ 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)); 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); } /** @@ -143,40 +145,39 @@ public PandaMapping[] buildPandaList() { // 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[] { 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 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 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[] { 11, 12, 13, 14}), // J3 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J4 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}), // J7 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 29 ,30, 31, 32}), // J8 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 38, 39, 40, 41}), // J13 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 47, 48, 49, 50}), // J14 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}), // J15 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 55, 46, 37}), // 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[] { 15, 16, 17, 18}), // J3 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // J4 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}), // J7 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33, 34, 35, 36}), // J8 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 42, 43, 44, 45}), // J13 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 51, 52, 53, 54}), // J14 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 19, 10}), // J15 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 11, 12, 13, 14}), // J16 + }), }; }