X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=3f6756a08c56cd6522d38db47adc757f4d689d56;hb=f1370a0bca7f37bcb607734f3622358fd8efb023;hp=1a61a8a8807337e7e7f0cddf4182cbb905572b37;hpb=ae57922348c275fc22921d4b1114945b1cb015c9;p=SugarCubes.git diff --git a/_Mappings.pde b/_Mappings.pde index 1a61a8a..3f6756a 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -15,20 +15,23 @@ 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; final Cube.Wiring WRL = Cube.Wiring.REAR_LEFT; final Cube.Wiring WRR = Cube.Wiring.REAR_RIGHT; + // 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. @@ -42,50 +45,57 @@ public Model buildModel() { // y-axis. // // The cubes automatically increment their y-position by Cube.EDGE_HEIGHT. - TowerMapping[] towerCubes = new TowerMapping[] { - - // DJ booth, from left to right - 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), - }), - new TowerMapping(BBX, BBY, BBZ, new CubeMapping[] { - new CubeMapping(104.75, 0, -27, WRL), - new CubeMapping(8, -15, 10, WFL), - }), - - }; + + // 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[] {}; // Single cubes can be constructed directly here if you need them Cube[] singleCubes = new Cube[] { - // 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,-135,0, WRR), }; // The bass box! - BassBox bassBox = new BassBox(BBX, 0, BBZ); - + // 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[] { - new Speaker(-12, 6, 0, 15), - new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15) + // 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 != 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!!!! // + ////////////////////////////////////////////////////////////////////// + // 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[100]; int cubeIndex = 1; float px, pz, ny; for (TowerMapping tm : towerCubes) { @@ -99,48 +109,75 @@ 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(); + 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); + return new Model(towerList, cubes, bassBox, speakers); } +/** + * This function maps the panda boards. We have an array of them, each has + * an IP address and a list of channels. + */ 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( - "10.200.1.28", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_BASS), - new ChannelMapping(ChannelMapping.MODE_FLOOR), - new ChannelMapping(ChannelMapping.MODE_SPEAKER, 0), - new ChannelMapping(ChannelMapping.MODE_SPEAKER, 1), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - }), - + // 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[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), - }), + 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 +*/ + }), + // 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 + // }), }; } @@ -161,9 +198,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); } @@ -176,6 +212,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 @@ -184,7 +226,7 @@ class CubeMapping { class PandaMapping { // How many channels are on the panda board - public final static int CHANNELS_PER_BOARD = 13; + public final static int CHANNELS_PER_BOARD = 8; // How many total pixels on the whole board public final static int PIXELS_PER_BOARD = ChannelMapping.PIXELS_PER_CHANNEL * CHANNELS_PER_BOARD; @@ -206,7 +248,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. * @@ -227,7 +269,7 @@ class ChannelMapping { public static final int MODE_CUBES = 1; public static final int MODE_BASS = 2; public static final int MODE_SPEAKER = 3; - public static final int MODE_FLOOR = 4; + public static final int MODE_STRUTS_AND_FLOOR = 4; public static final int MODE_INVALID = 5; public static final int NO_OBJECT = -1; @@ -259,7 +301,7 @@ class ChannelMapping { if (speakerIndex < 0 || speakerIndex >= glucose.model.speakers.size()) { throw new RuntimeException("Invalid speaker channel mapping: " + speakerIndex); } - } else if ((mode == MODE_FLOOR) || (mode == MODE_BASS) || (mode == MODE_NULL)) { + } 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"); } @@ -277,4 +319,3 @@ class ChannelMapping { } } } -