X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=5bcdb739bba8a3b6000af7bf7845d83834e968ce;hb=344908672b7cfe1efba03f739ef945601dae1b8e;hp=73e1fe2a152bb4f77ab1e03e4f5fb5ab3c611817;hpb=456312c336859c793938dff95bfa3798341d1dfa;p=SugarCubes.git diff --git a/_Mappings.pde b/_Mappings.pde index 73e1fe2..5bcdb73 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -13,22 +13,26 @@ * 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; 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 +46,177 @@ 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,225,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 != 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[] pos = new float[3]; +pos[0] = 50; +pos[2] = 100; +scubes.add(new StaggeredTower(//tower 1 + pos[0], // x + 0 , // y + pos[2], // z + 0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + + +pos[0] += 25; +pos[2] -= 10; +scubes.add(new StaggeredTower(// tower 2 + pos[0], // x + 15 , // y + pos[2], // z + 0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += 25; +pos[2] += -12.5; +scubes.add(new StaggeredTower(//tower 3 + pos[0], // x + 0 , // y + pos[2], // z + 0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += -32.75; +pos[2] += -13; +scubes.add(new StaggeredTower(//tower 4 + pos[0], // x + 0, // y + pos[2], // z + 0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += 26; +pos[2] += -16; +scubes.add(new StaggeredTower(//tower 5 + pos[0], // x + 15 , // y + pos[2], // z + 0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += 26; +pos[2] += -4.5; +scubes.add(new StaggeredTower(//tower 6 + pos[0], // x + 0 , // y + pos[2], // z + 0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += -56.5; +pos[2] += -6.5; +scubes.add(new StaggeredTower(// tower 7 + pos[0], // x + 15 , // y + pos[2], // z + 0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += 26; +pos[2] += -16.5; +scubes.add(new StaggeredTower(//tower 8 + pos[0], // x + 0 , // y + pos[2], // z + 0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +pos[0] += 27; +pos[2] += -4.5; +scubes.add(new StaggeredTower(//tower 9 + pos[0], // x + 15 , // y + pos[2], // z + 0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) ); + +// //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, WRR, WRR, WRR}) ); +// scubes.add(new StaggeredTower(//tower 11 +// 83.75, // x +// 0, // y +// -47.5, // z +// 45, 4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR}) ); +// scubes.add(new StaggeredTower(//tower 12 +// 83.75+39, // x +// 0, // y +// -47.5, // z +// 45, 4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR}) ); +// scubes.add(new StaggeredTower(//tower 13 +// 83.75+39+43, // x +// 0, // y +// -47.5-43, // z +// 45, 4, new Cube.Wiring[]{ WRR, WRR, WRR, 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!!!! // + ////////////////////////////////////////////////////////////////////// + // 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) { @@ -99,42 +230,119 @@ public Model buildModel() { } towerList.add(new Tower(tower)); } + + 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); } +/** + * 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.29", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 4, 3 }), - }), + "192.168.88.100", new ChannelMapping[] { // G1 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}), + + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 11}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13}), + }), + new PandaMapping( + "192.168.88.101", new ChannelMapping[] { //G4 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 23}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 44}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 41}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 42}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 21}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22}), + }), + 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), - }), + "192.168.88.104", new ChannelMapping[] { // G3 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 26}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 27}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 17}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 15}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 14}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 29}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 30}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31}), + }), + + new PandaMapping( + "192.168.88.105", new ChannelMapping[] { // G2 + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 38}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 35}), + + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 32}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}), + }), }; } @@ -155,9 +363,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); } @@ -170,6 +377,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 @@ -200,7 +415,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. * @@ -212,7 +427,7 @@ class PandaMapping { class ChannelMapping { // How many cubes per channel xc_PB is configured for - public final static int CUBES_PER_CHANNEL = 4; + public final static int CUBES_PER_CHANNEL = 1; // How many total pixels on each channel public final static int PIXELS_PER_CHANNEL = Cube.POINTS_PER_CUBE * CUBES_PER_CHANNEL; @@ -221,7 +436,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; @@ -253,7 +468,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"); } @@ -271,4 +486,3 @@ class ChannelMapping { } } } -