From e105ef7c5f2d4acafe97d1844aafbd6dfac80557 Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Tue, 20 Aug 2013 04:14:06 -0700 Subject: [PATCH] Test pattern to work better with speakers --- TestPatterns.pde | 10 +++++++--- code/GLucose.jar | Bin 24475 -> 24483 bytes 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TestPatterns.pde b/TestPatterns.pde index 6a2747a..51402f2 100644 --- a/TestPatterns.pde +++ b/TestPatterns.pde @@ -6,8 +6,12 @@ abstract class TestPattern extends SCPattern { } class TestStripPattern extends TestPattern { + + SinLFO d = new SinLFO(4, 40, 4000); + public TestStripPattern(GLucose glucose) { super(glucose); + addModulator(d).trigger(); } public void run(int deltaMs) { @@ -16,7 +20,7 @@ class TestStripPattern extends TestPattern { colors[p.index] = color( lx.getBaseHuef(), 100, - max(0, 100 - 10*dist(p.x, p.y, s.cx, s.cy)) + max(0, 100 - d.getValuef()*dist(p.x, p.y, s.cx, s.cy)) ); } } @@ -176,11 +180,11 @@ class TestProjectionPattern extends TestPattern { for (Coord c : projection) { float d = sqrt(c.x*c.x + c.y*c.y + c.z*c.z); // distance from origin // d = abs(d-60) + max(0, abs(c.z) - 20); // life saver / ring thing - d = max(0, abs(c.y) - 10 + .3*abs(c.z) + .08*abs(c.x)); // plane / spear thing + d = max(0, abs(c.y) - 10 + .1*abs(c.z) + .02*abs(c.x)); // plane / spear thing colors[c.index] = color( (hv + .6*abs(c.x) + abs(c.z)) % 360, 100, - constrain(140 - 10*d, 0, 100) + constrain(140 - 40*d, 0, 100) ); } } diff --git a/code/GLucose.jar b/code/GLucose.jar index c1bd9a30d5499fe4b34250888c8d973b580e2606..9b2d5b098f5c983d79ace4a0264136fe139d224c 100644 GIT binary patch delta 2920 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 delta 2915 zcmZ9Odpy(oAIG=3#$@R?1mcMNMW=H=b8z=8=VcQrnbJOaZ*n-OL8}>O>7%%<5!1 zvR+5b(djxlTcnD(iw_P5h0h zlznoi9B6QIphSGyxw9xXV^W<63o7YJ$)o)j8Xu2+Jwb^*I?jF(%+)&^R?= z;*&3GY3+cMs*J)L_v}|3*U);)F0mQ-QTdiQV4DN{W*{bMEx7Bei0z0aPN7emTIE>j zEw>V#WH;w{^fr}^Bkil4XHQ?eb$lRd&|@)BNm|(VWKPwyRyXg&!&(`E@yD2(>R7Vf zk!<5na(K-;Z|e1x>y_BavHVtDH{&_B=1^S5DHqu*F1o4lT}Qo3T^_@H>)( zbW41$v%>|xaV^&;rL33r&Pgjyw@%1uX_5jOakMkf=CtZQ8`52A?v^z@#?qei3Ta_3 zXHs3Hb;u$kR0%89H(&gN#_X6}N+Jd4=u?@6q3%tD--V67oN0Slpek$#sWui~jf|#8 zrZ=B8nPoWM{D}B8YdIB@an4_)=unUuC#>*E*T^lo%coSZ%1=k!gLLv1S62Lu{F(z5 zv@HAlsyN-}|6?@P0N@A6L)iPt#*_fNIJURXkB?$$@3)^{iyI0c1UNE1PqlN1qZ>us z_OAg?D+4Fo`Rt&=6k#S<=@_49cXd$+U`J*vKQ0 zDPgWetW4s?hqSU>mSr>I#SJ2BP}<7VJgO7nYBOp+W$`7{W7&{N37%K8_h{6;pCO;L zwdh+zeWUx~)o8v|w89tC>kJ|J(deFyg2P5nspcffOR0ad7Vsr58e=g^w^NQxSG=d} zn@_s(?a`~lK6*;8n<$w162`J!Zo0|C2_fRWq&>Mh*AmxVv%2BWB=QtX^;Fg?EFM^- zT2#JVkn9QnZokg&Vxpq8KDK+xvr)x@y_@VlQzAeHFdx{Y=E)tM^=ZU9f(LlHb~;mj;_3+BzH-JidQ>d2bWi z#VGj3}aBe{%_O*Gx*vD19?|dCRPSmoAPY zQ+`vS^G8mP3Ts2W6U|K<6*|J=I$q;0KRWM8r{7S^Uqkll_4c9yLV)sMJu*Y=dd3IE{-|$JAl>4tj;sY*MtsaZk2EU*; zF^huJILp@b)?STP#s1SB38Rtb!zI28awmT8Gjm7IX`XlA4Aw7qo{Cg>zsJ8B`HB)V zu-lA9wTT%ebf-8FvQ|$UHPoDPDwiuRSC8+C`4pZz>&s1>`cxO27*}BW9KfKl7yRE1 zwH^1=>&uj0kIA1$2|=%X_dF^70bhNP!&JVh#B6z67+U}SF9Nc^p=&)YMH?F!x2uZ#Jw40Q-It}COg?SBm#)?K5Yo; z%6k)+F&~|&Pt%r}mlfFlWsrZvpI_A)342m(k!{7T6t+q}?1gOYtQ53dS8B+n-rnSd z)<)k)suOxg-Bn1{zAJB-j#jH*tHl!-vHKCq_8iQyq3>bg9}cN6Td!$uu$)5){lfR0k~qkmsEbff{(|VgR1raybktW2!C~o5HCF zKrmcUKo@l{xO_`J1h%1F4SyDlKoq)?Kuo%tfHf4&6oe> zJMIeBgxrpR>ZqGFh(b485Q}aWAh2}1e?_ZQx`8qnwghStZ3+b-kXlg)L=N)zr#vYL zn4znKhj+Q7U`BW#2(Pf)(H07m;sbLe_?7@iUS;+GAWl#O(%s=;Zvk(|#}LRdR0Trm z@V(#@{_n3s|9(R1Azq_2pums-kK!08=v}~$p}un}A(pmzk$0Uc-dFkWYeCAB^2~r) zhCEQmklgtLTb<`-NW8S@0f#`;{?T|Gc*DT&3=?3mV}p4X&$~55@gF@C*1TbIfSt$A v6}&u9(6c~-2Nryvw|D{uJonHB#aEs%1Ef85K|%IJLBjw)PoiM83pnk+*SPj{ -- 2.34.1