From f38a60491e5a42404497d2d56517c27f4df5d6e6 Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Sun, 13 Oct 2013 22:20:07 -0700 Subject: [PATCH] Update TestPerformance to use all methods of getting geometry --- TestPatterns.pde | 55 +++++++++++++++++++++++++++++------------------ code/GLucose.jar | Bin 24757 -> 24832 bytes 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/TestPatterns.pde b/TestPatterns.pde index 3f8f8e1..1c2ea70 100644 --- a/TestPatterns.pde +++ b/TestPatterns.pde @@ -96,29 +96,42 @@ class TestPerformancePattern extends TestPattern { } public void run(double deltaMs) { - if (iter.getValuef() > 0.5) { - for (int i = 0; i < colors.length; ++i) { - float x = 1; - for (int j = 0; j < ops.getValuef() * 30; ++j) { - x *= random(0, 1); - } - colors[i] = lx.hsb( - (lx.getBaseHuef() + model.px[i]*.2 + model.py[i]*.4) % 360, - 100, - 100 - ); - } - } else { + float x = 1; + for (int j = 0; j < ops.getValuef() * 400000; ++j) { + x *= random(0, 1); + } + + if (iter.getValuef() < 0.25) { for (Point p : model.points) { - float x = 1; - for (int j = 0; j < ops.getValuef() * 30; ++j) { - x *= random(0, 1); - } colors[p.index] = lx.hsb( - (lx.getBaseHuef() + p.x*.2 + p.y*.4) % 360, - 100, - 100 - ); + (p.x*.1 + p.y*.1) % 360, + 100, + 100 + ); + } + } else if (iter.getValuef() < 0.5) { + for (int i = 0; i < colors.length; ++i) { + colors[i] = lx.hsb( + (90 + model.px[i]*.1 + model.py[i]*.1) % 360, + 100, + 100 + ); + } + } else if (iter.getValuef() < 0.75) { + for (int i = 0; i < colors.length; ++i) { + colors[i] = lx.hsb( + (180 + model.p[3*i]*.1 + model.p[3*i+1]*.1) % 360, + 100, + 100 + ); + } + } else { + for (int i = 0; i < colors.length; ++i) { + colors[i] = lx.hsb( + (270 + model.x(i)*.1 + model.y(i)*.1) % 360, + 100, + 100 + ); } } } diff --git a/code/GLucose.jar b/code/GLucose.jar index aceb24606c4e168eb3627d001c513f460458bdf2..326cb384dd61141747cdde4cd3d8fa9ae4ca6bf8 100755 GIT binary patch delta 2606 zcmY+Gc{r4N8^>pcDKvj2UJq*|LX2Sw@p2&B^juI+oKRM9Y+| z%`(<-lvWZ>lP!dkJ=uCabFTL~SI-~6&-MM@_x)R*f9|`X4VuypML0Y1@Cra6d=SWB zO*Y~PY@jCFAQN1B6kr}T*>lQ!D=axfcOKp&I|1Qa~+K6m*_JwLoVb`U|Mk zV4wC-$Ip|<2lDcPO(@8Vg6mu+2*Y5Yri(amb)Tp|HxGmIc7;m z+&tkU(Y!(fHF&H`8E0y39|STa1VrhI(eV+d{X@0a#B3G$o0aR|{JCI{!B>{_Gj))KosJ?ffkBPc zW&xbQ4QOK^dD*l>Sd!)&pFKubNs~iwUmsILOve{l_^<1v-Oy=z?)*9N{^I-{OtQj6 z0jA%PFZZk(@lsi8&mwxur7`YdZvU##t*aGK{=b6G8;2AG95}-7MZ$lT{-gi7)8~xp zkH{z0Zk2J&w}|;N^&gY-))}JVPn`#N2}51uzTr-c8V9`@T$W8q&y<5sFHVb;6}fVT zoOCU>DU9fL*-UqS|wQXV!IDT`X&R7qIgNH3AAQ^OpI zQo50~WF*PXSt^W_LmI5TUwt=|_u4V%!BC9t+~3cB_}!eN`~8;$9|}pg zCd^0ivxQAsGQFzAaq-y=9>R&DL6>eP+OBMx>3UDRSGU}fnhbpYwae)Zokn5INZ*6Z zlNKH79TFW_#C{1O%r=}(A6Sw!y*qKR!>~gML0UABp?6yh7WY?g-TpgM+tpTVpl|5I z>_;SD|Bd7;QHP@p(~pOa$}3Q;h$aI4z*GY1TU*wHTUTTbWt; z9c@T{dMboQ0JO~f4qtxzR%i6@a_l?8sX6aR+Gq#?|N78qlVBhnHBdy+qof7bz>wvyNb`dJJF*e>mxl`+fGXpu=yIpfShm-v+b>?)} zs+Gf}Y*}^v3R8KUc3!(_rBrp!S7#>)^(T8pCTJ=F&fnOx@(DS~dHaduxa)h7U9`O= zwN1#m5xQt`Vt0owxO?#XD&oqc#=`1V+5=hbeHZTX8`n zND-pG5=*}}wd!V=o)>k&CctVWJ4okZK+(-(q#tA!O`Rm?^RE1CZ2h!=5D|`0E4=2C z>G4Igx;}?O&s1H*&)qSxlL>Vu#=g_Et06PaP24er8gMqODkB>7ecu0?lV2MaBUV^F zP#3&56-%M{^x7=r=lV?SWJ9wG?%cW;Htw3#gV|w>p86eX8Qy>+XT8Xm6f1YUs!8!4 z7^jR}o-p1?n=!zt{X^Ml79L>7*(#oz*)EA_OwH`1$0~Iu9$3i|324bXH{|S%KgyE0 zedkJ-J2qOc=CKFsk2*v%BfO8#-Ir|hm=Tt5`7No@ze;@7GtHyT*4|GYSsDs&R@Qa1 zj8JPR<=;dHb|i^zdfg4`^SU7LPvnBo`;Wo!vST{WH=B2|^LSX^Z;OG7Z9k1X@@1!wUEDt{tG30p(&Su(65-~GuS6hD^ zHU~|t5UL4i$09Lr+~-qT&ir%H;>eX8A1v+}TC)58$s#81w_^Eat*0L^T~6NR`H{f) zw#PlDd4Ge=aEP*-lBGxs+2)~snbA2`JF%i)ivC@0Ybl+syq`7Rvt_7auh{GI$Yi?8 z>+{k%4ZbxS>#+*-@v(8ZabP%I@StFWbAbfQI$EVgDb^*5n$1?tac;k>Iec97Q17U= z$rddRo;hBwDN%XUyw*(laYeLblrZ&bqfJwzepKgFbb5GTZS`0G4TBP&RoAV}f^Ufn zNGT=WuX?N(=;|Gf?N&PU|NWc~ve!EOb?MyJ`B^W8+e(8>6uFvdD$i}Ttm7Q8)dHE= z4zSa@StoPtcXky#piaQ`b33skL7Q8aUz7J?|f7$6v$G-=YMgcb-12_Qxh5EPK25T{5$b;>i5~l@3p&B5}pz0t(ps0TarGW=fF|gYPMT1y@YJpIN zjdSo&fafef$dv6HP>|<^R=7MP0)v4yRn&o7cZnV0uG8M-4F|_B$(nQL-^g$9g7qua zgWPo@dn4dNJQ+?0tJ;*dmv4hWWPxl=d8+3o)qNVdRXFVY#xSgJyHj?1l0&=Pfu1N_ zAZDLb<-4dy!#*by((i^I13M}^)<5*7`6Iu;%sNs+AW{0lLA@pH*f|E+|^4LY@D zN-^W@(u~pzeF@W|n$FdA({G#S3RizknQfh!6ihgw!Ae!E__${(atibE3np1yx&%X| z2jEiD+mXey1XN*t7^D<%HplU)wqN;rDMv}Q{gaWO5?=cyJS(BMa zr)i*!kr;?>#3$}C6_5Wqu&EpaeipGdUl}pdRl{r3g8(&7l5zH&T07E9O#qSXB%nbHWu>1 zQN*bKf$KGVkO^IkB1I8U`EcM}`=ue3GR^S81BD&8;yzg%XBG?!M+Se3HIH{t^2D)1@?a!YfDpA(&^E*$ehr&8H zdH1x)!i5*gx766G#2t@C2=I*sAtqm<*`$`>3HYTQbfZnG<)#|j2rU@$ zshHY27POyt2D@{O554d@&qOPc6mlyvs*u){W#qf~gr7LWup4m_AAH>!cKAv=S|W`9 zSy~-@v<;o8j@Sx}{`13$V_cL`iq+xG(!biE*Ms`@@D*M;v zi@9}YdtdM&%Vs+>4;g-@E-*$EZN=&9%3Z87lTYlU-}r?hp5HPn>M)9p?;cen(>j(J zqmC%+Sm3Iz2t4a!ExDo3FfE&#jivRuM>-G$w{Q_&H$*zhVHeH-`i zrN8clM(|zS1`Ir@wFyoszn2&+B~+)5xsl&>ON#7cq$zPO)cM*l)s7O^QQ6@TMK7lG zbh=Ug;mEIyPM!#D-H#O!pNxgA4F7w6pwOjUwBt4lU zjFCy^bH>Ogru=*1r_`1B_w&)3zT_a0$16712*p7plK+`gi$ zwvw!1Qak+=5hiN-^dW!ah+#^T;f1jaaW|L5l6YB;S{CZsI;m-o8!cfHw{dnoh38cn zcxJ9seKa77QP_wjRzFJZ-7T5t-PDygCbq;M%T7?9*->bFK8YIBA=piKZ8m(Z9qh*P z*KcpdH3>dtvSn~NHA1-a6(gOF#|aaedB^qYnQewvub3(oodb+Om72;0iuy6V{F;k> zDHr=*T7LfApX{b46onq&_cZ~ZRdU3GUNdWFlv(UWw?EglIE!=R3x4;=cmpODGUGS$ zLv1>N5Ed`jRY&zU#t+oe@*Y%bs3W>cDLUn?+oegww>FEOU0nqGJ@;sm4qD8)={xn^ zwLdNopCCZ(=c_e6FAvm8d9bxy8UDWS>f)uB4X7jZ+y zn+?tS%L+!J{c013iZL}bY<((P>{@*>S*0e(F79Y-%ZQ-9-XJZx4rV<(&CFyx-`uz+ zz0P>07kYSxQI-ae#ydp}zNn^XJ=s+;?{oSaqkeAX4~H;v@oMF`Xp0yw&#$$r#T9cq zz~kkWbU1aVgslU=##c5rC4E6m-%?|C^UF~W*M#8I@+(-{v*cw|7On%MAWQ#wIEJ-E zUNf_};={Q8Q=BEy=O%wkP~a7N0OgkZ2fg4E%0#(5E3-&PHv5O7VYoy#@gR<7c>3{? z6@yS)X{06UvbfV@_ZX!N-i)3@Wj#K% zhbH8Ri)!4qRlfc1a}Nd6MN;XBIR4RKlOcgS)2JU!cmEf={18sURqIl@35U^7;3nQf zV+C&g-b9X@i0kHKU?Kv{gRNj77Foq}hh^>W@PKuj;~Q>Z=DFqBV<-%s z0VsMIf@+eNIf$EH7!dtlx*(doWdLPwIk0Q%Z4Baqx6wZnCLn%!n}RUKn}ML>u^@W! z79e)|xPu7t@c_~2;{`&BU=QLj!4||lf&+*(!XXgWL@N*(L`M)Gh*tlJbCj=<92oGj zil>_$pqv{C3<5zy{(XuQ@wz~h?k=Fn7Xdm{`pUqVdVq!gZh+;BkOif@rOsccISNIN zT>f7rq&SfXh?Dkl*JKVQM$GX*AaZ>FwNC&7NNS+-C6WyEHc&=V;|k72d#|Q)%t|@0 z>~E&$0XB(y^^qgX!0fDm1(Gz-X@$_h9)iMl@__d$@CS1~%eN;wgtH~5gzWy!p~H?N zLIP!E?nUZ3Sq2&gFv(m`K|dL&8KCN?!9A3(<^k)Ya0rCLaaH)u;v^Or#47#Yp3_65 eh&9f_RL)T-|0c-x1Xes%fmy#D+g{