From: Alexander Green Date: Wed, 7 Aug 2013 07:03:25 +0000 (-0700) Subject: Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=15a7bce51f37fc647c8c19c268960c84de1c3430;hp=9299ed7cf2cd9fb180f95d2cd22f63afa1863fe0;p=SugarCubes.git Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes --- diff --git a/MarkSlee.pde b/MarkSlee.pde index 97df3a0..1ecb640 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -335,7 +335,7 @@ public class PianoKeyPattern extends SCPattern { for (Cube c : model.cubes) { float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef()); setColor(c, color( - (huef + 20*v + abs(c.fx-model.xMax/2.)*.3 + c.fy) % 360, + (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360, min(100, 120*v), 100*v )); diff --git a/SugarCubes.pde b/SugarCubes.pde index 5504001..801e293 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -35,7 +35,8 @@ LXPattern[] patterns(GLucose glucose) { new CubeEQ(glucose), new PianoKeyPattern(glucose), - // Basic test patterns for reference, not art + // Basic test patterns for reference, not art +// new TestCubePattern(glucose), // new TestHuePattern(glucose), // new TestXPattern(glucose), // new TestYPattern(glucose), diff --git a/TestPatterns.pde b/TestPatterns.pde index 9b46531..c4432ab 100644 --- a/TestPatterns.pde +++ b/TestPatterns.pde @@ -112,7 +112,7 @@ class TestProjectionPattern extends SCPattern { projection.reset(model) // Translate so the center of the car is the origin, offset by yPos - .translateCenter(0, yPos.getValuef(), 0) + .translateCenter(model, 0, yPos.getValuef(), 0) // Rotate around the origin (now the center of the car) about an X-vector .rotate(angle.getValuef(), 1, 0, 0) @@ -134,6 +134,31 @@ class TestProjectionPattern extends SCPattern { } } +class TestCubePattern extends SCPattern { + + private int POINTS_PER_CUBE = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE * Strip.POINTS_PER_STRIP; + private SawLFO index = new SawLFO(0, POINTS_PER_CUBE, POINTS_PER_CUBE*60); + + TestCubePattern(GLucose glucose) { + super(glucose); + addModulator(index).start(); + } + + public void run(int deltaMs) { + for (Cube c : model.cubes) { + int i = 0; + for (Point p : c.points) { + colors[p.index] = color( + lx.getBaseHuef(), + 100, + max(0, 100 - 80.*abs(i - index.getValuef())) + ); + ++i; + } + } + } +} + class MappingTool extends SCPattern { private int cubeIndex = 0; @@ -197,7 +222,7 @@ class MappingTool extends SCPattern { } public void strip(int delta) { - int len = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP; + int len = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE; stripIndex = (len + stripIndex + delta) % len; printInfo(); } @@ -236,14 +261,14 @@ class MappingTool extends SCPattern { int si = 0; color sc = off; for (Strip strip : cube.strips) { - int clipI = si / Clip.STRIPS_PER_CLIP; - switch (clipI) { + int faceI = si / Face.STRIPS_PER_FACE; + switch (faceI) { case 0: sc = r; break; case 1: sc = g; break; case 2: sc = b; break; case 3: sc = r|g|b; break; } - if (si % Clip.STRIPS_PER_CLIP == 2) { + if (si % Face.STRIPS_PER_FACE == 2) { sc = r|g; } setColor(strip, sc); @@ -288,12 +313,12 @@ class MappingTool extends SCPattern { } public void incStrip() { - int stripsPerCube = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP; + int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE; stripIndex = (stripIndex + 1) % stripsPerCube; } public void decStrip() { - int stripsPerCube = Cube.CLIPS_PER_CUBE * Clip.STRIPS_PER_CLIP; + int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE; --stripIndex; if (stripIndex < 0) { stripIndex += stripsPerCube; diff --git a/_Internals.pde b/_Internals.pde index dab8bdd..8b9163d 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -34,7 +34,17 @@ import rwmidi.*; final int VIEWPORT_WIDTH = 900; final int VIEWPORT_HEIGHT = 700; -int targetFramerate = 45; +final float TRAILER_WIDTH = 240; +final float TRAILER_DEPTH = 97; +final float TRAILER_HEIGHT = 33; + +final float BASS_WIDTH = 124; +final float BASS_HEIGHT = 31.5; +final float BASS_DEPTH = 66; +final float BASS_X = (TRAILER_WIDTH - BASS_WIDTH) / 2.; +final float BASS_Z = (TRAILER_DEPTH - BASS_DEPTH) / 2.; + +int targetFramerate = 60; int startMillis, lastMillis; GLucose glucose; @@ -105,10 +115,10 @@ void setup() { logTime("Setup MIDI devices"); // Setup camera - midX = glucose.model.xMax/2 + 20; + midX = TRAILER_WIDTH/2. + 20; midY = glucose.model.yMax/2; - midZ = glucose.model.zMax/2; - eyeR = -270; + midZ = TRAILER_DEPTH/2.; + eyeR = -290; eyeA = .15; eyeY = midY + 20; eyeX = midX + eyeR*sin(eyeA); @@ -154,34 +164,45 @@ void draw() { if (debugMode) { debugUI.maskColors(colors); } - + camera( eyeX, eyeY, eyeZ, midX, midY, midZ, 0, -1, 0 ); - stroke(#333333); - fill(#292929); - float yFloor = -3; + + noStroke(); + fill(#141414); + drawBox(0, -TRAILER_HEIGHT, 0, 0, 0, 0, TRAILER_WIDTH, TRAILER_HEIGHT, TRAILER_DEPTH, TRAILER_HEIGHT/2.); + fill(#070707); + stroke(#222222); beginShape(); - vertex(0, yFloor, 0); - vertex(glucose.model.xMax, yFloor, 0); - vertex(glucose.model.xMax, yFloor, glucose.model.zMax); - vertex(0, yFloor, glucose.model.zMax); - endShape(CLOSE); + vertex(0, 0, 0); + vertex(TRAILER_WIDTH, 0, 0); + vertex(TRAILER_WIDTH, 0, TRAILER_DEPTH); + vertex(0, 0, TRAILER_DEPTH); + endShape(); + noStroke(); + fill(#292929); + drawBox(BASS_X, 0, BASS_Z, 0, 0, 0, BASS_WIDTH, BASS_HEIGHT, BASS_DEPTH, Cube.CHANNEL_WIDTH); + for (Cube c : glucose.model.cubes) { + drawCube(c); + } + noFill(); strokeWeight(2); beginShape(POINTS); for (Point p : glucose.model.points) { stroke(colors[p.index]); vertex(p.fx, p.fy, p.fz); + // println(p.fx + ":" + p.fy + ":" + p.fz); } endShape(); // 2D Overlay camera(); - javax.media.opengl.GL gl= ((PGraphicsOpenGL)g).beginGL(); + javax.media.opengl.GL gl = ((PGraphicsOpenGL)g).beginGL(); gl.glClear(javax.media.opengl.GL.GL_DEPTH_BUFFER_BIT); ((PGraphicsOpenGL)g).endGL(); strokeWeight(1); @@ -190,7 +211,7 @@ void draw() { if (debugMode) { debugUI.draw(); } - + // TODO(mcslee): move into GLucose engine if (pandaBoardsEnabled) { pandaFront.send(colors); @@ -198,6 +219,43 @@ void draw() { } } +void drawCube(Cube c) { + float in = .15; + drawBox(c.x+in, c.y+in, c.z+in, c.rx, c.ry, c.rz, Cube.EDGE_WIDTH-in*2, Cube.EDGE_HEIGHT-in*2, Cube.EDGE_WIDTH-in*2, Cube.CHANNEL_WIDTH-in); +} + +void drawBox(float x, float y, float z, float rx, float ry, float rz, float xd, float yd, float zd, float sw) { + pushMatrix(); + translate(x, y, z); + rotate(rx / 180. * PI, -1, 0, 0); + rotate(ry / 180. * PI, 0, -1, 0); + rotate(rz / 180. * PI, 0, 0, -1); + for (int i = 0; i < 4; ++i) { + float wid = (i % 2 == 0) ? xd : zd; + + beginShape(); + vertex(0, 0); + vertex(wid, 0); + vertex(wid, yd); + vertex(wid - sw, yd); + vertex(wid - sw, sw); + vertex(0, sw); + endShape(); + beginShape(); + vertex(0, sw); + vertex(0, yd); + vertex(wid - sw, yd); + vertex(wid - sw, yd - sw); + vertex(sw, yd - sw); + vertex(sw, sw); + endShape(); + + translate(wid, 0, 0); + rotate(HALF_PI, 0, -1, 0); + } + popMatrix(); +} + void drawUI() { if (uiOn) { ui.draw(); diff --git a/_Mappings.pde b/_Mappings.pde index 10c1083..611e35e 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -18,87 +18,141 @@ class SCMapping implements GLucose.Mapping { // serialized in some more neutral form. also figure out what's going on // with the indexing starting at 1 and some indices missing. Cube[] cubes = new Cube[79]; - cubes[1] = new Cube(17.25, 0, 0, 0, 0, 80, true, 2, 3); - cubes[2] = new Cube(50.625, -1.5, 0, 0, 0, 55, false, 4, 0); - cubes[3] = new Cube(70.75, 12.375, 0, 0, 0, 55, false, 4, 0); - cubes[4] = new Cube(49.75, 24.375, 0, 0, 0, 48, false, 0, 0);//dnw - cubes[5] = new Cube(14.25, 32, 0, 0, 0, 80, false, 2, 1); - cubes[6] = new Cube(50.375, 44.375, 0, 0, 0, 0, false, 0, 0);//dnw - cubes[7] = new Cube(67.5, 64.25, 0, 27, 0, 0, false, 0, 0);//dnw - cubes[8] = new Cube(44, 136, 0, 0, 0, 0, false, 1, 2); - cubes[9] = new Cube(39, 162, 0, 0, 0, 0, false, 1, 0); - cubes[10] = new Cube(58, 182, -4, 12, 0, 0, false, 3, 3); - cubes[11] = new Cube(28, 182, -4, 12, 0, 0, false, 0, 0); - cubes[12] = new Cube(0, 182, -4, 12, 0, 0, false, 0, 2); - cubes[13] = new Cube(18.75, 162, 0, 0, 0, 0, false, 0, 0); - cubes[14] = new Cube(13.5, 136, 0, 0, 0, 0, false, 1, 1); - cubes[15] = new Cube(6.5, -8.25, 20, 0, 0, 25, false, 5, 3); - cubes[16] = new Cube(42, 15, 20, 0, 0, 4, true, 2, 2); + + int cubeIndex = 1; + + cubes[cubeIndex++] = new Cube(0, 0, 0, 0, 0, 0); + cubes[cubeIndex++] = new Cube(5, Cube.EDGE_HEIGHT, -10, 0, 20, 0); + 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(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); + cubes[cubeIndex++] = new Cube(35, BASS_HEIGHT + 5+3*Cube.EDGE_HEIGHT, 18, 0, -20, 0); + cubes[cubeIndex++] = new Cube(40, BASS_HEIGHT + 5+4*Cube.EDGE_HEIGHT, 13, 0, 0, 0); + + cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 0, 10, 0, 0, 0); + cubes[cubeIndex++] = new Cube(85, BASS_HEIGHT + Cube.EDGE_HEIGHT, 0, 0, 20, 0); + cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0); + cubes[cubeIndex++] = new Cube(75, BASS_HEIGHT + 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0); + cubes[cubeIndex++] = new Cube(80, BASS_HEIGHT + 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0); + + cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10, 10, 0, 0, 0); + cubes[cubeIndex++] = new Cube(125, BASS_HEIGHT + 10+Cube.EDGE_HEIGHT, 0, 0, 20, 0); + cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10+2*Cube.EDGE_HEIGHT, 4, 0, 0, 0); + cubes[cubeIndex++] = new Cube(115, BASS_HEIGHT + 10+3*Cube.EDGE_HEIGHT, 8, 0, -20, 0); + cubes[cubeIndex++] = new Cube(120, BASS_HEIGHT + 10+4*Cube.EDGE_HEIGHT, 3, 0, 0, 0); + + cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 0, 30, 0, 0, 0); + cubes[cubeIndex++] = new Cube(165, BASS_HEIGHT + Cube.EDGE_HEIGHT, 20, 0, 20, 0); + cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 2*Cube.EDGE_HEIGHT, 24, 0, 0, 0); + cubes[cubeIndex++] = new Cube(155, BASS_HEIGHT + 3*Cube.EDGE_HEIGHT, 28, 0, -20, 0); + cubes[cubeIndex++] = new Cube(160, BASS_HEIGHT + 4*Cube.EDGE_HEIGHT, 23, 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); + 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[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, false, 3, 1); - cubes[19] = new Cube(24, 2, 20, 0, 0, 25, true, 0, 3); - cubes[20] = new Cube(26, 26, 20, 0, 0, 70, true, 2, 3); - cubes[21] = new Cube(3.5, 10.5, 20, 0, 0, 35, true, 1, 0); - cubes[22] = new Cube(63, 133, 20, 0, 0, 80, false, 0, 2); + 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[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, true, 0, 0); - cubes[30] = new Cube(55, 15, 40, 0, 0, 50, false, 0, 2); - cubes[31] = new Cube(78, 9, 40, 0, 0, 60, true, 5, 2); - cubes[32] = new Cube(80, 39, 40, 0, 0, 80, false, 0, 3); - cubes[33] = new Cube(34, 134, 40, 0, 0, 50, false, 0, 3); + 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, true, 0, 1); + 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, false, 0, 3); - cubes[43] = new Cube(28, 198, 60, 20, 0, 20, true, 5, 0); - cubes[44] = new Cube(12, 178, 60, 0, 0, 50, false, 4, 1); + 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, true, 0, 2); - cubes[48] = new Cube(34, 23, 80, 0, 0, 45, false, 0, 1); + 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, true, 5, 1);// _,195,_ originally - cubes[53] = new Cube(33, 202, 80, 25, 0, 85, false, 1, 3); - cubes[54] = new Cube(32, 176, 100, 0, 0, 20, false, 0, 2); + 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, false, 2, 3); // copies from 75 - cubes[60] = new Cube(40, 164, 120, 0, 0, 12.5, false, 4, 3); - cubes[61] = new Cube(32, 148, 100, 0, 0, 3, false, 4, 2); + 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, false, 4, 0); + 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, false, 4, 3); + 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, false, 4, 0); - cubes[69] = new Cube(30, 77, 100, 15, 345, 20, false, 2, 1); + 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, true, 5, 1); - cubes[74] = new Cube(8, 38, 100, 10, 0, 0, true, 5, 1); - cubes[75] = new Cube(20, 58, 100, 0, 0, 355, false, 2, 3); - cubes[76] = new Cube(22, 32, 120, 15, 327, 345, false, 4, 0); - cubes[77] = new Cube(50, 132, 80, 0, 0, 0, false, 0, 2); - cubes[78] = new Cube(20, 140, 80, 0, 0, 0, false, 0, 3); + 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 @@ -135,6 +189,12 @@ class SCMapping implements GLucose.Mapping { } public int[][] buildRearChannelList() { + if (true) { + return new int[][] { + { 1, 0 }, + }; + } + return new int[][] { { 22, 8, 14, 28, 0 // Pandaboard A, structural channel 9 @@ -171,6 +231,10 @@ class SCMapping implements GLucose.Mapping { } public int[][] buildFlippedRGBList() { + if (true) { + return new int[][] {}; + } + // syntax is {cube #, strip #, strip #, . . . } return new int[][] { { diff --git a/_PandaDriver.pde b/_PandaDriver.pde index 6a4a3da..ad870aa 100644 --- a/_PandaDriver.pde +++ b/_PandaDriver.pde @@ -48,7 +48,7 @@ public class PandaDriver { for (int[] channel : channelList) { for (int cubeNumber : channel) { if (cubeNumber == 0) { - for (int i = 0; i < (Cube.CLIPS_PER_CUBE*Clip.STRIPS_PER_CLIP*Strip.POINTS_PER_STRIP); ++i) { + for (int i = 0; i < (Cube.FACES_PER_CUBE*Face.STRIPS_PER_FACE*Strip.POINTS_PER_STRIP); ++i) { points.add(0); } } else { diff --git a/code/GLucose.jar b/code/GLucose.jar index bffecfd..3410152 100644 Binary files a/code/GLucose.jar and b/code/GLucose.jar differ