commit 70f1e8b5ab10ad0710b2a98ddea7cbda379e48ea
parent 6cd7ef65cb797b7f11fb41e608eb2dca977c2cf0
Author: Adam M <aemalone@gmail.com>
Date: Fri, 25 Dec 2020 12:19:32 -0600
goly penerator panel, make the spread knob operate as expected
Diffstat:
3 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/res/ComputerscareGolyPeneratorPanel.svg b/res/ComputerscareGolyPeneratorPanel.svg
@@ -24,11 +24,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.0000002"
- inkscape:cx="39.643621"
- inkscape:cy="244.8204"
+ inkscape:zoom="8.0000004"
+ inkscape:cx="21.143622"
+ inkscape:cy="86.445405"
inkscape:document-units="mm"
- inkscape:current-layer="g1669"
+ inkscape:current-layer="text1072"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
@@ -381,11 +381,11 @@
id="text1023"
style="font-style:normal;font-weight:normal;font-size:2.98674px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.074669">
<path
- d="m 11.691861,217.14857 q 0,0.22313 -0.185213,0.36605 -0.183755,0.14292 -0.503138,0.14292 -0.180838,0 -0.332508,-0.0423 -0.150212,-0.0438 -0.252298,-0.0948 v -0.30771 h 0.01458 q 0.129795,0.0977 0.288757,0.15604 0.158962,0.0569 0.304799,0.0569 0.180838,0 0.282924,-0.0583 0.102086,-0.0583 0.102086,-0.18375 0,-0.0962 -0.05542,-0.14584 -0.05542,-0.0496 -0.212922,-0.0846 -0.05833,-0.0131 -0.153129,-0.0306 -0.09334,-0.0175 -0.170629,-0.0379 -0.214381,-0.0569 -0.304799,-0.16625 -0.08896,-0.11084 -0.08896,-0.27126 0,-0.10062 0.04083,-0.18958 0.04229,-0.089 0.126879,-0.15897 0.08167,-0.0685 0.207088,-0.10792 0.126878,-0.0408 0.282924,-0.0408 0.145836,0 0.29459,0.0365 0.150212,0.035 0.249381,0.086 v 0.29313 h -0.01458 q -0.105003,-0.0773 -0.255215,-0.12979 -0.150212,-0.054 -0.294591,-0.054 -0.150212,0 -0.253756,0.0583 -0.103544,0.0569 -0.103544,0.17062 0,0.10063 0.06271,0.15167 0.06125,0.0511 0.198338,0.0831 0.07583,0.0175 0.169171,0.035 0.09479,0.0175 0.157504,0.0321 0.191046,0.0437 0.29459,0.15021 0.103545,0.10792 0.103545,0.28584 z"
- style="stroke-width:0.074669"
+ d="m 11.774808,217.08568 q 0,0.2507 -0.19728,0.41128 -0.195726,0.16058 -0.535917,0.16058 -0.19262,0 -0.354172,-0.0475 -0.159998,-0.0492 -0.268735,-0.10651 v -0.34573 h 0.01553 q 0.138251,0.10977 0.30757,0.17532 0.169318,0.0639 0.324657,0.0639 0.192619,0 0.301356,-0.0655 0.108737,-0.0655 0.108737,-0.20646 0,-0.10808 -0.05903,-0.16386 -0.05903,-0.0557 -0.226794,-0.095 -0.06213,-0.0147 -0.163106,-0.0344 -0.09942,-0.0197 -0.181746,-0.0426 -0.228348,-0.0639 -0.324656,-0.18679 -0.09476,-0.12454 -0.09476,-0.30478 0,-0.11305 0.04349,-0.213 0.04504,-0.1 0.135145,-0.17862 0.08699,-0.077 0.22058,-0.12125 0.135144,-0.0458 0.301357,-0.0458 0.155337,0 0.313783,0.041 0.159998,0.0393 0.265628,0.0966 v 0.32935 h -0.01553 q -0.111844,-0.0868 -0.271842,-0.14582 -0.159999,-0.0607 -0.313784,-0.0607 -0.159999,0 -0.270289,0.0655 -0.11029,0.0639 -0.11029,0.1917 0,0.11306 0.0668,0.17041 0.06524,0.0574 0.21126,0.0934 0.08077,0.0197 0.180192,0.0393 0.100966,0.0197 0.167766,0.0361 0.203493,0.0491 0.313783,0.16877 0.110291,0.12125 0.110291,0.32115 z"
+ style="stroke-width:0.0816852"
id="path1059" />
<path
- d="m 13.290233,217.51608 q -0.137087,0.0656 -0.261048,0.10208 -0.122503,0.0365 -0.261048,0.0365 -0.176463,0 -0.323758,-0.051 -0.147295,-0.0525 -0.252298,-0.1575 -0.106461,-0.10501 -0.164796,-0.26543 -0.05833,-0.16042 -0.05833,-0.3748 0,-0.39959 0.218755,-0.6271 0.220214,-0.2275 0.580431,-0.2275 0.140003,0 0.274173,0.0394 0.135629,0.0394 0.247923,0.0963 v 0.3048 h -0.01458 q -0.125419,-0.0977 -0.259589,-0.15022 -0.132712,-0.0525 -0.25959,-0.0525 -0.233339,0 -0.368967,0.15751 -0.13417,0.15604 -0.13417,0.45938 0,0.29459 0.131253,0.45356 0.132711,0.1575 0.371884,0.1575 0.08313,0 0.169171,-0.0219 0.08604,-0.0219 0.154587,-0.0569 0.05979,-0.0306 0.112294,-0.0642 0.0525,-0.035 0.08313,-0.0598 h 0.01458 z"
+ d="m 13.216187,217.5418 q -0.143483,0.0598 -0.2709,0.0911 -0.125965,0.0314 -0.264219,0.0257 -0.176092,-0.007 -0.317881,-0.0642 -0.141636,-0.0585 -0.23572,-0.16757 -0.09554,-0.10918 -0.137404,-0.27166 -0.04186,-0.16249 -0.02002,-0.37642 0.04072,-0.39875 0.282192,-0.61677 0.242932,-0.21794 0.602392,-0.2031 0.139708,0.006 0.269582,0.0506 0.131329,0.0449 0.23759,0.10632 l -0.03106,0.30416 -0.01455,-6.1e-4 q -0.115201,-0.10266 -0.243738,-0.1606 -0.127083,-0.0579 -0.253695,-0.0631 -0.232848,-0.01 -0.38424,0.14197 -0.149788,0.15019 -0.180696,0.45289 -0.03002,0.29397 0.08476,0.45802 0.116384,0.16263 0.355054,0.17249 0.08296,0.003 0.171047,-0.0149 0.08809,-0.0183 0.16006,-0.0504 0.06278,-0.0281 0.118599,-0.0594 0.05596,-0.0328 0.08905,-0.0563 l 0.01455,6e-4 z"
style="stroke-width:0.074669"
id="path1061" />
<path
@@ -393,12 +393,12 @@
style="stroke-width:0.074669"
id="path1063" />
<path
- d="m 15.71696,217.61816 h -0.274174 v -2.26922 h 0.274174 z"
- style="stroke-width:0.074669"
+ d="m 15.71696,217.61816 h -0.523015 v -2.26922 h 0.523015 z"
+ style="stroke-width:0.10313"
id="path1065" />
<path
- d="m 17.625965,216.8321 h -1.200238 q 0,0.15022 0.04521,0.26251 0.04521,0.11084 0.123962,0.1823 0.07583,0.07 0.179379,0.105 0.105003,0.035 0.230423,0.035 0.166254,0 0.333966,-0.0656 0.169171,-0.0671 0.240631,-0.13125 h 0.01458 v 0.29896 q -0.138545,0.0583 -0.282924,0.0977 -0.144378,0.0394 -0.303341,0.0394 -0.405426,0 -0.632932,-0.21875 -0.227505,-0.22022 -0.227505,-0.62419 0,-0.39959 0.217297,-0.63439 0.218755,-0.23479 0.574597,-0.23479 0.329591,0 0.507512,0.1925 0.17938,0.19251 0.17938,0.54689 z m -0.266882,-0.21 q -0.0015,-0.21584 -0.109377,-0.33397 -0.106461,-0.11813 -0.325217,-0.11813 -0.220213,0 -0.351467,0.1298 -0.129795,0.12979 -0.147295,0.3223 z"
- style="stroke-width:0.074669"
+ d="m 17.625965,216.73055 h -1.200238 q 0,0.16874 0.04521,0.29486 0.04521,0.1245 0.123962,0.20477 0.07583,0.0786 0.179379,0.11794 0.105003,0.0393 0.230423,0.0393 0.166254,0 0.333966,-0.0737 0.169171,-0.0754 0.240631,-0.14743 h 0.01458 v 0.3358 q -0.138545,0.0655 -0.282924,0.10974 -0.144378,0.0443 -0.303341,0.0443 -0.405426,0 -0.632932,-0.24571 -0.227505,-0.24736 -0.227505,-0.70111 0,-0.44883 0.217297,-0.71257 0.218755,-0.26372 0.574597,-0.26372 0.329591,0 0.507512,0.21622 0.17938,0.21624 0.17938,0.61429 z m -0.266882,-0.23588 q -0.0015,-0.24243 -0.109377,-0.37512 -0.106461,-0.13269 -0.325217,-0.13269 -0.220213,0 -0.351467,0.1458 -0.129795,0.14578 -0.147295,0.36201 z"
+ style="stroke-width:0.0791362"
id="path1067" />
</g>
<g
@@ -415,15 +415,15 @@
style="stroke-width:0.074669"
id="path1044" />
<path
- d="M 4.6469277,214.61215 H 4.632344 q -0.045209,-0.0131 -0.1181279,-0.0263 -0.072918,-0.0146 -0.1283365,-0.0146 -0.1764627,0 -0.256673,0.0788 -0.078752,0.0773 -0.078752,0.28147 v 0.0554 h 0.4943872 v 0.23043 h -0.485637 v 1.39857 H 3.7850315 v -1.39857 H 3.5998186 v -0.23043 h 0.1852129 v -0.054 q 0,-0.29021 0.1443786,-0.4448 0.1443785,-0.15604 0.4170935,-0.15604 0.091877,0 0.1647958,0.009 0.074377,0.009 0.1356283,0.0204 z"
- style="stroke-width:0.074669"
+ d="M 4.6469277,214.64449 H 4.632344 q -0.045209,-0.0146 -0.1181279,-0.0293 -0.072918,-0.0163 -0.1283365,-0.0163 -0.1764627,0 -0.256673,0.0879 -0.078752,0.0862 -0.078752,0.31397 v 0.0618 h 0.4943872 v 0.25704 h -0.485637 v 1.56008 H 3.7850315 V 215.3196 H 3.5998186 v -0.25704 h 0.1852129 v -0.0602 q 0,-0.32373 0.1443786,-0.49617 0.1443785,-0.17406 0.4170935,-0.17406 0.091877,0 0.1647958,0.01 0.074377,0.01 0.1356283,0.0228 z"
+ style="stroke-width:0.0788626"
id="path1046" />
<path
d="m 5.9842521,216.14636 q 0,0.22313 -0.1852129,0.36605 -0.1837545,0.14292 -0.5031373,0.14292 -0.1808378,0 -0.3325082,-0.0423 -0.150212,-0.0438 -0.2522979,-0.0948 v -0.30772 h 0.014584 q 0.1297949,0.0977 0.2887571,0.15605 0.1589623,0.0569 0.3047992,0.0569 0.1808378,0 0.2829236,-0.0583 0.1020858,-0.0583 0.1020858,-0.18375 0,-0.0963 -0.055418,-0.14584 -0.055418,-0.0496 -0.2129219,-0.0846 -0.058335,-0.0131 -0.1531288,-0.0306 -0.093336,-0.0175 -0.1706291,-0.0379 -0.2143803,-0.0569 -0.3047992,-0.16625 -0.08896,-0.11084 -0.08896,-0.27126 0,-0.10063 0.040834,-0.18959 0.042293,-0.089 0.1268781,-0.15896 0.081669,-0.0685 0.2070885,-0.10792 0.1268781,-0.0408 0.2829236,-0.0408 0.1458369,0 0.2945906,0.0365 0.150212,0.035 0.2493811,0.086 v 0.29313 h -0.014584 q -0.1050026,-0.0773 -0.2552146,-0.12979 -0.150212,-0.054 -0.2945906,-0.054 -0.150212,0 -0.2537562,0.0583 -0.1035442,0.0569 -0.1035442,0.17063 0,0.10063 0.06271,0.15167 0.061252,0.0511 0.1983382,0.0831 0.075835,0.0175 0.1691709,0.035 0.094794,0.0175 0.1575038,0.0321 0.1910464,0.0438 0.2945906,0.15022 0.1035442,0.10792 0.1035442,0.28584 z"
style="stroke-width:0.074669"
id="path1048" />
<path
- d="M 7.7415872,215.82989 H 6.5413494 q 0,0.15021 0.045209,0.26251 0.04521,0.11083 0.1239614,0.18229 0.075835,0.07 0.1793794,0.10501 0.1050026,0.035 0.2304223,0.035 0.1662541,0 0.3339666,-0.0656 0.1691708,-0.0671 0.2406309,-0.13125 h 0.014584 v 0.29896 q -0.1385451,0.0583 -0.2829236,0.0977 -0.1443786,0.0394 -0.3033408,0.0394 -0.4054267,0 -0.6329322,-0.21876 -0.2275056,-0.22021 -0.2275056,-0.62418 0,-0.39959 0.217297,-0.63439 0.2187553,-0.2348 0.5745974,-0.2348 0.3295915,0 0.5075125,0.19251 0.1793794,0.1925 0.1793794,0.54689 z m -0.2668815,-0.21 q -0.00146,-0.21584 -0.1093777,-0.33397 -0.106461,-0.11813 -0.3252164,-0.11813 -0.2202137,0 -0.3514669,0.1298 -0.1297949,0.12979 -0.1472953,0.3223 z"
+ d="m 7.7415872,215.64527 -1.2002378,0.29969 q 0,0.15021 0.045209,0.25122 0.04521,0.0995 0.1239614,0.15134 0.075835,0.0511 0.1793794,0.0602 0.1050026,0.009 0.2304223,-0.0225 0.1662541,-0.0415 0.3339666,-0.14899 0.1691708,-0.10934 0.2406309,-0.19133 l 0.014584,-0.004 v 0.29896 q -0.1385451,0.0929 -0.2829236,0.16835 -0.1443786,0.0754 -0.3033408,0.11514 -0.4054267,0.10123 -0.6329322,-0.0607 -0.2275056,-0.1634 -0.2275056,-0.56737 0,-0.39959 0.217297,-0.68865 0.2187553,-0.28942 0.5745974,-0.37827 0.3295915,-0.0823 0.5075125,0.0658 0.1793794,0.14771 0.1793794,0.5021 z m -0.2668815,-0.14336 q -0.00146,-0.21548 -0.1093777,-0.30666 -0.106461,-0.0915 -0.3252164,-0.0369 -0.2202137,0.055 -0.3514669,0.21756 -0.1297949,0.1622 -0.1472953,0.35908 z"
style="stroke-width:0.074669"
id="path1050" />
<path
@@ -441,20 +441,20 @@
style="stroke-width:0.0647548"
id="path1074" />
<path
- d="m 3.6076509,149.94128 q 0,0.172 -0.049325,0.31492 -0.049324,0.14165 -0.1391204,0.24029 -0.083472,0.0936 -0.1972981,0.14545 -0.1125611,0.0506 -0.2390343,0.0506 -0.1100316,0 -0.1998275,-0.024 -0.088531,-0.024 -0.1808566,-0.0746 v 0.59189 H 2.3644199 V 149.252 h 0.2377695 v 0.14797 q 0.094855,-0.0797 0.2124749,-0.13279 0.1188847,-0.0544 0.2529463,-0.0544 0.2554757,0 0.3971256,0.19351 0.1429147,0.19223 0.1429147,0.53498 z m -0.2453579,0.006 q 0,-0.25548 -0.087267,-0.38195 -0.087267,-0.12647 -0.2681231,-0.12647 -0.1024432,0 -0.2061512,0.0443 -0.1037079,0.0443 -0.1985628,0.11636 v 0.80057 q 0.1011785,0.0455 0.1732682,0.062 0.073354,0.0164 0.1656798,0.0164 0.1985628,0 0.3098592,-0.13406 0.1112964,-0.13407 0.1112964,-0.39713 z"
- style="stroke-width:0.0647548"
+ d="m 3.5655068,149.75744 q 0.02693,0.19317 1.204e-4,0.35566 -0.027007,0.16106 -0.1011077,0.27546 -0.068583,0.10846 -0.1739711,0.17131 -0.1043226,0.0614 -0.2304408,0.0665 -0.1097226,0.005 -0.2030241,-0.0189 -0.09204,-0.0234 -0.1920289,-0.0765 l 0.092672,0.66471 -0.2371015,0.0101 -0.3027793,-2.17177 0.237102,-0.0101 0.023168,0.16617 q 0.08211,-0.0934 0.1910875,-0.1577 0.1100335,-0.0659 0.2437187,-0.0713 0.2547585,-0.0101 0.4263085,0.2013 0.1726108,0.21011 0.2262751,0.59504 z m -0.2437296,0.0167 q -0.040001,-0.28691 -0.1468238,-0.42542 -0.1068234,-0.13851 -0.2871718,-0.13122 -0.1021555,0.005 -0.1986363,0.0581 -0.096481,0.054 -0.1797869,0.13869 l 0.125345,0.89906 q 0.1080184,0.047 0.1824891,0.0626 0.075716,0.0154 0.1677824,0.0117 0.1980053,-0.008 0.2879995,-0.16305 0.089993,-0.15505 0.048805,-0.45048 z"
+ style="stroke-width:0.0687195"
id="path1076" />
<path
- d="M 4.859735,149.51127 H 4.847088 q -0.053119,-0.0127 -0.103708,-0.0177 -0.049324,-0.006 -0.11762,-0.006 -0.1100317,0 -0.2124749,0.0493 -0.1024432,0.0481 -0.1972981,0.12521 v 1.00293 H 3.9782172 v -1.4127 h 0.2377695 v 0.20868 q 0.1416499,-0.11383 0.2491521,-0.16062 0.1087669,-0.0481 0.221328,-0.0481 0.061972,0 0.089796,0.004 0.027824,0.003 0.083472,0.0114 z"
- style="stroke-width:0.0647548"
+ d="m 4.8709809,149.30936 h -0.012808 q -0.053797,-0.0148 -0.1050311,-0.0207 -0.049953,-0.007 -0.1191205,-0.007 -0.1114354,0 -0.2151855,0.0576 -0.1037502,0.0562 -0.1998152,0.1464 v 1.17273 H 3.9782172 v -1.65187 H 4.21902 v 0.24401 q 0.143457,-0.1331 0.2523307,-0.18781 0.1101545,-0.0563 0.2241516,-0.0563 0.062763,0 0.090941,0.005 0.028179,0.004 0.084537,0.0133 z"
+ style="stroke-width:0.0704672"
id="path1078" />
<path
d="M 6.268646,149.98301 H 5.227772 q 0,0.13027 0.039207,0.22765 0.039207,0.0961 0.1075022,0.1581 0.065766,0.0607 0.1555619,0.0911 0.091061,0.0303 0.1998276,0.0303 0.1441794,0 0.2896235,-0.0569 0.1467088,-0.0582 0.2086807,-0.11383 h 0.012647 v 0.25927 q -0.1201495,0.0506 -0.2453579,0.0847 -0.1252084,0.0341 -0.2630641,0.0341 -0.3515954,0 -0.5488935,-0.18971 -0.1972981,-0.19098 -0.1972981,-0.54131 0,-0.34653 0.188445,-0.55016 0.1897097,-0.20362 0.4983042,-0.20362 0.2858293,0 0.4401265,0.16695 0.155562,0.16694 0.155562,0.47427 z m -0.2314459,-0.18212 q -0.00126,-0.18718 -0.094855,-0.28962 -0.092325,-0.10244 -0.2820351,-0.10244 -0.1909745,0 -0.3048003,0.11256 -0.1125611,0.11256 -0.1277379,0.2795 z"
style="stroke-width:0.0647548"
id="path1080" />
<path
- d="M 7.7268811,150.6647 H 7.4903763 v -0.1505 q -0.031618,0.0215 -0.086002,0.0607 -0.053119,0.0379 -0.1037079,0.0607 -0.059442,0.0291 -0.136591,0.0481 -0.077149,0.0202 -0.1808566,0.0202 -0.1909744,0 -0.3237712,-0.12647 -0.1327968,-0.12648 -0.1327968,-0.32251 0,-0.16062 0.068295,-0.25927 0.06956,-0.0999 0.1972981,-0.15683 0.1290026,-0.0569 0.3098591,-0.0771 0.1808566,-0.0202 0.3882726,-0.0304 v -0.0367 q 0,-0.0809 -0.029089,-0.13406 -0.027824,-0.0531 -0.080943,-0.0835 -0.050589,-0.0291 -0.1214143,-0.0392 -0.070825,-0.0101 -0.1479735,-0.0101 -0.09359,0 -0.2086807,0.0253 -0.1150906,0.024 -0.2377695,0.0708 h -0.012647 v -0.24157 q 0.06956,-0.019 0.2010923,-0.0417 0.131532,-0.0228 0.2592699,-0.0228 0.1492383,0 0.2592699,0.0253 0.1112964,0.024 0.1922392,0.0835 0.079678,0.0582 0.1214142,0.1505 0.041736,0.0923 0.041736,0.22892 z m -0.2365048,-0.3478 v -0.39333 q -0.1087669,0.006 -0.2567405,0.019 -0.1467088,0.0126 -0.2327106,0.0367 -0.1024432,0.0291 -0.1656798,0.0911 -0.063237,0.0607 -0.063237,0.16821 0,0.12141 0.073354,0.18338 0.073354,0.0607 0.2238574,0.0607 0.1252084,0 0.2289164,-0.0481 0.103708,-0.0493 0.1922392,-0.11762 z"
- style="stroke-width:0.0647548"
+ d="m 7.7747045,150.65806 h -0.239522 v -0.17598 q -0.032021,0.0251 -0.087099,0.071 -0.053797,0.0443 -0.105031,0.071 -0.0602,0.034 -0.1383335,0.0562 -0.078133,0.0236 -0.1831639,0.0236 -0.1934107,0 -0.3279017,-0.14788 -0.1344909,-0.14789 -0.1344909,-0.37711 0,-0.18781 0.069166,-0.30316 0.070447,-0.11682 0.1998151,-0.18338 0.1306483,-0.0665 0.3138121,-0.0902 0.1831639,-0.0236 0.3932259,-0.0355 v -0.0429 q 0,-0.0946 -0.02946,-0.15675 -0.028179,-0.0621 -0.081976,-0.0976 -0.051234,-0.034 -0.1229632,-0.0458 -0.071729,-0.0118 -0.1498613,-0.0118 -0.094784,0 -0.2113429,0.0296 -0.1165589,0.0281 -0.2408028,0.0828 h -0.012808 v -0.28246 q 0.070447,-0.0222 0.2036577,-0.0488 0.1332101,-0.0267 0.2625776,-0.0267 0.1511422,0 0.2625775,0.0296 0.1127162,0.0281 0.1946917,0.0976 0.080694,0.068 0.1229631,0.17598 0.042268,0.10792 0.042268,0.26767 z m -0.239522,-0.40668 v -0.45992 q -0.1101545,0.007 -0.2600159,0.0222 -0.1485804,0.0147 -0.2356794,0.0429 -0.1037501,0.034 -0.1677934,0.10653 -0.064044,0.071 -0.064044,0.19668 0,0.14197 0.07429,0.21443 0.07429,0.071 0.2267133,0.071 0.1268057,0 0.2318368,-0.0562 0.105031,-0.0576 0.1946916,-0.13753 z"
+ style="stroke-width:0.0704672"
id="path1082" />
<path
d="M 9.3330897,150.6647 H 9.0953202 v -0.14797 q -0.1024432,0.0885 -0.2137396,0.13786 -0.1112964,0.0493 -0.2415637,0.0493 -0.2529463,0 -0.4021846,-0.19477 -0.1479736,-0.19477 -0.1479736,-0.54004 0,-0.17959 0.050589,-0.31998 0.051854,-0.14038 0.1391205,-0.23903 0.086002,-0.0961 0.1998275,-0.14671 0.1150906,-0.0506 0.2377695,-0.0506 0.1112964,0 0.1972981,0.024 0.086002,0.0228 0.1808566,0.0721 v -0.61213 h 0.2377695 z m -0.2377695,-0.3478 v -0.81069 q -0.09612,-0.043 -0.1720035,-0.0594 -0.075884,-0.0164 -0.1656798,-0.0164 -0.1998275,0 -0.3111239,0.13912 -0.1112964,0.13912 -0.1112964,0.39459 0,0.25168 0.086002,0.38322 0.086002,0.13026 0.2757114,0.13026 0.1011785,0 0.2048865,-0.0443 0.103708,-0.0455 0.1935039,-0.11636 z"
@@ -471,19 +471,19 @@
style="stroke-width:0.070568"
id="path1091" />
<path
- d="m 13.097488,163.14841 h -1.134317 q 0,0.14196 0.04273,0.24809 0.04273,0.10475 0.117153,0.17228 0.07167,0.0662 0.169527,0.0992 0.09924,0.0331 0.217767,0.0331 0.157123,0 0.315625,-0.062 0.159879,-0.0634 0.227414,-0.12404 h 0.01378 v 0.28254 q -0.130936,0.0551 -0.267385,0.0923 -0.136448,0.0372 -0.28668,0.0372 -0.38316,0 -0.59817,-0.20674 -0.21501,-0.20812 -0.21501,-0.5899 0,-0.37765 0.205362,-0.59955 0.206741,-0.2219 0.543039,-0.2219 0.31149,0 0.479639,0.18193 0.169527,0.18193 0.169527,0.51685 z m -0.252224,-0.19847 q -0.0014,-0.20399 -0.10337,-0.31563 -0.100614,-0.11164 -0.307355,-0.11164 -0.208119,0 -0.332163,0.12267 -0.122666,0.12267 -0.139205,0.3046 z"
- style="stroke-width:0.070568"
+ d="m 13.097488,163.22599 h -1.134317 q 0,0.15508 0.04273,0.27102 0.04273,0.11444 0.117153,0.18821 0.07167,0.0723 0.169527,0.10837 0.09924,0.0361 0.217767,0.0361 0.157123,0 0.315625,-0.0677 0.159879,-0.0693 0.227414,-0.1355 h 0.01378 v 0.30865 q -0.130936,0.0602 -0.267385,0.10083 -0.136448,0.0406 -0.28668,0.0406 -0.38316,0 -0.59817,-0.22585 -0.21501,-0.22735 -0.21501,-0.64442 0,-0.41255 0.205362,-0.65496 0.206741,-0.24241 0.543039,-0.24241 0.31149,0 0.479639,0.19875 0.169527,0.19874 0.169527,0.56462 z m -0.252224,-0.21681 q -0.0014,-0.22284 -0.10337,-0.3448 -0.100614,-0.12196 -0.307355,-0.12196 -0.208119,0 -0.332163,0.13401 -0.122666,0.13401 -0.139205,0.33275 z"
+ style="stroke-width:0.073757"
id="path1093" />
<path
- d="m 14.777601,163.8913 h -0.259115 v -0.87658 q 0,-0.10613 -0.0124,-0.19848 -0.0124,-0.0937 -0.04548,-0.14609 -0.03446,-0.0579 -0.09924,-0.0855 -0.06478,-0.029 -0.168149,-0.029 -0.106127,0 -0.221902,0.0524 -0.115775,0.0524 -0.221901,0.13369 v 1.14948 h -0.259115 v -1.53953 h 0.259115 v 0.1709 q 0.121287,-0.10061 0.250845,-0.15712 0.129558,-0.0565 0.266006,-0.0565 0.249468,0 0.380403,0.15023 0.130936,0.15023 0.130936,0.43278 z"
- style="stroke-width:0.070568"
+ d="m 14.777601,164.03755 h -0.259115 v -0.9576 q 0,-0.11594 -0.0124,-0.21683 -0.0124,-0.10236 -0.04548,-0.15959 -0.03446,-0.0633 -0.09924,-0.0934 -0.06478,-0.0317 -0.168149,-0.0317 -0.106127,0 -0.221902,0.0572 -0.115775,0.0572 -0.221901,0.14605 v 1.25572 h -0.259115 v -1.68182 h 0.259115 v 0.18669 q 0.121287,-0.10991 0.250845,-0.17164 0.129558,-0.0617 0.266006,-0.0617 0.249468,0 0.380403,0.16411 0.130936,0.16412 0.130936,0.47278 z"
+ style="stroke-width:0.073757"
id="path1095" />
<path
- d="m 16.075933,163.87751 q -0.07305,0.0193 -0.15988,0.0317 -0.08545,0.0124 -0.152988,0.0124 -0.235684,0 -0.358351,-0.1268 -0.122666,-0.1268 -0.122666,-0.40659 v -0.8187 h -0.17504 v -0.21776 h 0.17504 v -0.44243 h 0.259115 v 0.44243 h 0.53477 v 0.21776 h -0.53477 v 0.70154 q 0,0.12129 0.0055,0.19021 0.0055,0.0675 0.03859,0.1268 0.03032,0.0551 0.0827,0.0813 0.05375,0.0248 0.162636,0.0248 0.0634,0 0.132314,-0.0179 0.06891,-0.0193 0.09924,-0.0317 h 0.01378 z"
+ d="m 16.289572,163.89249 q -0.06823,0.0243 -0.151648,0.0428 -0.08205,0.0184 -0.149059,0.0232 -0.233835,0.0167 -0.383449,-0.10036 -0.149613,-0.11709 -0.211198,-0.39468 l -0.180203,-0.81228 -0.173667,0.0124 -0.04793,-0.21605 0.173667,-0.0124 -0.09738,-0.43896 0.257082,-0.0184 0.09738,0.43896 0.530574,-0.038 0.04793,0.21606 -0.530574,0.038 0.154415,0.69604 q 0.0267,0.12033 0.04732,0.18832 0.02031,0.0666 0.0662,0.12307 0.04221,0.0525 0.09995,0.0748 0.05879,0.0208 0.166819,0.0131 0.0629,-0.005 0.127336,-0.0272 0.06412,-0.024 0.09148,-0.0385 l 0.01367,-9.8e-4 z"
style="stroke-width:0.070568"
id="path1097" />
<path
- d="m 17.678863,163.14841 h -1.134318 q 0,0.14196 0.04273,0.24809 0.04273,0.10475 0.117153,0.17228 0.07167,0.0662 0.169527,0.0992 0.09924,0.0331 0.217767,0.0331 0.157123,0 0.315624,-0.062 0.15988,-0.0634 0.227415,-0.12404 h 0.01378 v 0.28254 q -0.130936,0.0551 -0.267385,0.0923 -0.136449,0.0372 -0.28668,0.0372 -0.38316,0 -0.59817,-0.20674 -0.215011,-0.20812 -0.215011,-0.5899 0,-0.37765 0.205363,-0.59955 0.206741,-0.2219 0.543039,-0.2219 0.311489,0 0.479638,0.18193 0.169528,0.18193 0.169528,0.51685 z m -0.252224,-0.19847 q -0.0014,-0.20399 -0.10337,-0.31563 -0.100614,-0.11164 -0.307355,-0.11164 -0.208119,0 -0.332163,0.12267 -0.122667,0.12267 -0.139206,0.3046 z"
+ d="m 17.719444,163.05529 -1.125418,0.0805 q 0.03125,0.14084 0.097,0.24311 0.06545,0.10089 0.154155,0.16261 0.08568,0.0606 0.190031,0.0864 0.105747,0.0258 0.223345,0.0174 0.15589,-0.0112 0.299501,-0.0839 0.14467,-0.0742 0.198328,-0.13921 l 0.01367,-9.8e-4 0.06219,0.28032 q -0.11778,0.064 -0.244971,0.11056 -0.12719,0.0466 -0.276242,0.0573 -0.380154,0.0272 -0.638983,-0.16264 -0.259133,-0.19122 -0.343166,-0.57001 -0.08312,-0.37468 0.07178,-0.60943 0.156277,-0.23484 0.489936,-0.25872 0.309046,-0.0221 0.51592,0.14645 0.208242,0.16846 0.281961,0.50076 z m -0.29393,-0.179 q -0.04629,-0.20229 -0.172032,-0.30581 -0.124398,-0.10362 -0.329517,-0.0889 -0.206486,0.0148 -0.302556,0.14529 -0.0947,0.13042 -0.07107,0.3121 z"
style="stroke-width:0.070568"
id="path1099" />
<path
diff --git a/src/ComputerscareGolyPenerator.cpp b/src/ComputerscareGolyPenerator.cpp
@@ -44,7 +44,7 @@ struct ComputerscareGolyPenerator : ComputerscarePolyModule {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
- configParam(ALGORITHM , 1.f, 4.f, 1.f, "Algorithm");
+ configParam(ALGORITHM , 1.f, 5.f, 1.f, "Algorithm");
configParam(IN_OFFSET, -1.f, 1.f, 0.f, "Channel Center");
configParam(IN_SCALE, -2.f, 2.f, 1.f, "Channel Spread");
diff --git a/src/golyFunctions.cpp b/src/golyFunctions.cpp
@@ -38,7 +38,7 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
float d = ip - gp[0] - 0.5;
- currentValues[i] = gp[2] / (1 + exp(-d * exp(4 * gp[1]))) + gp[3];
+ currentValues[i] = gp[2] / (1 + exp(-d * exp(-4 * gp[1]+6))) + gp[3];
}
break;
case 3:
@@ -46,7 +46,7 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
float d = ip - gp[0] - 0.5;
- currentValues[i] = gp[2] * exp(-d*d*exp(5*gp[1])) + gp[3];
+ currentValues[i] = gp[2] * exp(-d*d*exp(-5*gp[1]+7)) + gp[3];
}
break;
case 4:
@@ -54,9 +54,16 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
float d = trigFactor*(ip - gp[0]);
- currentValues[i] = gp[2] * (1+sinf(d*exp(2*gp[1]+2)))/2 + gp[3];
+ currentValues[i] = gp[2] * (1+sinf(d*exp(-2*gp[1]+2)))/2 + gp[3];
}
break;
+ case 5:
+ //pseudo random
+ for(int i = 0; i < num; i++) {
+ float ip = (float) i / num;
+ float d = trigFactor*(ip-gp[0]);
+ currentValues[i] = gp[2]*(4 + sinf(d*29-3+16*gp[1]) + sinf(-d*24-2+39*gp[1]) + sinf(d*17-1-27*gp[1])+sinf(d*109+12.2-17*gp[1]))/8 + gp[3];
+ }
default:
int k = 0;
