From 39011e7ef5520fc6517c110a73ff0f6d697f8de5 Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Tue, 20 Aug 2013 16:23:16 -0700 Subject: [PATCH] New strips on the DJ booth floor --- _Internals.pde | 13 ++++++++++++- _Mappings.pde | 18 +++++++++--------- code/GLucose.jar | Bin 24483 -> 25732 bytes 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/_Internals.pde b/_Internals.pde index a18c95a..fc06832 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -120,9 +120,10 @@ void setup() { mouseWheel(mwe.getWheelRotation()); }}); - println("Total setup: " + (millis() - startMillis) + "ms"); println("Hit the 'p' key to toggle Panda Board output"); + + println(glucose.model.bassBox.points.size()); } void controllerChangeReceived(rwmidi.Controller cc) { @@ -225,6 +226,16 @@ void drawBassBox(BassBox b) { 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(); + translate(b.x+(Cube.CHANNEL_WIDTH-in)/2., b.y + BassBox.EDGE_HEIGHT-in, b.z + BassBox.EDGE_DEPTH/2.); + float lastOffset = 0; + for (float offset : BoothFloor.STRIP_OFFSETS) { + translate(offset - lastOffset, 0, 0); + box(Cube.CHANNEL_WIDTH-in, 0, BassBox.EDGE_DEPTH - 2*in); + lastOffset = offset; + } + popMatrix(); + pushMatrix(); translate(b.x + (Cube.CHANNEL_WIDTH-in)/2., b.y + BassBox.EDGE_HEIGHT/2., b.z + in); for (int j = 0; j < 2; ++j) { diff --git a/_Mappings.pde b/_Mappings.pde index ed2d1d4..d7d0951 100644 --- a/_Mappings.pde +++ b/_Mappings.pde @@ -102,49 +102,49 @@ public Model buildModel() { }), // front DJ cubes - new TowerMapping((TRAILER_WIDTH - BassBox.EDGE_WIDTH)/2, BassBox.EDGE_HEIGHT, 10, new float[][] { + 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, 10, new float[][] { + 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, 10, new float[][] { + 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, 10, new float[][] { + 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, 10, new float[][] { + 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, Cube.EDGE_HEIGHT + 2, new float[][] { + 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, 2*Cube.EDGE_HEIGHT + 4, new float[][] { + 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, Cube.EDGE_HEIGHT + 2, new float[][] { + 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, 2*Cube.EDGE_HEIGHT + 4, new float[][] { + 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}, }), diff --git a/code/GLucose.jar b/code/GLucose.jar index 9b2d5b098f5c983d79ace4a0264136fe139d224c..d8f3c05c0993e311a70bb72bca484d598a6e5337 100644 GIT binary patch delta 3492 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 delta 2286 zcmZXWdpy(oAIHC&$z`LgVGU_$lDoP5+>Huzn>#a?8D%!9qv1p?ab~9wzAB1TB9TO- zUw5|^N^(1L%}FP5lw3l~@!NOj@jH)4kMn&z_I>X8d4JyfeD?k0^ZI6Vz{;M$P!u-_ zge(9^1Arqw52XVq;qxrcK=|wg13dn}-{(BGy;%KtqLzpzA z0+<1WuP{T=oIBd^-!_R@FVi3a>0Q)r1jOIBe1kz8M}HM_5CexpKCDC*I{_Ob1^J++ zgLoWE_$CQCM$buH57tjWph%2=RT6!KCDl% zVV9A>=!H>B?oTDQ7hma0zim)HVARb%NzWhq5VT;^ibNTj6h|ljIvLGNK-C(#A3j{$ znd~8$HR*P%?5yZ+>)j?}Hl|(E7cd)Seko=y=Ro}&x?r5UdZ@QEr<{Qf=uUZ5m+~KD z^W4rhs_q#?@wuUe_?mh4rlT`^A+K|n`sYZ`1$S#zv%jpt1*9c?_I9H zwZ-JZDeXH+3ianX8g1aV?BMHd!=_`*;*&lZ9qR#vzC7Id%ddPnn6O-d+4xp3a_-eV z+6az^(u?FXTr-31vP7LMhQm`ttCq+6!beY=HO~eVAXMIUBqxFyk14@pA-znNBb(iR zdv9#X1ja+E@}_6L%lz{GnlxYA!I;v4QvR>UaRqh00u_^SjM`VFMmvt}^1X~3ryBJJ z_imK6wXg74n^Di|i*GU_pKvO4EwS&8$#Ts6!#b!wTxHH{zYC?kORnSPbY+8>=@w79 zGYl}R$?Rczl34>IJ7cF}1^M*VN!y3Dbp64YRY1KL&RmsNXRRVi7b1}NLtBsL-Es_M z4N)e~PKOP{D*^@~H(A)8^NcQotPrUpM z>>8`%0M z7kyVJu5}UD5`3#n!Ow9;d*kr=6_itckhWxbxEW zG&$Yap=#d1a7rug*s-PMzCnZ1Cz6?NAzS$U(>TLp>;9w4gGbaCg+;<6_KQ-5LQeaj zX@=q$i-l_m3vD!$qjL!MaWho;?21oalO*4j5A(SvdEMgSQj~mlbem?IoXMr#cHT(ughNvw3kSYGo0k9L{8NPdv$+H= zzsf#KGvkQW$0)05iRYzDW3ONPFOAv)p&&|MNx~5FP8EEy~2ldV%E$@iDJt zuOW6ThaKX$pzWD}VgR&tZiP|+?s8l_eA2yKoGLn$6XKMp_OTPU&HCz!e+CL{?-Ck{$llwIxy&{=gnIh}0Hu;aF183SYEv zrRbyn&jtYCT3WFq=;4gl`*Bf>lkmyO2|EM;grNXH>xTxqlc)g)jz(hD#eXieCy6Z~ z-YlT@!^BCjIT8ozGtkgZNeopu-wh0B=tGtxGFeaXCPVxZ@K1*$}$pt??! cDm=*#+!d@19*mNf*90_y5g7oe_lFkvA7bgIa{vGU -- 2.34.1