X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=b7b6a86d483279fa9fbcc1973f9b089b297ee39d;hb=0c7bfdb51209c7b8ab72ff352fbd945187521098;hp=fb80ff1fe164218446ba3d9b2acc63b3b9635229;hpb=84086fa3d2cb987859754986bba3feb92716343d;p=SugarCubes.git diff --git a/_Mappings.pde b/_Mappings.pde index fb80ff1..b7b6a86 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -13,326 +13,64 @@ * when physical changes or tuning is being done to the structure. */ -class TowerMapping { - public final float x, y, z; - public final float[][] cubePositions; - - TowerMapping(float x, float y, float z, float[][] cubePositions) { - this.x = x; - this.y = y; - this.z = z; - this.cubePositions = cubePositions; - } -} - -public Model buildModel() { - // 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. - // - // Following that is an array of floats. A 2-d array contains an x-offset - // and a z-offset from the reference position. Typically the first cube - // will just be {0, 0}. - // - // A 3-d array contains an x-offset, a z-offset, and a rotation about the - // y-axis. - // - // The cubes automatically increment their y-position by Cube.EDGE_HEIGHT. - - final float STACKED_RELATIVE = 1; - final float STACKED_REL_SPIN = 2; - final float BASS_DEPTH = BassBox.EDGE_DEPTH + 4; - - TowerMapping[] mapping = new TowerMapping[] { - - // Front left cubes -// new TowerMapping(0, 0, 0, new float[][] { -// {STACKED_RELATIVE, 0, 0}, -// {STACKED_RELATIVE, 5, -10, 20}, -// {STACKED_RELATIVE, 0, -6}, -// {STACKED_RELATIVE, -5, -2, -20}, -// }), -// -// new TowerMapping(Cube.EDGE_WIDTH + 2, 0, 0, new float[][] { -// {STACKED_RELATIVE, 0, 0}, -// {STACKED_RELATIVE, 0, 5, 10}, -// {STACKED_RELATIVE, 0, 2, 20}, -// {STACKED_RELATIVE, 0, 0, 30}, -// }), - - // Back Cubes behind DJ platform (in order of increasing x) - new TowerMapping(50, 5, BASS_DEPTH, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 2, 0, 20}, - {STACKED_RELATIVE, -2, 10}, - {STACKED_RELATIVE, -5, 15, -20}, - {STACKED_RELATIVE, -2, 13}, - }), - - new TowerMapping(79, 5, BASS_DEPTH, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 2, 0, 20}, - {STACKED_RELATIVE, 4, 10}, - {STACKED_RELATIVE, 2, 15, -20}, - {STACKED_RELATIVE, 0, 13}, - }), - - new TowerMapping(107, 5, BASS_DEPTH, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 4, 0, 20}, - {STACKED_RELATIVE, 6, 10}, - {STACKED_RELATIVE, 3, 15, -20}, - // {STACKED_RELATIVE, 8, 13}, - }), - - new TowerMapping(133, 5, BASS_DEPTH, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, -2, 0, 20}, - {STACKED_RELATIVE, 0, 10}, - {STACKED_RELATIVE, 2, 15, -20}, - // {STACKED_RELATIVE, 4, 13} - }), - - new TowerMapping(165, 5, BASS_DEPTH, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, -1, 20}, - {STACKED_RELATIVE, 2, 10}, - {STACKED_RELATIVE, -2, 15, -20}, - {STACKED_RELATIVE, 3, 13}, - }), - - // front DJ cubes - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 10, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 0, -10, 20}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + Cube.EDGE_HEIGHT, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 10, new float[][] { - {STACKED_RELATIVE, 3, 0}, - {STACKED_RELATIVE, 2, -10, 20}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + 2*Cube.EDGE_HEIGHT + 5, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 10, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 1, 0, 10}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + 3*Cube.EDGE_HEIGHT + 9, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 10, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, -1, 0}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 10, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, -1, 0}, - }), - - // left dj cubes - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, Cube.EDGE_HEIGHT + 2, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 0, 2, 20}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 2*Cube.EDGE_HEIGHT + 4, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 0, 2, 20}, - }), - - // right dj cubes - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, Cube.EDGE_HEIGHT + 2, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 0, 2, 20}, - }), - - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BassBox.EDGE_HEIGHT + BoothFloor.PLEXI_WIDTH, 2*Cube.EDGE_HEIGHT + 4, new float[][] { - {STACKED_RELATIVE, 0, 0}, - {STACKED_RELATIVE, 0, 2, 20}, - }), - -// new TowerMapping(200, 0, 0, new float[][] { -// {STACKED_RELATIVE, 0, 10}, -// {STACKED_RELATIVE, 5, 0, 20}, -// {STACKED_RELATIVE, 0, 4}, -// {STACKED_RELATIVE, -5, 8, -20}, -// {STACKED_RELATIVE, 0, 3}, -// }), - -// new TowerMapping(0, 0, Cube.EDGE_HEIGHT + 10, new float[][] { -// {STACKED_RELATIVE, 10, 0, 40}, -// {STACKED_RELATIVE, 3, -2, 20}, -// {STACKED_RELATIVE, 0, 0, 40}, -// {STACKED_RELATIVE, 0, 0, 60}, -// {STACKED_RELATIVE, 0, 0, 40}, -// }), - - new TowerMapping(20, 0, 2*Cube.EDGE_HEIGHT + 18, new float[][] { - {STACKED_RELATIVE, 0, 0, 40}, - {STACKED_RELATIVE, 10, 0, 20}, - {STACKED_RELATIVE, 5, 0, 40}, - {STACKED_RELATIVE, 10, 0, 60}, - {STACKED_RELATIVE, 12, 0, 40}, - }), - -// new TowerMapping(210, 0, Cube.EDGE_HEIGHT + 15, new float[][] { -// {STACKED_RELATIVE, 0, 0, 40}, -// {STACKED_RELATIVE, 5, 0, 20}, -// {STACKED_RELATIVE, 8, 0, 40}, -// {STACKED_RELATIVE, 3, 0, 60}, -// {STACKED_RELATIVE, 0, 0, 40}, -// }), - - new TowerMapping(210, 0, 2*Cube.EDGE_HEIGHT + 25, new float[][] { - {STACKED_RELATIVE, 0, 0, 40}, - {STACKED_RELATIVE, 5, 0, 20}, - {STACKED_RELATIVE, 2, 0, 40}, - {STACKED_RELATIVE, 5, 0, 60}, - {STACKED_RELATIVE, 0, 0, 40}, - }), - - }; - - ArrayList towerList = new ArrayList(); - ArrayList tower; - Cube[] cubes = new Cube[79]; - int cubeIndex = 1; - float tx, ty, tz, px, pz, ny, dx, dz, ry; - for (TowerMapping tm : mapping) { - tower = new ArrayList(); - px = tx = tm.x; - ny = ty = tm.y; - pz = tz = tm.z; - int ti = 0; - for (float[] cp : tm.cubePositions) { - float mode = cp[0]; - if (mode == STACKED_RELATIVE) { - dx = cp[1]; - dz = cp[2]; - ry = (cp.length >= 4) ? cp[3] : 0; - tower.add(cubes[cubeIndex++] = new Cube(px = tx + dx, ny, pz = tz + dz, 0, ry, 0)); - ny += Cube.EDGE_HEIGHT; - } else if (mode == STACKED_REL_SPIN) { - // Same as above but the front left of this cube is actually its back right for wiring - // TODO(mcslee): implement this - } - } - towerList.add(new Tower(tower)); - } - - BassBox bassBox = new BassBox(56, 0, 2); - - List speakers = new ArrayList(); - speakers.add(new Speaker(-12, 6, 0, 15)); - speakers.add(new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH, 6, 6, -15)); - - return new Model(towerList, cubes, bassBox, speakers); -} +static final float SPACING = 27; +static final float RISER = 13.5; +static final float FLOOR = 0; -public PandaMapping[] buildPandaList() { - 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, 2, 3, 4 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5, 6, 7, 8 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9, 10, 11, 12 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13, 14, 15, 16 }), - }), +/** + * Definitions of tower positions. This is all that should need + * to be modified. Distances are measured from the left-most cube. + * The first value is the offset moving NE (towards back-right). + * The second value is the offset moving NW (negative comes forward-right). + */ +static final float[][] TOWER_CONFIG = new float[][] { + // x, z, y, # + new float[] { 0, 0, RISER, 4 }, + new float[] { 25, -10, RISER, 4 }, + new float[] { 50, -22.5, FLOOR, 5 }, + new float[] { 17.25, -35.5, FLOOR, 6 }, + new float[] { 43.25, -51.5, RISER, 6 }, + new float[] { 69.25, -56, FLOOR, 6 }, + new float[] { 12.75, -62.5, RISER, 4 }, + new float[] { 38.75, -78.5, FLOOR, 5 }, + new float[] { 65.75, -83, RISER, 5 }, - new PandaMapping( - "10.200.1.29", new ChannelMapping[] { - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 17, 18, 19, 20 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 21, 22, 23, 24 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25, 26, 27, 28 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 29, 30, 31, 32 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33, 34, 35, 36 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39, 40 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 41, 42, 43, 44 }), - new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45, 46, 47, 48 }), - }), - }; -} +}; -class PandaMapping { - - // How many channels are on the panda board - 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; - - final String ip; - final ChannelMapping[] channelList = new ChannelMapping[CHANNELS_PER_BOARD]; - - PandaMapping(String ip, ChannelMapping[] rawChannelList) { - this.ip = ip; - for (int i = 0; i < channelList.length; ++i) { - channelList[i] = (i < rawChannelList.length) ? rawChannelList[i] : new ChannelMapping(); - } - } -} +public Model buildModel() { -class ChannelMapping { + // TODO: (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. - // How many cubes per channel xc_PB is configured for - public final static int CUBES_PER_CHANNEL = 4; + List towers = new ArrayList(); + Cube[] cubes = new Cube[200]; + int cubeIndex = 1; - // How many total pixels on each channel - public final static int PIXELS_PER_CHANNEL = Cube.POINTS_PER_CUBE * CUBES_PER_CHANNEL; - - public static final int MODE_NULL = 0; - 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_INVALID = 5; - - public static final int NO_OBJECT = -1; - - final int mode; - final int[] objectIndices = new int[CUBES_PER_CHANNEL]; - - ChannelMapping() { - this(MODE_NULL); - } - - ChannelMapping(int mode) { - this(mode, new int[]{}); - } - - ChannelMapping(int mode, int rawObjectIndex) { - this(mode, new int[]{ rawObjectIndex }); - } - - ChannelMapping(int mode, int[] rawObjectIndices) { - if (mode < 0 || mode >= MODE_INVALID) { - throw new RuntimeException("Invalid channel mapping mode: " + mode); - } - if (mode == MODE_SPEAKER) { - if (rawObjectIndices.length != 1) { - throw new RuntimeException("Speaker channel mapping mode must specify one speaker index"); - } - int speakerIndex = rawObjectIndices[0]; - 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)) { - if (rawObjectIndices.length > 0) { - throw new RuntimeException("Bass/floor/null mappings cannot specify object indices"); - } - } else if (mode == MODE_CUBES) { - for (int rawCubeIndex : rawObjectIndices) { - if (glucose.model.getCubeByRawIndex(rawCubeIndex) == null) { - throw new RuntimeException("Non-existing cube specified in cube mapping: " + rawCubeIndex); - } - } + float rt2 = sqrt(2); + float x, y, z, xd, zd, num; + for (float[] tc : TOWER_CONFIG) { + x = -tc[1]; + z = tc[0]; + y = tc[2]; + num = tc[3]; + if (z < x) { + zd = -(x-z)/rt2; + xd = z*rt2 - zd; + } else { + zd = (z-x)/rt2; + xd = z*rt2 - zd; } - - this.mode = mode; - for (int i = 0; i < objectIndices.length; ++i) { - objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT; + List tower = new ArrayList(); + for (int n = 0; n < num; ++n) { + Cube cube = new Cube(xd + 24, y, zd + 84, 0, -45, 0); + tower.add(cube); + cubes[cubeIndex++] = cube; + y += SPACING; } + towers.add(new Tower(tower)); } + + return new Model(towers, cubes); }