From: Mark Slee Date: Wed, 7 Aug 2013 10:17:29 +0000 (-0700) Subject: Kill RGB mappings and various other cleanups X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=bfff6bc27dad58d5f3674295d6b94d08b8da5e51;p=SugarCubes.git Kill RGB mappings and various other cleanups --- diff --git a/SugarCubes.pde b/SugarCubes.pde index 801e293..eb8df74 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -36,10 +36,10 @@ LXPattern[] patterns(GLucose glucose) { new PianoKeyPattern(glucose), // Basic test patterns for reference, not art -// new TestCubePattern(glucose), + new TestCubePattern(glucose), // new TestHuePattern(glucose), // new TestXPattern(glucose), -// new TestYPattern(glucose), + new TestYPattern(glucose), // new TestZPattern(glucose), // new TestProjectionPattern(glucose), diff --git a/_Internals.pde b/_Internals.pde index 8b9163d..e5a7755 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -95,10 +95,9 @@ void setup() { // Build output driver int[][] frontChannels = glucose.mapping.buildFrontChannelList(); int[][] rearChannels = glucose.mapping.buildRearChannelList(); - int[][] flippedRGB = glucose.mapping.buildFlippedRGBList(); mappingTool = new MappingTool(glucose, frontChannels, rearChannels); - pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels, flippedRGB); - pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels, flippedRGB); + pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels); + pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels); logTime("Build PandaDriver"); // Build overlay UI @@ -215,7 +214,7 @@ void draw() { // TODO(mcslee): move into GLucose engine if (pandaBoardsEnabled) { pandaFront.send(colors); - pandaRear.send(colors); + // pandaRear.send(colors); } } diff --git a/_Mappings.pde b/_Mappings.pde index 611e35e..0809a70 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -26,6 +26,12 @@ class SCMapping implements GLucose.Mapping { cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, -6, 0, 0, 0); cubes[cubeIndex++] = new Cube(-5, 3*Cube.EDGE_HEIGHT, -2, 0, -20, 0); + cubes[cubeIndex++] = new Cube(15, 0, 50, 0, 0, 0); + cubes[cubeIndex++] = new Cube(20, Cube.EDGE_HEIGHT, 40, 0, 20, 0); + cubes[cubeIndex++] = new Cube(15, 2*Cube.EDGE_HEIGHT, 46, 0, 0, 0); + cubes[cubeIndex++] = new Cube(10, 3*Cube.EDGE_HEIGHT, 42, 0, -20, 0); + cubes[cubeIndex++] = new Cube(15, 4*Cube.EDGE_HEIGHT, 42, 0, 0, 0); + cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5, 20, 0, 0, 0); cubes[cubeIndex++] = new Cube(45, BASS_HEIGHT + 5+Cube.EDGE_HEIGHT, 10, 0, 20, 0); cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5+2*Cube.EDGE_HEIGHT, 14, 0, 0, 0); @@ -56,282 +62,37 @@ class SCMapping implements GLucose.Mapping { cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0); cubes[cubeIndex++] = new Cube(200, 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0); - cubes[cubeIndex++] = new Cube(200, 0, 10, 0, 0, 0); - cubes[cubeIndex++] = new Cube(205, Cube.EDGE_HEIGHT, 0, 0, 20, 0); - cubes[cubeIndex++] = new Cube(200, 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0); - cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0); - - - if (true) { - return cubes; - } + cubes[cubeIndex++] = new Cube(210, 0, 60, 0, 0, 0); + cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 50, 0, 20, 0); + cubes[cubeIndex++] = new Cube(210, 2*Cube.EDGE_HEIGHT, 54, 0, 0, 0); + cubes[cubeIndex++] = new Cube(205, 3*Cube.EDGE_HEIGHT, 58, 0, -20, 0); - cubes[1] = new Cube(17.25, 0, 0, 0, 0, 80); - cubes[2] = new Cube(50.625, -1.5, 0, 0, 0, 55); - cubes[3] = new Cube(70.75, 12.375, 0, 0, 0, 55); - cubes[4] = new Cube(49.75, 24.375, 0, 0, 0, 48);//dnw - cubes[5] = new Cube(14.25, 32, 0, 0, 0, 80); - cubes[6] = new Cube(50.375, 44.375, 0, 0, 0, 0);//dnw - cubes[7] = new Cube(67.5, 64.25, 0, 27, 0, 0);//dnw - cubes[8] = new Cube(44, 136, 0, 0, 0, 0); - cubes[9] = new Cube(39, 162, 0, 0, 0, 0); - cubes[10] = new Cube(58, 182, -4, 12, 0, 0); - cubes[11] = new Cube(28, 182, -4, 12, 0, 0); - cubes[12] = new Cube(0, 182, -4, 12, 0, 0); - cubes[13] = new Cube(18.75, 162, 0, 0, 0, 0); - cubes[14] = new Cube(13.5, 136, 0, 0, 0, 0); - cubes[15] = new Cube(6.5, -8.25, 20, 0, 0, 25); - cubes[16] = new Cube(42, 15, 20, 0, 0, 4); - cubes[17] = new Cube(67, 24, 20, 0, 0, 25); - cubes[18] = new Cube(56, 41, 20, 0, 0, 30); - cubes[19] = new Cube(24, 2, 20, 0, 0, 25); - cubes[20] = new Cube(26, 26, 20, 0, 0, 70); - cubes[21] = new Cube(3.5, 10.5, 20, 0, 0, 35); - cubes[22] = new Cube(63, 133, 20, 0, 0, 80); - cubes[23] = new Cube(56, 159, 20, 0, 0, 65); - cubes[24] = new Cube(68, 194, 20, 0, -45, 0); - cubes[25] = new Cube(34, 194, 20, 20, 0, 35); - cubes[26] = new Cube(10, 194, 20, 0, -45, 0); // wired a bit funky - cubes[27] = new Cube(28, 162, 20, 0, 0, 65); - cubes[28] = new Cube(15.5, 134, 20, 0, 0, 20); - cubes[29] = new Cube(13, 29, 40, 0, 0, 0); - cubes[30] = new Cube(55, 15, 40, 0, 0, 50); - cubes[31] = new Cube(78, 9, 40, 0, 0, 60); - cubes[32] = new Cube(80, 39, 40, 0, 0, 80); - cubes[33] = new Cube(34, 134, 40, 0, 0, 50); - cubes[34] = new Cube(42, 177, 40, 0, 0, 0); - cubes[35] = new Cube(41, 202, 40, 20, 0, 80); - cubes[36] = new Cube(21, 178, 40, 0, 0, 35); - cubes[37] = new Cube(18, 32, 60, 0, 0, 65); - cubes[38] = new Cube(44, 20, 60, 0, 0, 20); //front power cube - cubes[39] = new Cube(39, 149, 60, 0, 0, 15); - cubes[40] = new Cube(60, 186, 60, 0, 0, 45); - cubes[41] = new Cube(48, 213, 56, 20, 0, 25); - cubes[42] = new Cube(22, 222, 60, 10, 10, 15); - cubes[43] = new Cube(28, 198, 60, 20, 0, 20); - cubes[44] = new Cube(12, 178, 60, 0, 0, 50); - cubes[45] = new Cube(18, 156, 60, 0, 0, 40); - cubes[46] = new Cube(30, 135, 60, 0, 0, 45); - cubes[47] = new Cube(10, 42, 80, 0, 0, 17); - cubes[48] = new Cube(34, 23, 80, 0, 0, 45); - cubes[49] = new Cube(77, 28, 80, 0, 0, 45); - cubes[50] = new Cube(53, 22, 80, 0, 0, 45); - cubes[51] = new Cube(48, 175, 80, 0, 0, 45); - cubes[52] = new Cube(66, 172, 80, 0, 0, 355);// _,195,_ originally - cubes[53] = new Cube(33, 202, 80, 25, 0, 85); - cubes[54] = new Cube(32, 176, 100, 0, 0, 20); - cubes[55] = new Cube(5.75, 69.5, 0, 0, 0, 80); - cubes[56] = new Cube(1, 53, 0, 40, 70, 70); - cubes[57] = new Cube(-15, 24, 0, 15, 0, 0); - //cubes[58] what the heck happened here? never noticed before 4/8/2013 - cubes[59] = new Cube(40, 46, 100, 0, 0, 355); // copies from 75 - cubes[60] = new Cube(40, 164, 120, 0, 0, 12.5); - cubes[61] = new Cube(32, 148, 100, 0, 0, 3); - cubes[62] = new Cube(30, 132, 90, 10, 350, 5); - cubes[63] = new Cube(22, 112, 100, 0, 20, 0); - cubes[64] = new Cube(35, 70, 95, 15, 345, 20); - cubes[65] = new Cube(38, 112, 98, 25, 0, 0); - cubes[66] = new Cube(70, 164, 100, 0, 0, 22); - cubes[68] = new Cube(29, 94, 105, 15, 20, 10); - cubes[69] = new Cube(30, 77, 100, 15, 345, 20); - cubes[70] = new Cube(38, 96, 95, 30, 0, 355); - //cubes[71] = new Cube(38,96,95,30,0,355); //old power cube - cubes[72] = new Cube(44, 20, 100, 0, 0, 345); - cubes[73] = new Cube(28, 24, 100, 0, 0, 13); - cubes[74] = new Cube(8, 38, 100, 10, 0, 0); - cubes[75] = new Cube(20, 58, 100, 0, 0, 355); - cubes[76] = new Cube(22, 32, 120, 15, 327, 345); - cubes[77] = new Cube(50, 132, 80, 0, 0, 0); - cubes[78] = new Cube(20, 140, 80, 0, 0, 0); return cubes; } public int[][] buildFrontChannelList() { - if (true) { - return new int[][] { - { 1, 0 }, - }; - } - return new int[][] { - { - 1, 57, 56, 55, 0 // Pandaboard A, structural channel 1 - } - , - { - 31, 32, 17, 3, 0 // Pandaboard B, structural channel 2, normally 30, 31, 32, 17, 3 (disconnected 30) - } - , - { - 20, 21, 15, 19, 0 // Pandaboard C, structural channel 3 - } - , - { - 69, 75, 74, 76, 73 // Pandaboard D, structural channel 4, normally 64 first - } - , - { - 16, 2, 5, 0, 0 // Pandaboard E, structural channel 5 - } - , - { - 48, 47, 37, 29, 0 // Pandaboard F, structural channel 6 (is there a 5th?) - } - , - { - 68, 63, 62, 78, 45 // Pandaboard G, structural channel 7, left top front side - } - , - { - 18, 6, 7, 0, 0 // Pandaboard H, structural channel 8 - } + { 1, 2, 3, 0, 0 }, // ch1 + { 4, 5, 6, 0, 0 }, // ch2 + { 0, 0, 0, 0, 0 }, // ch3 + { 0, 0, 0, 0, 0 }, // ch4 + { 0, 0, 0, 0, 0 }, // ch5 + { 0, 0, 0, 0, 0 }, // ch6 + { 0, 0, 0, 0, 0 }, // ch7 + { 0, 0, 0, 0, 0 }, // ch8 }; } public int[][] buildRearChannelList() { - if (true) { - return new int[][] { - { 1, 0 }, - }; - } - return new int[][] { - { - 22, 8, 14, 28, 0 // Pandaboard A, structural channel 9 - } - , - { - 36, 34, 40, 52, 66 // Pandaboard B, structural channel 10 - } - , - { - 65, 61, 60, 54, 51 // Pandaboard C, structural channel 11 - } - , - { - 35, 25, 11, 10, 24 // Pandaboard D, structural channel 12 - } - , - { - 23, 9, 13, 27, 12 // Pandaboard E, structural channel 13, missing taillight? - } - , - { - 64, 59, 72, 49, 50 // Pandaboard F, structural channel 14, right top backside (second cube is missing from sim) - } - , - { - 77, 39, 46, 33, 26 // Pandaboard G, structural channel 15 - } - , - { - 44, 53, 42, 43, 41 // Pandaboard H, structural channel 16, last cube busted? - } - }; - } - - public int[][] buildFlippedRGBList() { - if (true) { - return new int[][] {}; - } - - // syntax is {cube #, strip #, strip #, . . . } - return new int[][] { - { - 22, 4, 7 - } - , - { - 50, 1, 3 - } - , - { - 7, 1, 2, 11 - } - , - { - 49, 1 - } - , - { - 39, 1 - } - , - { - 41, 1 - } - , - { - 26, 3, 5 - } - , - { - 64, 1 - } - , - { - 32, 2 - } - , - { - 20, 6, 7 - } - , - { - 19, 1, 2 - } - , - { - 15, 6, 8, 9 - } - , - { - 29, 3, 10 - } - , - { - 68, 4, 9 - } - , - { - 18, 12 - } - , - { - 6, 2, 4 - } - , - { - 78, 11 - } - , - { - 56, 2 - } - , - { - 57, 3 - } - , - { - 74, 6, 7 - } - , - { - 21, 10 - } - , - { - 37, 11 - } - , - { - 61, 5 - } - , - { - 33, 12 - } + { 0, 0, 0, 0, 0 }, // ch9 + { 0, 0, 0, 0, 0 }, // ch10 + { 0, 0, 0, 0, 0 }, // ch11 + { 0, 0, 0, 0, 0 }, // ch12 + { 0, 0, 0, 0, 0 }, // ch13 + { 0, 0, 0, 0, 0 }, // ch14 + { 0, 0, 0, 0, 0 }, // ch15 + { 0, 0, 0, 0, 0 }, // ch16 }; } } diff --git a/_Overlay.pde b/_Overlay.pde index 08e0bef..74ba8f1 100644 --- a/_Overlay.pde +++ b/_Overlay.pde @@ -76,6 +76,12 @@ abstract class OverlayUI { rect(104, height-16, 20, 12); fill(#666666); text("" + targetFramerate, 108, height-6); + text("PandaOutput (p):", 134, height-6); + fill(#000000); + rect(214, height-16, 26, 12); + fill(#666666); + text(pandaBoardsEnabled ? "ON" : "OFF", 218, height-6); + } protected int drawObjectList(int yPos, String title, Object[] items, Method stateMethod) { diff --git a/_PandaDriver.pde b/_PandaDriver.pde index ad870aa..60ab343 100644 --- a/_PandaDriver.pde +++ b/_PandaDriver.pde @@ -25,13 +25,10 @@ public class PandaDriver { // List of point indices on the board private final int[] points; - // Bit for flipped status of each point index - private final boolean[] flipped; - // Packet data private final byte[] packet = new byte[4*352]; // TODO: de-magic-number - public PandaDriver(NetAddress address, Model model, int[][] channelList, int[][] flippedList) { + public PandaDriver(NetAddress address, Model model, int[][] channelList) { this.address = address; message = new OscMessage("/shady/pointbuffer"); List pointList = buildMappedList(model, channelList); @@ -40,7 +37,6 @@ public class PandaDriver { for (int value : pointList) { points[i++] = value; } - flipped = buildFlippedList(model, flippedList); } private ArrayList buildMappedList(Model model, int[][] channelList) { @@ -56,8 +52,14 @@ public class PandaDriver { if (cube == null) { throw new RuntimeException("Non-zero, non-existing cube specified in channel mapping (" + cubeNumber + ")"); } - for (Point p : cube.points) { - points.add(p.index); + final int[] stripOrder = new int[] { + 2, 1, 0, 3, 13, 12, 15, 14, 4, 7, 6, 5, 11, 10, 9, 8 + }; + for (int stripIndex : stripOrder) { + Strip s = cube.strips.get(stripIndex); + for (int j = s.points.size() - 1; j >= 0; --j) { + points.add(s.points.get(j).index); + } } } } @@ -65,27 +67,6 @@ public class PandaDriver { return points; } - private boolean[] buildFlippedList(Model model, int[][] flippedRGBList) { - boolean[] flipped = new boolean[model.points.size()]; - for (int i = 0; i < flipped.length; ++i) { - flipped[i] = false; - } - for (int[] cubeInfo : flippedRGBList) { - int cubeNumber = cubeInfo[0]; - Cube cube = model.getCubeByRawIndex(cubeNumber); - if (cube == null) { - throw new RuntimeException("Non-existing cube specified in flipped RGB mapping (" + cubeNumber + ")"); - } - for (int i = 1; i < cubeInfo.length; ++i) { - int stripIndex = cubeInfo[i]; - for (Point p : cube.strips.get(stripIndex-1).points) { - flipped[p.index] = true; - } - } - } - return flipped; - } - public final void send(int[] colors) { int len = 0; int packetNum = 0; @@ -94,11 +75,6 @@ public class PandaDriver { byte r = (byte) ((c >> 16) & 0xFF); byte g = (byte) ((c >> 8) & 0xFF); byte b = (byte) ((c) & 0xFF); - if (flipped[index]) { - byte tmp = r; - r = g; - g = tmp; - } packet[len++] = 0; packet[len++] = r; packet[len++] = g; @@ -123,7 +99,7 @@ public class PandaDriver { message.add(len); message.add(packet); try { - OscP5.flush(message, address); + OscP5.flush(message, address); } catch (Exception x) { x.printStackTrace(); } diff --git a/code/GLucose.jar b/code/GLucose.jar index 3410152..171f7ea 100644 Binary files a/code/GLucose.jar and b/code/GLucose.jar differ