From: Mark Slee Date: Tue, 20 Aug 2013 08:57:31 +0000 (-0700) Subject: Speakers in the model and mapping X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=e76480d4b65c6aa439e20c3d56bca2e9332371e8 Speakers in the model and mapping --- diff --git a/_Internals.pde b/_Internals.pde index 9f75baf..fbe7435 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -176,8 +176,10 @@ void draw() { endShape(); noStroke(); - fill(#393939); drawBassBox(glucose.model.bassBox); + for (Speaker s : glucose.model.speakers) { + drawSpeaker(s); + } for (Cube c : glucose.model.cubes) { drawCube(c); } @@ -211,6 +213,16 @@ void draw() { void drawBassBox(BassBox b) { float in = .15; + + noStroke(); + fill(#191919); + pushMatrix(); + translate(b.x + BassBox.EDGE_WIDTH/2., b.y + BassBox.EDGE_HEIGHT/2, b.z + BassBox.EDGE_DEPTH/2.); + box(BassBox.EDGE_WIDTH-20*in, BassBox.EDGE_HEIGHT-20*in, BassBox.EDGE_DEPTH-20*in); + popMatrix(); + + noStroke(); + fill(#393939); drawBox(b.x+in, b.y+in, b.z+in, 0, 0, 0, BassBox.EDGE_WIDTH-in*2, BassBox.EDGE_HEIGHT-in*2, BassBox.EDGE_DEPTH-in*2, Cube.CHANNEL_WIDTH-in); pushMatrix(); @@ -232,13 +244,35 @@ void drawBassBox(BassBox b) { translate(BassBox.EDGE_WIDTH-2*in, 0, 0); box(0, BassBox.EDGE_HEIGHT - in*2, Cube.CHANNEL_WIDTH-in); popMatrix(); + } void drawCube(Cube c) { float in = .15; + noStroke(); + fill(#393939); 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 drawSpeaker(Speaker s) { + float in = .15; + + noStroke(); + fill(#191919); + pushMatrix(); + translate(s.x, s.y, s.z); + rotate(s.ry / 180. * PI, 0, -1, 0); + translate(Speaker.EDGE_WIDTH/2., Speaker.EDGE_HEIGHT/2., Speaker.EDGE_DEPTH/2.); + box(Speaker.EDGE_WIDTH-20*in, Speaker.EDGE_HEIGHT-20*in, Speaker.EDGE_DEPTH-20*in); + popMatrix(); + + + noStroke(); + fill(#393939); + drawBox(s.x+in, s.y+in, s.z+in, 0, s.ry, 0, Speaker.EDGE_WIDTH-in*2, Speaker.EDGE_HEIGHT-in*2, Speaker.EDGE_DEPTH-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); diff --git a/_Mappings.pde b/_Mappings.pde index 133a621..78f7b0e 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -45,19 +45,20 @@ public Model buildModel() { TowerMapping[] mapping = new TowerMapping[] { - 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}, - }), + // 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[][] { @@ -148,21 +149,21 @@ public Model buildModel() { {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(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(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}, @@ -172,13 +173,13 @@ public Model buildModel() { {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, 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}, @@ -218,8 +219,12 @@ public Model buildModel() { } BassBox bassBox = new BassBox(56, 0, 2); - - return new Model(towerList, cubes, bassBox); + + List speakers = new ArrayList(); + speakers.add(new Speaker(0, 6, 0, 15)); + speakers.add(new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH, 6, 6, -15)); + + return new Model(towerList, cubes, bassBox, speakers); } public PandaMapping[] buildPandaList() { @@ -242,10 +247,10 @@ public PandaMapping[] buildPandaList() { { 37, 38, 39, 40 }, // ch10 { 41, 42, 43, 44 }, // ch11 { 45, 46, 47, 48 }, // ch12 - { 49, 50, 51, 52 }, // ch13 - { 53, 54, 55, 56 }, // ch14 - { 57, 58, 59, 60 }, // ch15 - { 61, 62, 63, 64 }, // ch16 + { 33, 34, 35, 36 }, // ch13 + { 37, 38, 39, 40 }, // ch14 + { 41, 42, 43, 44 }, // ch15 + { 45, 46, 47, 48 }, // ch16 }), }; diff --git a/code/GLucose.jar b/code/GLucose.jar index 14710c1..34e8f52 100644 Binary files a/code/GLucose.jar and b/code/GLucose.jar differ