From 343875e3e4b5ec847f10f72622f4f08bc93f3ee2 Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Sun, 13 Oct 2013 16:12:35 -0700 Subject: [PATCH] Peformance tweaking, new library builds --- MarkSlee.pde | 8 ++++---- code/GLucose.jar | Bin 24626 -> 24757 bytes code/HeronLX.jar | Bin 65367 -> 65367 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MarkSlee.pde b/MarkSlee.pde index b910576..26c1cd7 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -172,11 +172,11 @@ class Pulley extends SCPattern { } float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48); for (Point p : model.points) { - int i = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1); + int g = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1); colors[p.index] = color( (lx.getBaseHuef() + abs(p.x - model.cx)*.8 + p.y*.4) % 360, constrain(130 - p.y*.8, 0, 100), - max(0, 100 - abs(p.y - gravity[i].getValuef())*falloff) + max(0, 100 - abs(p.y - gravity[g].getValuef())*falloff) ); } } @@ -246,7 +246,7 @@ class ViolinWave extends SCPattern { for (Point p : model.points) { float b = 100 - pFalloff * (abs(p.x - x.getValuef()) + abs(p.y - y.getValuef())); if (b > 0) { - colors[p.index] = blendColor(colors[p.index], color( + colors[p.index] = blendColor(colors[p.index], lx.hsb( lx.getBaseHuef(), 20, b ), ADD); } @@ -297,7 +297,7 @@ class ViolinWave extends SCPattern { for (Point p : model.points) { int ci = (int) lerp(0, centers.length-1, (p.x - model.xMin) / (model.xMax - model.xMin)); float rFactor = 1.0 - 0.9 * abs(p.x - model.cx) / (model.xMax - model.cx); - colors[p.index] = color( + colors[p.index] = lx.hsb( (lx.getBaseHuef() + abs(p.x - model.cx)) % 360, min(100, 20 + 8*abs(p.y - centers[ci])), constrain(edg*(val*rFactor - rng * abs(p.y-centers[ci])), 0, 100) diff --git a/code/GLucose.jar b/code/GLucose.jar index ec0a705b478e7411bdde5ed4609bbe0758506a7c..bcd6cbdadc10e8532a2e5ab5a184c171dc550ad9 100755 GIT binary patch delta 2560 zcmZ9O2{csgAIE3L*auNwM#{c47!8tT?6U96FlNj|OoS+8DaKN^LeoW*w2aD-(S}l4 zD_hF?CVRF-$&y`p=gxWm=RN)JIrn_-_xXLF-}9X3+;hIq<9cXi0~Fz8%K_(uKzJY! zMjQ=s09F!5JDd$;eYePPFyicK-{d$-;_Lwts0t_nVsJFOSvErDM8?}nk<#-I)&UR8gh8A8`{lppWU2f(=2V! z8Hw}59276_jeI)fbt)m_entg7{I#O#Hy_kQ{8B-Cxv zsg09z7e6dd%fHqZHN08by0&5XV=Jy`?f0b7&e;jRgp;Z>X>w(s_fJMlV%~hir0kZs zhoSpYaj6;2$l_T7s;JXPI%v$guy)e^7ZC5vMN?F1vl7!<*Q;G}s1YaR zO?W?!NZ+~YH((8Hbd<`FnrHfF+DZGlG40@X{4JtC!!uk!0T5iXFF-cNujnJrbZwPxz=^K24 zKW;&~SmV?FAYw6hw%^h9yFz+Wr_%@(X`nr0C#WySIR7%!u_W5*O%RH&`$lf{&$XY8 zGpD*ZT*7MRFXg>R-)T0#YD6ZP^hC>kXpN<;>MCva9OE^d3!qy5`W37gdF12O*3&8> zu+}Zk{f$y^!Nt-Y6T_;y5O5v@K;&wJ@P4{@4lHEh4T|6Nn)vHWJV zXeiIi^lJFXTXdodV#hD)@~4w228grBRSW`y&>Z^k@aE@zFI5&GwFklyK1(;%Ercen zE&RT6A-DQm*K2MhW41NZR`=^7lR7MCxtqSB&_2V!epxvFgGV6z)or7jEqXEW9V5zQ zTFVM^#13^N1}M-H`^3=lx8HBQbXWa&U^Y5NAriHC9@uM@gaT3g7|2=tF~6K^ax+BtbZQCf2vL4`0mq%@mJ*AE39Sa??yG1%~WVA;(C7I z3*)=x0>W@rEZT%?2wkCde`G7M?EH}H_pXozP`SG+uByl zePEb5JTdT!Is9cn=A+}mZNKlyGRb-i*6x~AQ>!3R~=)Thk za+&ebZf?TW^Su~Yki_Lw3gD8)30B9Qe2b;BGF?9zbD|c?)kgXD`&0rGK)Rv)^Y7ivp5&-px&qYn=p~! z>7&Ej%2Nr1(0J+gYEOMCzORaw_qbeD1<_tY(JXD^mmm>8SS-1>w-c=QKcI=(s1M9d z-L2`U+P*S$k^r@yf2ihurLRgfr+7Fm(8BJpuf?*MZ&IzyW=i0j?-xI89bI`zn8>_0 z7ETIBk}vUUzCNe6d>Kip&5G&oCE9DVsTqqR+NP?rTi=emIVS|AmF7FqUZ$*|vT!XJSt4u4B6U}fm z-80YpS9L-xC6K15Gj223pF$BPAUKWS8lR~OQe#Mu{g9w`~S;b9tap{QgUY+Y@iSb z9L5T?Jx^d-WOm>kJCwic(N%+0Esl$|R#?ye!Q=W!kqeq@jAUNqoRtFEfltg1H4x8u&!11 zW}M!gQNgVJuq0&P9}`-D29hecl^-NYSg0K!Kvn~f3rm)S894%8WEJ*;-;I4YMpz3{ xSS@A$n19L%;B%4(TFD5uacYnhzRohFvHm56KaAP#fU>(1AbE5bR~rtj`~y?(d?Nq= delta 2409 zcmZ9OdpK149>!;ek-OZ=m~j^p%D4|XGBR$1+y*md$R!+^7?&_(j+E%K(Q=6j>|1Hxr>9;5 z1gVy&E|e{(75q-G$&dY(mF;2ifnwDsKADka6`~%Zw7)gXf`>~e7XH{)Tj&2+ROM&q>B$2(>;yM)n@>{| zlgftIT)MkoGJ-bx&y#yjvF8<~Ouon+mrp#pp`q@S`*zf=ZH*lf^MU?Cvr7Jo+3ov* z%t}`K5i_}kPx5QwI<(<%w}UZvstq&UB<*I)OC>%ny?#-dOzKTKPb2KBpNNuzOezza0=77#P2_Toov<^f7dyta#47rs9|3W2FlWW*6I>ypa>rvf%4L zT70q8-Z+?ZULM!^u6nxZ+CVXbs|0IOu0gF^x!x&*DEbDO)>4P z=nN|E*snwD3Z1l;U1spXl?RuzDxjEYxuu&is&YfDbrY0gg-mvSj)s1;S1pV-AM(wHR z`A8|%cM0bdzKu$8a(5m|?IwPiaoj=oaT>dMPRWD}&Lw6dxx04jjiBR{^XnPPn7u%`9>$6#Cphlb79ju znaHRzy)xpG#f~?*W8*KNJqEZo4H}+K9H%MEB2^FCJuOVtthw1=O{|FrylN+E#%>zr z`qmw)xwRdJG5B6#nOU;$u@g)DZh{W5U#zez!NbAyicpBBRI+WXVUX8N6%x9T`=ukU z;L+ejWUxky(WryF@e#kX?=j)OPir^#Pt>2*Xo(#SH(>jF{ioI75$#O0W=M17jeilO{F#!NiWEf{Wrl`}Cx8>&eG^xoJbZZ?BZj`Pi6T7@X3V zkXKpEH;_PGsTCr~;A4&E)5AmSH87(g(PMdc&y0qmx^#2~1cMuAu}huw22rD{8UrIu z?H3HwUMV?+j5=B4Wj7q$(1j(WJ0)!z0SD(lc^9Ozk(_IfgI4ky2|aJIYbojrvl#6I zF6Tq7dst@6X4@AYv3FOp)#r4cVK@8RcXcKQ8br#9`-(%iq!qWn@%`ZJzn5(gx+M~x zGA?7+V1-a+)?G_^mYz4v5GcaL7WMDG&Lr%pnVm~h=8Xtc3+k_^mBr!fdhomOf*EVp zK$Mk(N0=bDzU0<6kQpH@G&w$8`W#P-56o<184+$5+O7&{)RHYz+5cV1$yfY9pM7(> zI(5D1{qeQj@S&#?JAD63Ktb4E)C3!{p{Q9j`WF;Eq2{WPzGk5eMN_>M4~!-t6VC;c z$-^cYDv#Th^MN|aX$VR#N0(#J7|Rs{z2=suIUM1^1YUcYfz#3?D-fO}eJC|ENCpr& zBy))0NjR`==8gNSj0Up3m7(Vr@8b|Rye&bCp^qzwG@lb7Uii3!Q1tZx5#vh&@zU2G zgdCXwB7p1wqK@ncVw-FO!iwSq;ung||EKF51==s#4}+LA0L=U}mB9EN`>GsfkA%Tk zLNFK__V-nmLIT)+&;g-#Z{iIOc;R;xT4zsvHwSK8pv7Gs;RqQ%@WcWBZ{P$K16Km5 zR4ve!PQ@T#c%T@sqVuzji2s9gfoI7NgHc6cF!jGzgq5W{2M6SVWE)WcMH5v9_lNWw ziI3oemVhbzWIk!PXGQ^3niOOlFb`P-5HOg_-p45YWL$9svS_;CrZ_YVqQe;&^_BtX vE+W7VO%$vO`(qGmE_+p3;J7~;toZI#L_GmXA6ek3rxZ}^zh8jh1-|o7pDzum diff --git a/code/HeronLX.jar b/code/HeronLX.jar index 15c009f0654472f67a41bad555a67e9ec66b5d54..7fd5ba8de8fc0821cf5a04b3ad58c19bffc5e216 100755 GIT binary patch delta 1342 zcmYk4XG~K86ovaNqT0oE56 zibRQ&7{QPRlz^rr9KvbJSfPuD zK;SMA#OG_KEoI~KHLHv1*)pG=R)6P{6EkFR5zHz=4im&HKXGPOR;K!>{=@{5 z?aE3BVQdILD^^Rou00hO?4$o-On+^Mp1=3F~ds&eNDW8G*|D_K;`4U z2T?Z7t?(pWBuNsIZ3)(sd>HbSC1!+0Q(0HN<~ZmdzJ$g&MMNu=7t4mQ#3worX(cfd zjJ=J0OyqLqCTh!2C}7tr3&DuQaHQpJwSxOp5*O;by=ysiOIka$HuL%vs>`xfeEb1} za7J8y{DxVMfP!8|AkYiBAeop;8}#4~4tVOS4%^YEJ>rTps*mZBlXHSY-8Gj*U34l6 zRGfYRiqG6aUv*&s`r6Ldfmbf1G1wRRA-6{A+*iZ=-M7-_satVLhQ0%r`Pc6*x`&)% zt_|FKb3O8_O7?)WOH1)SwdFIRn;)cr{*^|2#_2V7yuVxR9^~fKB|yKd=g^nb7z!3W zUkN_bThOO{!GHF)SIb!3yKrsxH?506P$A-&ck^_CZ(idb+gmrxIo>Nl<;P&u&$f!8 zZ+%wtep@B>R(|(_Zv3$u^!u47WaFJbxsEmT-~H0Dj^Ja&FIjF3BUNC8*JOkzH~Vsa zrp0758GX5Q(<1uwyeWdvVv-R=<_!e7Ig+3;M-dEWw0K*#kve4AOlYvk2~#^a5)wP3 z33oc<2wk0<2*F+GJkf01`}NI@cj$NeFkGCYK=I2*1lx8Wm=+i+O&Fs7dj<37(3C5@{`Fi<~& zJ>GVt?6>3fTI}dtFp5)7j$+&}icaYmyy7twtz+pFrWnVf$K&us6M%XGVfqQ&GG`L% W*rb{UzE0xHNgYVhIFMpvx4IZJvBlK4#3Vp^4 z1R{aJmS5?=khSJlF0Y_x`)qpJL%dH;!jQqmGD`_LOa!ljC0W_oS(;QiK#dRWL<`gOPMadk}Tub01D(3|q zLfJI4E`W5oG*w8pB~nlFPSit|m>HcwWnJTnJTN3?0gZ9W*bXYsm-k~yU_v3%s@F>~ z_B!z%kts1&c)E}>EEEWS(nC9U4B5##~(BZ zCt358)=c$;7IiZMfnLZ($R%8Q-+1m&Z-B1hh#P&{qrNz!F;|bAoZ}qoz6C7m;uG

nynso~#zJq1_>pRMCBBz4u z1ovK9jr@k{J>azK*YQ5hwUeRSZl{4E^+tTgiA`?2zhCnnegbk{V$0YlD^3--j*VvKb