From: Mark Slee Date: Sat, 10 Aug 2013 01:48:51 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=4e93e2923242dad5e4b9bc5c04c68346d5650d14;p=SugarCubes.git Merge branch 'master' of https://github.com/sugarcubes/SugarCubes Conflicts: _Mappings.pde --- 4e93e2923242dad5e4b9bc5c04c68346d5650d14 diff --cc SugarCubes.pde index 1af65b0,5f18e48..3cae80f --- a/SugarCubes.pde +++ b/SugarCubes.pde @@@ -35,12 -37,12 +37,13 @@@ LXPattern[] patterns(GLucose glucose) new CubeEQ(glucose), new PianoKeyPattern(glucose), new WarmPlasma(glucose), - new FireTest(glucose), - //new FireTest(glucose), - new SineSphere(glucose), ++ // new FireTest(glucose), ++ // new SineSphere(glucose), // Basic test patterns for reference, not art -// new TestCubePattern(glucose), -// new TestHuePattern(glucose), + new TestCubePattern(glucose), + new TestHuePattern(glucose), + new TestProjectionPattern(glucose), // new TestXPattern(glucose), // new TestYPattern(glucose), // new TestZPattern(glucose), diff --cc _Mappings.pde index c1f81c3,0e296df..20c6db5 --- a/_Mappings.pde +++ b/_Mappings.pde @@@ -103,30 -108,113 +103,29 @@@ class SCMapping implements GLucose.Mapp cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0); cubes[cubeIndex++] = new Cube(10, 0 , Cube.EDGE_HEIGHT + 10, 0, 40, 0); - cubes[cubeIndex++] = new Cube(3, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 8, 0, 20, 0); + cubes[cubeIndex++] = new Cube(3, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 8, 0, 20, 0); cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0); cubes[cubeIndex++] = new Cube(0, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 60, 0); - cubes[cubeIndex++] = new Cube(0, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0); + cubes[cubeIndex++] = new Cube(0, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0); - cubes[cubeIndex++] = new Cube(20, 0 , 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0); - cubes[cubeIndex++] = new Cube(30, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 20, 0); + cubes[cubeIndex++] = new Cube(20, 0, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0); + cubes[cubeIndex++] = new Cube(30, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 20, 0); cubes[cubeIndex++] = new Cube(25, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0); cubes[cubeIndex++] = new Cube(30, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 60, 0); - cubes[cubeIndex++] = new Cube(32, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0); + cubes[cubeIndex++] = new Cube(32, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0); - cubes[cubeIndex++] = new Cube(210, 0 , Cube.EDGE_HEIGHT + 15, 0, 40, 0); - cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 20, 0); + cubes[cubeIndex++] = new Cube(210, 0, Cube.EDGE_HEIGHT + 15, 0, 40, 0); + cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 20, 0); cubes[cubeIndex++] = new Cube(218, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0); cubes[cubeIndex++] = new Cube(213, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 60, 0); - cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0); + cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0); - cubes[cubeIndex++] = new Cube(210, 0 , 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0); - cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 20, 0); + cubes[cubeIndex++] = new Cube(210, 0, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0); + cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 20, 0); cubes[cubeIndex++] = new Cube(212, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0); cubes[cubeIndex++] = new Cube(215, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 60, 0); - cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0); - - //bridge cubes - - - 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); - 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); + cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0); - - ++ return cubes; }