commit fd4cd20d598e7e4e828651054265d8ec03f19d44
parent fb8a4bec578cc68f590ad500c2c33b8fe9860036
Author: Adam M <aemalone@gmail.com>
Date: Sat, 14 Mar 2020 21:26:59 -0500
Horse a doodle doo makes good patt pat
Diffstat:
2 files changed, 204 insertions(+), 159 deletions(-)
diff --git a/res/ComputerscareHorseADoodleDooPanel.svg b/res/ComputerscareHorseADoodleDooPanel.svg
@@ -26,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="8.0000004"
- inkscape:cx="34.585767"
- inkscape:cy="369.60644"
+ inkscape:zoom="2.0000001"
+ inkscape:cx="25.174513"
+ inkscape:cy="87.058115"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -139,6 +139,12 @@
id="g1669"
inkscape:groupmode="layer"
inkscape:label="Layer 1 copy">
+ <path
+ style="fill:#fcfcfc;fill-opacity:1;stroke:#666666;stroke-width:0.92207193;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+ d="m 1.4662713,254.0889 -0.2318916,-36.24253 1.3491347,0.65764 12.6271306,0.20928 0.218116,34.43767 z"
+ id="rect1127"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
<rect
style="fill:#fcfcfc;fill-opacity:1;stroke:#666666;stroke-width:0.26300001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="rect4821"
@@ -151,23 +157,23 @@
id="rect1125"
width="12.070284"
height="46.313881"
- x="3.9198055"
+ x="2.3323057"
y="238.41199" />
<rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:#666666;stroke-width:0.263;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+ style="fill:#fcfcfc;fill-opacity:1;stroke:#666666;stroke-width:0.22220333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="rect1123"
- width="21.034372"
- height="28.839581"
- x="-6.4161453"
- y="213.19322" />
+ width="14.857461"
+ height="29.14496"
+ x="0.83949763"
+ y="257.75513" />
<g
aria-label="computerscare"
- transform="matrix(0.60064444,-0.07085766,0.25618802,1.4708996,-77.768926,-137.20328)"
+ transform="matrix(0.60064444,-0.07085766,0.25618802,1.4708996,-78.364238,-142.16422)"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
id="text1651">
<path
- d="m 7.0715568,293.85718 0.2613077,0.24102 Q 6.9992046,294.04 6.6955837,294.0127 6.3938909,293.984 6.1188826,293.9863 q -0.6156858,0.004 -0.783258,0.1669 -0.1689374,0.1609 0.1425243,0.44818 0.3114306,0.28724 0.8252359,0.44445 0.5122852,0.1558 1.1281313,0.15119 0.2751147,-0.003 0.5118125,-0.0335 0.2384006,-0.0328 0.4413636,-0.0952 l 0.2582676,0.23821 q -0.2101865,0.0525 -0.4685187,0.0797 -0.2547675,0.0273 -0.5747614,0.0297 -0.870277,0.007 -1.6246327,-0.21246 -0.7541869,-0.21896 -1.1643838,-0.59731 -0.416285,-0.38396 -0.1387384,-0.60783 0.2809984,-0.22388 1.182405,-0.23063 0.2928036,-0.002 0.5985991,0.0212 0.3045029,0.0217 0.6192412,0.069 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.42328158"
+ d="m 7.6735411,295.17124 0.1069513,0.46705 q -0.2597552,-0.0977 -0.5087927,-0.13532 -0.2466773,-0.0405 -0.4855917,-0.0206 -0.5342976,0.0423 -0.7596009,0.37717 -0.2254922,0.33092 -0.098013,0.88761 0.1274724,0.55659 0.4941078,0.84208 0.3660168,0.28276 0.9007598,0.2392 0.2393458,-0.0213 0.4590497,-0.0954 0.2223135,-0.0788 0.4286028,-0.21486 l 0.10571,0.4616 q -0.207646,0.11663 -0.44443,0.18539 -0.2337461,0.0687 -0.5116054,0.0914 -0.7559008,0.0625 -1.2997943,-0.33395 -0.5439888,-0.39548 -0.7118791,-1.12863 -0.1703859,-0.74401 0.1800961,-1.20683 0.3534704,-0.46303 1.1361666,-0.52677 0.2541475,-0.0203 0.5070851,0.009 0.2525697,0.0263 0.5013415,0.10333 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.55191374"
id="path1701"
inkscape:connector-curvature="0" />
<path
@@ -176,8 +182,8 @@
id="path1703"
inkscape:connector-curvature="0" />
<path
- d="m 12.573593,293.47296 q 0.146429,-0.29017 0.323577,-0.4297 0.177142,-0.13952 0.398301,-0.14255 0.297703,-0.004 0.430487,0.28016 0.133018,0.28182 0.08005,0.80785 l -0.158451,1.57347 -0.31472,0.004 0.157034,-1.55952 q 0.03773,-0.37473 -0.04095,-0.55501 -0.0787,-0.18025 -0.277725,-0.17759 -0.243267,0.003 -0.406724,0.22624 -0.163461,0.22302 -0.201896,0.60475 l -0.148392,1.47339 -0.314718,0.004 0.157034,-1.55952 q 0.03797,-0.37707 -0.04095,-0.55501 -0.0787,-0.18024 -0.281128,-0.17754 -0.239862,0.003 -0.403556,0.22853 -0.163461,0.22302 -0.201663,0.60242 l -0.148389,1.47337 -0.314713,0.004 0.262474,-2.60694 0.314717,-0.004 -0.04078,0.40498 q 0.131314,-0.24114 0.292496,-0.35722 0.161174,-0.11593 0.36702,-0.11873 0.207543,-0.003 0.337617,0.13953 0.131784,0.14223 0.173866,0.41607 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.38180155"
+ d="m 12.62032,294.09674 q 0.269845,-0.58799 0.491885,-0.87667 0.222032,-0.28866 0.414744,-0.30705 0.259371,-0.0246 0.233905,0.53581 -0.02408,0.55572 -0.329578,1.60978 l -0.913728,3.15294 -0.274088,0.0256 0.905618,-3.12498 q 0.217604,-0.75089 0.23857,-1.10673 0.02098,-0.3558 -0.152457,-0.33938 -0.211807,0.0195 -0.46334,0.47475 -0.251421,0.45476 -0.47309,1.21966 l -0.855629,2.9524 -0.274085,0.0256 0.905618,-3.12499 q 0.218967,-0.75557 0.23857,-1.10674 0.02098,-0.35576 -0.155424,-0.33909 -0.208868,0.0194 -0.461729,0.47915 -0.251423,0.45475 -0.471742,1.21501 l -0.855615,2.95235 -0.274081,0.0256 1.513833,-5.22381 0.274084,-0.0256 -0.235173,0.8115 q 0.232571,-0.48916 0.429232,-0.7301 0.196581,-0.24063 0.37594,-0.25771 0.180928,-0.0176 0.223028,0.25999 0.04373,0.27685 -0.05507,0.8217 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49782816"
id="path1705"
inkscape:connector-curvature="0" />
<path
@@ -236,7 +242,7 @@
</g>
<g
id="g9547"
- transform="matrix(0.23127322,-0.10884571,0.02054862,0.32688517,-1.1606061,287.19328)">
+ transform="matrix(0.44104141,-0.10884571,0.03918652,0.32688517,1.1120098,290.63287)">
<g
style="display:inline"
inkscape:label="Layer 1"
@@ -289,93 +295,99 @@
inkscape:connector-curvature="0" />
</g>
<path
- style="fill:#272727;fill-opacity:1;stroke:#666666;stroke-width:0.26300001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
- d="M 0.56126595,197.843 H 15.154181 v 16.83798 H 0.56126595 Z"
- id="rect1087" />
+ style="fill:#272727;fill-opacity:1;stroke:#666666;stroke-width:0.31103274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+ d="M 0.11756066,196.46386 H 15.784975 v 21.93488 H 0.11756066 Z"
+ id="rect1087"
+ inkscape:connector-curvature="0" />
<g
aria-label="goly
penerator"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;stroke-width:0.26458332"
id="text1092"
- transform="matrix(0.41379048,0,0,0.48986175,-12.489446,90.192177)">
- <path
- d="m 39.452651,225.91079 q 0,-1.78757 -0.734371,-2.77072 -0.725524,-0.98315 -2.043854,-0.98315 -1.309482,0 -2.043853,0.98315 -0.725524,0.98315 -0.725524,2.77072 0,1.77862 0.725524,2.76177 0.734371,0.98316 2.043853,0.98316 1.31833,0 2.043854,-0.98316 0.734371,-0.98315 0.734371,-2.76177 z m 1.628006,3.879 q 0,2.55622 -1.123677,3.79858 -1.123679,1.25129 -3.441814,1.25129 -0.858243,0 -1.619158,-0.13404 -0.760914,-0.12506 -1.477589,-0.39326 v -1.59987 q 0.716675,0.39328 1.415655,0.58097 0.698979,0.18769 1.424503,0.18769 1.601462,0 2.397768,-0.8491 0.796306,-0.84015 0.796306,-2.54727 v -0.81333 q -0.504326,0.88483 -1.291786,1.32279 -0.787458,0.43794 -1.884592,0.43794 -1.822657,0 -2.937486,-1.40323 -1.114829,-1.40324 -1.114829,-3.71812 0,-2.32382 1.114829,-3.72706 1.114829,-1.40323 2.937486,-1.40323 1.097134,0 1.884592,0.43794 0.78746,0.43795 1.291786,1.32279 v -1.51942 h 1.628006 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.45530674"
- id="path1096"
- inkscape:connector-curvature="0" />
- <path
- d="m 47.71447,222.71492 q -1.309481,0 -2.070396,1.03677 -0.760914,1.02785 -0.760914,2.82436 0,1.7965 0.752066,2.83327 0.760916,1.02785 2.079244,1.02785 1.300635,0 2.06155,-1.03679 0.760916,-1.03677 0.760916,-2.82433 0,-1.77863 -0.760916,-2.81542 -0.760915,-1.04571 -2.06155,-1.04571 z m 0,-1.3943 q 2.123485,0 3.335641,1.3943 1.212156,1.39429 1.212156,3.86113 0,2.45789 -1.212156,3.86112 -1.212156,1.39429 -3.335641,1.39429 -2.132331,0 -3.344487,-1.39429 -1.203306,-1.40323 -1.203306,-3.86112 0,-2.46684 1.203306,-3.86113 1.212156,-1.3943 3.344487,-1.3943 z"
- style="stroke-width:0.45530674;fill:#fcfcfc;fill-opacity:1"
- id="path1098"
- inkscape:connector-curvature="0" />
- <path
- d="m 53.193626,217.73257 h 1.628004 v 13.90721 h -1.628004 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.45530674"
- id="path1100"
- inkscape:connector-curvature="0" />
- <path
- d="m 62.342303,232.56932 q -0.690133,1.78756 -1.344873,2.33275 -0.654741,0.54522 -1.751875,0.54522 h -1.300634 v -1.37643 h 0.955569 q 0.672436,0 1.044045,-0.32175 0.37161,-0.32177 0.822851,-1.51943 l 0.291979,-0.75079 -4.008076,-9.84944 h 1.725331 l 3.096747,7.82952 3.096747,-7.82952 h 1.725332 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.45530674"
- id="path1102"
- inkscape:connector-curvature="0" />
- <path
- d="m 34.049678,246.82094 -0.801115,6.29014 h -0.756401 l 2.085054,-16.37128 h 0.756402 l -0.229275,1.8002 c 0.248007,-0.70597 0.513522,-1.22838 0.796547,-1.56723 0.286651,-0.34593 0.597611,-0.5189 0.932881,-0.5189 0.556058,0 0.934345,0.57184 1.134859,1.71551 0.203242,1.14365 0.18618,2.64736 -0.05118,4.51111 -0.237364,1.86373 -0.603324,3.36743 -1.09788,4.51109 -0.49183,1.14366 -1.015775,1.71549 -1.571831,1.71549 -0.335271,0 -0.602623,-0.16943 -0.802059,-0.50829 -0.195812,-0.34592 -0.327808,-0.87186 -0.395989,-1.57784 z m 3.086827,-4.14045 c 0.182523,-1.43312 0.210998,-2.5556 0.08542,-3.36744 -0.121935,-0.81892 -0.381892,-1.22839 -0.779854,-1.22839 -0.397964,0 -0.763576,0.40947 -1.096838,1.22839 -0.329636,0.81184 -0.585716,1.93432 -0.768239,3.36744 -0.18252,1.4331 -0.212809,2.55911 -0.09086,3.37801 0.125572,0.81187 0.387329,1.2178 0.785291,1.2178 0.397963,0 0.761763,-0.40593 1.091401,-1.2178 0.333262,-0.8189 0.591153,-1.94491 0.773672,-3.37801 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.3368969"
- id="path1104"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccscscscccccscscsccc" />
- <path
- d="m 42.102058,243.51561 -0.161148,1.05537 -2.716984,-0.12041 c -0.201115,1.4865 -0.252165,2.62547 -0.153145,3.4169 0.102346,0.78373 0.349425,1.18428 0.741236,1.20164 0.226951,0.0101 0.461927,-0.0819 0.704929,-0.27573 0.245141,-0.19377 0.503659,-0.48926 0.775555,-0.88649 l -0.311562,2.04042 c -0.262098,0.31894 -0.517613,0.55948 -0.766545,0.7216 -0.24893,0.16212 -0.48794,0.2381 -0.717031,0.22795 -0.5738,-0.0254 -0.935663,-0.65536 -1.085588,-1.8898 -0.147782,-1.23436 -0.06291,-2.89129 0.25462,-4.97078 0.328274,-2.14986 0.746943,-3.84708 1.256007,-5.09167 0.512399,-1.25233 1.038371,-1.86655 1.577914,-1.84264 0.483876,0.0214 0.778909,0.60908 0.885102,1.76289 0.109528,1.14608 0.01508,2.69633 -0.283341,4.65075 z m -0.494234,-0.65943 c 0.175958,-1.18065 0.228809,-2.12672 0.158549,-2.83818 -0.06813,-0.71137 -0.247787,-1.0735 -0.53897,-1.0864 -0.32972,-0.0146 -0.646066,0.31374 -0.949038,0.98505 -0.300829,0.6714 -0.560535,1.62403 -0.779119,2.8579 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.31526539"
- id="path1106"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccsccccscscscccccsccc" />
- <path
- d="m 46.109588,242.25015 -0.717114,8.31906 h -0.59174 l 0.710747,-8.24521 c 0.112449,-1.30449 0.130142,-2.28079 0.05308,-2.92891 -0.07706,-0.64815 -0.248512,-0.97222 -0.514367,-0.97222 -0.319454,0 -0.604965,0.38971 -0.856534,1.16912 -0.251569,0.77941 -0.435345,1.84185 -0.551327,3.18732 l -0.671499,7.7899 H 42.375883 L 43.564,236.78616 h 0.594956 l -0.184583,2.1413 c 0.212932,-0.82863 0.432486,-1.44805 0.658663,-1.85828 0.22832,-0.41021 0.467903,-0.61531 0.718749,-0.61531 0.41379,0 0.684379,0.49226 0.811767,1.47677 0.128097,0.9763 0.110107,2.41614 -0.05397,4.31951 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.32209978"
- id="path1108"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscscsccccccsccc" />
- <path
- d="m 50.302937,243.1116 -0.09547,1.10755 h -2.72072 c -0.108641,1.55881 -0.08898,2.74841 0.05899,3.56882 0.150814,0.81223 0.422396,1.21835 0.814746,1.21835 0.227263,0 0.456217,-0.10666 0.68686,-0.31999 0.232786,-0.21331 0.472622,-0.53327 0.719507,-0.95989 l -0.184583,2.1413 c -0.241956,0.34457 -0.482201,0.60711 -0.720736,0.78761 -0.238533,0.18049 -0.472503,0.27073 -0.70191,0.27073 -0.574589,0 -0.975024,-0.63992 -1.201306,-1.91976 -0.224137,-1.27986 -0.242147,-3.01095 -0.05403,-5.19327 0.194483,-2.25615 0.507311,-4.04467 0.938484,-5.36554 0.434023,-1.32909 0.921177,-1.99364 1.461462,-1.99364 0.484541,0 0.815616,0.59891 0.993224,1.79673 0.180461,1.18961 0.182294,2.80995 0.0055,4.861 z m -0.534454,-0.66455 c 0.102489,-1.23884 0.09659,-2.22745 -0.0177,-2.96583 -0.112158,-0.73837 -0.314028,-1.10756 -0.605611,-1.10756 -0.330175,0 -0.625721,0.35688 -0.88664,1.07065 -0.258773,0.71376 -0.459038,1.71878 -0.600793,3.01505 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.32209978"
- id="path1110"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccsccccscscscccccsccc" />
- <path
- d="m 53.724139,238.90282 c -0.05374,-0.14764 -0.117442,-0.25429 -0.191107,-0.31996 -0.07081,-0.0739 -0.153388,-0.11083 -0.247724,-0.11083 -0.334461,0 -0.627807,0.4184 -0.880036,1.2552 -0.249381,0.82865 -0.441256,2.02237 -0.575625,3.58115 l -0.625885,7.26073 h -0.594958 l 1.188118,-13.78305 h 0.594957 l -0.184582,2.14129 c 0.196487,-0.83683 0.411754,-1.45626 0.645799,-1.85827 0.23475,-0.4102 0.4947,-0.6153 0.779851,-0.6153 0.04074,0 0.0847,0.0123 0.131887,0.0369 0.0479,0.0164 0.100094,0.0451 0.156581,0.0862 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.32209978"
- id="path1112"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccscsccccccsccc" />
- <path
- d="m 55.579774,243.64077 c -0.47811,0 -0.827391,0.20921 -1.047843,0.62763 -0.220448,0.41839 -0.374166,1.13215 -0.461153,2.14127 -0.06931,0.80401 -0.05586,1.44394 0.04033,1.91979 0.09905,0.46763 0.267565,0.70145 0.505548,0.70145 0.32803,0 0.628858,-0.44303 0.902485,-1.32908 0.276477,-0.89426 0.478364,-2.07976 0.605661,-3.55651 l 0.04349,-0.50455 z m 1.260891,-0.93531 -0.677866,7.86375 h -0.591741 l 0.18034,-2.09208 c -0.207207,0.83683 -0.428905,1.45625 -0.665094,1.85825 -0.235481,0.3938 -0.499012,0.5907 -0.790594,0.5907 -0.368766,0 -0.628546,-0.3938 -0.779341,-1.1814 -0.147942,-0.79581 -0.164629,-1.85825 -0.05006,-3.18732 0.133663,-1.5506 0.369513,-2.7197 0.707548,-3.50731 0.340179,-0.78761 0.779339,-1.18141 1.31748,-1.18141 h 0.829724 l 0.01909,-0.22147 c 0.08982,-1.04193 0.06908,-1.84595 -0.06222,-2.41204 -0.128445,-0.57431 -0.354539,-0.86146 -0.678281,-0.86146 -0.205823,0 -0.414418,0.0943 -0.625787,0.28305 -0.21137,0.18871 -0.423368,0.47176 -0.635995,0.84915 l 0.180339,-2.09207 c 0.244124,-0.31996 0.474744,-0.55789 0.691861,-0.71378 0.217822,-0.16407 0.423213,-0.24611 0.616172,-0.24611 0.520989,0 0.865569,0.51686 1.033738,1.55059 0.168169,1.03373 0.161733,2.60073 -0.01931,4.701 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.32209978"
- id="path1114"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="scscscccscccccscccscccsccccsscc" />
- <path
- d="m 58.296736,232.40016 0.861561,4.386 h 1.218857 l -0.151697,1.75979 H 59.0066 l -0.644979,7.48224 c -0.09689,1.12398 -0.119458,1.84594 -0.06771,2.16588 0.05389,0.31997 0.204118,0.47995 0.450673,0.47995 h 0.60782 l -0.163368,1.89519 h -0.60782 c -0.456669,0 -0.743901,-0.32407 -0.861694,-0.97222 -0.117086,-0.65633 -0.101373,-1.84593 0.04714,-3.5688 l 0.644978,-7.48224 h -0.434156 l -0.40779,-1.8273 0.993644,0.0675 -1.341121,-4.31849 z"
- style="fill:#fcfcfc;fill-opacity:1;stroke-width:0.32209978"
- id="path1116"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccscsccscscccccc" />
- <path
- d="m 62.104116,240.3112 q -0.538689,0 -0.851711,1.03678 -0.313022,1.02785 -0.313022,2.82436 0,1.79648 0.309382,2.83328 0.313023,1.02785 0.855351,1.02785 0.535051,0 0.848072,-1.0368 0.313023,-1.03679 0.313023,-2.82433 0,-1.77864 -0.313023,-2.81542 -0.313021,-1.04572 -0.848072,-1.04572 z m 0,-1.3943 q 0.873551,0 1.372203,1.3943 0.498652,1.3943 0.498652,3.86114 0,2.45789 -0.498652,3.86113 -0.498652,1.39428 -1.372203,1.39428 -0.87719,0 -1.375842,-1.39428 -0.495011,-1.40324 -0.495011,-3.86113 0,-2.46684 0.495011,-3.86114 0.498652,-1.3943 1.375842,-1.3943 z"
- style="stroke-width:0.29202741;fill:#fcfcfc;fill-opacity:1"
- id="path1118"
- inkscape:connector-curvature="0" />
- <path
- d="m 67.443695,240.69552 q -0.112833,-0.16085 -0.247505,-0.23238 -0.131034,-0.0805 -0.291184,-0.0805 -0.567808,0 -0.87355,0.91163 -0.302104,0.90274 -0.302104,2.60091 v 5.27331 H 65.05599 V 239.1582 h 0.673362 v 1.55517 q 0.211109,-0.91166 0.549609,-1.34962 0.338501,-0.44688 0.822594,-0.44688 0.06916,0 0.152871,0.0268 0.08372,0.0179 0.18563,0.0626 z"
- style="stroke-width:0.29202741;fill:#fcfcfc;fill-opacity:1"
- id="path1120"
- inkscape:connector-curvature="0" />
+ transform="matrix(0.14769597,0,0,0.32814931,12.761234,127.74167)">
+ <g
+ aria-label="horse-a
+doodle
+doo"
+ transform="scale(1.0880441,0.91908035)"
+ style="font-style:normal;font-weight:normal;font-size:23.50690651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f3f3f3;fill-opacity:1;stroke:none;stroke-width:0.15548837"
+ id="text4844">
+ <path
+ d="m -63.244951,238.82665 v 7.75912 h -2.111948 v -7.69025 q 0,-1.825 -0.711635,-2.73176 -0.711635,-0.90676 -2.134905,-0.90676 -1.710219,0 -2.697325,1.09041 -0.987107,1.09041 -0.987107,2.9728 v 7.26556 h -2.123426 v -17.85974 h 2.123426 v 7.00157 q 0.757547,-1.15928 1.779087,-1.73318 1.033019,-0.5739 2.375942,-0.5739 2.215251,0 3.351571,1.37736 1.13632,1.36588 1.13632,4.02877 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4858"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -52.863918,235.52125 q -1.698742,0 -2.685848,1.33145 -0.987106,1.31996 -0.987106,3.62704 0,2.30707 0.975628,3.63852 0.987106,1.31997 2.697326,1.31997 1.687263,0 2.674369,-1.33145 0.987107,-1.33145 0.987107,-3.62704 0,-2.28412 -0.987107,-3.61557 -0.987106,-1.34292 -2.674369,-1.34292 z m 0,-1.79057 q 2.754715,0 4.327199,1.79057 1.572483,1.79056 1.572483,4.95849 0,3.15644 -1.572483,4.95849 -1.572484,1.79056 -4.327199,1.79056 -2.766194,0 -4.338677,-1.79056 -1.561006,-1.80205 -1.561006,-4.95849 0,-3.16793 1.561006,-4.95849 1.572483,-1.79057 4.338677,-1.79057 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4860"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -37.189932,235.70464 q -0.355818,-0.2066 -0.780503,-0.29842 -0.413208,-0.10331 -0.918239,-0.10331 -1.790565,0 -2.754715,1.17076 -0.952673,1.15927 -0.952673,3.34009 v 6.77201 h -2.123426 v -12.85534 h 2.123426 v 1.99717 q 0.665723,-1.17076 1.733175,-1.73318 1.067453,-0.5739 2.594024,-0.5739 0.218082,0 0.482076,0.0344 0.263993,0.023 0.585377,0.0803 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4862"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -25.592235,234.41936 v 1.99717 q -0.895282,-0.45912 -1.859433,-0.68868 -0.96415,-0.22956 -1.997168,-0.22956 -1.572484,0 -2.364465,0.48208 -0.780502,0.48207 -0.780502,1.44622 0,0.7346 0.562421,1.15928 0.562421,0.41321 2.261162,0.79198 l 0.723113,0.16069 q 2.249684,0.48208 3.190879,1.36588 0.952672,0.87233 0.952672,2.44481 0,1.79057 -1.423269,2.83506 -1.411792,1.0445 -3.891036,1.0445 -1.033019,0 -2.157861,-0.2066 -1.113364,-0.19513 -2.352986,-0.59686 v -2.18081 q 1.170754,0.60833 2.307074,0.91823 1.136321,0.29843 2.249685,0.29843 1.492137,0 2.295596,-0.50503 0.803459,-0.51651 0.803459,-1.44622 0,-0.86085 -0.585377,-1.31997 -0.573899,-0.45912 -2.536634,-0.88381 l -0.734591,-0.17217 q -1.962735,-0.4132 -2.835061,-1.26258 -0.872327,-0.86084 -0.872327,-2.35298 0,-1.81352 1.285534,-2.80063 1.285534,-0.98711 3.649998,-0.98711 1.170754,0 2.203773,0.17217 1.033018,0.17217 1.905344,0.51651 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4864"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -10.533123,239.94027 v 1.03302 h -9.710373 q 0.137736,2.18082 1.30849,3.32862 1.182232,1.13632 3.282703,1.13632 1.216666,0 2.352986,-0.29843 1.147798,-0.29843 2.272641,-0.89528 v 1.99716 q -1.136321,0.48208 -2.330031,0.7346 -1.19371,0.25251 -2.421854,0.25251 -3.076099,0 -4.878142,-1.79056 -1.790565,-1.79057 -1.790565,-4.84371 0,-3.15645 1.698741,-5.0044 1.710219,-1.85944 4.602671,-1.85944 2.594024,0 4.097639,1.67579 1.515094,1.66431 1.515094,4.5338 z m -2.111949,-0.61981 q -0.02296,-1.73317 -0.975628,-2.76619 -0.941195,-1.03302 -2.5022,-1.03302 -1.767609,0 -2.835062,0.99858 -1.055974,0.99859 -1.216666,2.81211 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4866"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 6.1050132,240.12367 q -2.5595899,0 -3.5466963,0.58537 -0.9871064,0.58538 -0.9871064,1.99717 0,1.12484 0.7345908,1.79057 0.7460688,0.65424 2.0201248,0.65424 1.7561312,0 2.8121055,-1.23962 1.0674523,-1.2511 1.0674523,-3.31714 v -0.47059 z m 4.2124198,-0.87233 v 7.33443 H 8.2054839 v -1.95126 q -0.7231129,1.17076 -1.8020431,1.73318 -1.0789303,0.55094 -2.6399358,0.55094 -1.9742129,0 -3.14496701,-1.10189 -1.15927615,-1.11336 -1.15927615,-2.97279 0,-2.16934 1.44622569,-3.27123 1.45770367,-1.10188 4.33867707,-1.10188 h 2.9613193 v -0.20661 q 0,-1.4577 -0.9641505,-2.24968 -0.9526725,-0.80346 -2.6858477,-0.80346 -1.1018862,0 -2.1463826,0.26399 -1.0444963,0.264 -2.00864676,0.79198 v -1.95125 q 1.15927616,-0.44764 2.24968446,-0.66573 1.0904082,-0.22956 2.1234266,-0.22956 2.7891495,0 4.1665073,1.44623 1.3773583,1.44623 1.3773583,4.38459 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.15548837"
+ id="path4870"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -64.124852,257.33821 1.677879,-8.33086 2.419062,0.13832 -4.308216,21.3908 -2.419062,-0.13832 0.465155,-2.30955 q -1.039408,1.33113 -2.345166,1.93784 -1.289845,0.59371 -2.920081,0.50049 -2.668855,-0.1526 -3.903137,-2.47589 -1.221138,-2.32253 -0.49018,-5.95182 0.730958,-3.62929 2.849177,-5.76088 2.131364,-2.13083 4.800219,-1.97822 1.630236,0.0932 2.651511,0.83299 1.037187,0.72677 1.522839,2.1451 z m -9.325804,4.90385 q -0.56206,2.79069 0.207968,4.44778 0.785943,1.64409 2.705416,1.75385 1.919471,0.10976 3.342234,-1.40804 1.425534,-1.53154 1.987594,-4.32224 0.562063,-2.79071 -0.223881,-4.4348 -0.783178,-1.65782 -2.70265,-1.76758 -1.919472,-0.10975 -3.345001,1.42177 -1.409617,1.51855 -1.97168,4.30926 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.18316481"
+ id="path4872"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -54.858032,256.44607 q -1.698742,0 -2.499983,1.58894 -0.802844,1.57524 -0.480788,4.32847 0.322058,2.75325 1.48355,4.34218 1.171368,1.57524 2.881588,1.57524 1.687263,0 2.488504,-1.58894 0.801244,-1.58893 0.480788,-4.32848 -0.318852,-2.72584 -1.491823,-4.31477 -1.174573,-1.60264 -2.861836,-1.60264 z m -0.249954,-2.13684 q 2.754715,0 4.577153,2.13684 1.822439,2.13685 2.264666,5.91741 0.440626,3.76688 -0.880299,5.91742 -1.32253,2.13684 -4.077245,2.13684 -2.766194,0 -4.588631,-2.13684 -1.812564,-2.15054 -2.25319,-5.91742 -0.442227,-3.78056 0.868823,-5.91741 1.322529,-2.13684 4.088723,-2.13684 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.16985925"
+ id="path4874"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -40.487599,256.44607 q -1.698742,0 -2.499983,1.58894 -0.802845,1.57524 -0.480789,4.32847 0.322058,2.75325 1.483551,4.34218 1.171368,1.57524 2.881588,1.57524 1.687263,0 2.488504,-1.58894 0.801244,-1.58893 0.480788,-4.32848 -0.318852,-2.72584 -1.491823,-4.31477 -1.174573,-1.60264 -2.861836,-1.60264 z m -0.249954,-2.13684 q 2.754715,0 4.577153,2.13684 1.822439,2.13685 2.264666,5.91741 0.440626,3.76688 -0.880299,5.91742 -1.32253,2.13684 -4.077245,2.13684 -2.766194,0 -4.588632,-2.13684 -1.812563,-2.15054 -2.253189,-5.91742 -0.442227,-3.78056 0.868822,-5.91741 1.32253,-2.13684 4.088724,-2.13684 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.16985925"
+ id="path4876"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -22.573643,257.00768 -0.97098,-8.30082 h 2.111948 l 2.49314,21.31364 h -2.111948 l -0.269181,-2.30121 q -0.505496,1.36977 -1.448525,2.04096 -0.933153,0.65749 -2.356423,0.65749 -2.33003,0 -4.058781,-2.21903 -1.717271,-2.21903 -2.140272,-5.83523 -0.423001,-3.6162 0.775134,-5.83522 1.209614,-2.21903 3.539644,-2.21903 1.42327,0 2.511843,0.67119 1.098449,0.65748 1.924401,2.02726 z m -6.570206,5.3558 q 0.325262,2.78064 1.4638,4.36958 1.148412,1.57524 2.824198,1.57524 1.675785,0 2.455673,-1.57524 0.778286,-1.58894 0.453024,-4.36958 -0.325261,-2.78063 -1.473674,-4.35587 -1.150014,-1.58893 -2.825799,-1.58893 -1.675786,0 -2.454072,1.58893 -0.768411,1.57524 -0.44315,4.35587 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.16985925"
+ id="path4878"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -14.171988,248.70686 h 3.305151 v 21.81811 h -3.305151 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.21499233"
+ id="path4880"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 13.239219,262.02769 v 1.26197 H -1.957296 q 0.2155534,2.66416 2.04775732,4.06636 1.85016668,1.38817 5.13735618,1.38817 1.9040551,0 3.6823707,-0.36457 1.7962788,-0.36458 3.5566308,-1.09371 v 2.43981 q -1.778315,0.58892 -3.6464447,0.89741 -1.8681295,0.30847 -3.7901474,0.30847 -4.81402605,0 -7.6341831,-2.18741 -2.8021943,-2.18743 -2.8021943,-5.91725 0,-3.85603 2.658492,-6.11356 2.67645482,-2.27155 7.2030764,-2.27155 4.0595891,0 6.4127141,2.0472 2.371087,2.03318 2.371087,5.53866 z M 9.9340669,261.2705 q -0.035926,-2.11731 -1.5268366,-3.37928 -1.4729483,-1.26197 -3.915887,-1.26197 -2.7662687,0 -4.43680761,1.21991 -1.65257609,1.2199 -1.90405499,3.43536 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.21499233"
+ id="path4882"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -52.347174,285.06057 -0.970978,-8.30081 h 4.23615 l 2.49314,21.31364 h -4.23615 l -0.269181,-2.30121 q -1.175082,1.36976 -3.145577,2.04095 -1.949075,0.65749 -4.803872,0.65749 -4.673577,0 -7.880031,-2.21903 -3.183433,-2.21903 -3.606434,-5.83523 -0.423,-3.61619 2.241295,-5.83523 2.687317,-2.21902 7.360894,-2.21902 2.854797,0 4.959294,0.67119 2.125915,0.65749 3.62145,2.02726 z m -13.80865,5.3558 q 0.325263,2.78064 2.422,4.36958 2.118155,1.57524 5.479448,1.57524 3.361292,0 5.110923,-1.57524 1.748031,-1.58894 1.422768,-4.36958 -0.325262,-2.78064 -2.443417,-4.35586 -2.119757,-1.58894 -5.481049,-1.58894 -3.361293,0 -5.109322,1.58894 -1.726613,1.57522 -1.401351,4.35586 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.24056539"
+ id="path4884"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -29.459384,284.49897 q -3.407339,0 -5.201414,1.58893 -1.795676,1.57524 -1.47362,4.32847 0.322059,2.75325 2.464837,4.34218 2.164201,1.57524 5.594562,1.57524 3.384314,0 5.178389,-1.58893 1.794076,-1.58894 1.47362,-4.32849 -0.318851,-2.72583 -2.484656,-4.31477 -2.167404,-1.60263 -5.551718,-1.60263 z m -0.249956,-2.13685 q 5.52541,0 8.929457,2.13685 3.404041,2.13683 3.846269,5.9174 0.440627,3.76688 -2.461904,5.91742 -2.904136,2.13684 -8.429546,2.13684 -5.548435,0 -8.952478,-2.13684 -3.382625,-2.15054 -3.823252,-5.91742 -0.442228,-3.78057 2.438887,-5.9174 2.904132,-2.13685 8.452567,-2.13685 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.24056539"
+ id="path4886"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m -0.63515339,284.49897 q -3.40733861,0 -5.20141361,1.58893 -1.7956783,1.57524 -1.4736222,4.32847 0.3220584,2.75325 2.4648395,4.34218 2.1642004,1.57524 5.59456161,1.57524 3.38431409,0 5.17838899,-1.58893 1.7940758,-1.58894 1.4736199,-4.32849 -0.318851,-2.72583 -2.4846559,-4.31477 -2.1674042,-1.60263 -5.55171829,-1.60263 z m -0.24995573,-2.13685 q 5.52541052,0 8.92945642,2.13685 3.4040417,2.13683 3.8462697,5.9174 0.440627,3.76688 -2.4619044,5.91742 -2.9041356,2.13684 -8.42954613,2.13684 -5.54843507,0 -8.95247937,-2.13684 -3.3826231,-2.15054 -3.8232501,-5.91742 -0.442228,-3.78057 2.4388848,-5.9174 2.904134,-2.13685 8.45256908,-2.13685 z"
+ style="fill:#f3f3f3;fill-opacity:1;stroke-width:0.24056539"
+ id="path4888"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
- <path
- style="fill:#fcfcfc;fill-opacity:1;stroke:#666666;stroke-width:0.54941285;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
- d="m 1.1353945,240.78695 12.5402735,0.0459 -0.258787,1.37905 -0.365747,12.95368 -11.9157329,-0.0459 z"
- id="rect1127"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc" />
</g>
</svg>
diff --git a/src/ComputerscareHorseADoodleDoo.cpp b/src/ComputerscareHorseADoodleDoo.cpp
@@ -5,33 +5,46 @@
struct ComputerscareHorseADoodleDoo;
struct HorseSequencer {
- float pattern=0.f;
- int numSteps=8;
- int currentStep=-1;
- float density=0.f;
- int primes[16] = {30011,36877,26627,32833,66797,95153,66553,84857,32377,79589,25609,20113,70991,86533,21499,32491};
- int otherPrimes[16] = {80651,85237,11813,22343,19543,28027,9203,39521,42853,58411,33811,76771,10939,22721,17851,10163};
- std::vector<std::vector<int>> octets={{0,0,0,0},{0,0,0,1},{0,0,1,0},{0,0,1,1},{0,1,0,0},{0,1,0,1},{0,1,1,0},{0,1,1,1},{1,1,0,0},{1,1,0,1},{1,1,1,0},{1,1,1,1}};
+ float pattern = 0.f;
+ int numSteps = 8;
+ int currentStep = -1;
+ float density = 0.f;
+ int primes[16] = {30011, 36877, 26627, 32833, 66797, 95153, 66553, 84857, 32377, 79589, 25609, 20113, 70991, 86533, 21499, 32491};
+ int otherPrimes[16] = {80651, 85237, 11813, 22343, 19543, 28027, 9203, 39521, 42853, 58411, 33811, 76771, 10939, 22721, 17851, 10163};
+
+ std::vector<std::vector<int>> octets = {{0, 0, 0, 0}, {0, 0, 0, 1}, {0, 0, 1, 0}, {0, 0, 1, 1}, {0, 1, 0, 0}, {0, 1, 0, 1}, {0, 1, 1, 0}, {0, 1, 1, 1}, {1,0,0,0},{1,0,0,1},{1,0,1,0},{1,0,1,1},{1, 1, 0, 0}, {1, 1, 0, 1}, {1, 1, 1, 0}, {1, 1, 1, 1}};
+ std::vector<int> somethin={1,0,0,1};
std::vector<int> absoluteSequence;
- HorseSequencer(float patt,int steps,float dens) {
- numSteps=steps;
- density=dens;
- pattern=patt;
+ HorseSequencer(float patt, int steps, float dens) {
+ numSteps = steps;
+ density = dens;
+ pattern = patt;
makeAbsolute();
}
void makeAbsolute() {
- absoluteSequence.resize(0);
- for(int i = 0; i < 16; i++) {
- int dex = ((int)std::floor(pattern*primes[i])+otherPrimes[i])%16;
- absoluteSequence.push_back(dex < 8 ? 0 : 1);
+ std::vector<int> newSeq;
+ std::vector<int> thisOct;
+ newSeq.push_back(1);
+ newSeq.resize(0);
+ DEBUG("valuu:%f",pattern);
+ for (int i = 0; i < 16; i++) {
+ int dex = ((int)std::floor(pattern * primes[i]) + otherPrimes[i]) % 16;
+ //DEBUG("i:dex:%i",dex);
+
+ thisOct=octets[dex];
+ //vector1.insert( vector1.end(), vector2.begin(), vector2.end() );
+ newSeq.insert(newSeq.end(),thisOct.begin(),thisOct.end());
+ //absoluteSequence.push_back(dex < 8 ? 0 : 1);
}
+ printVector(newSeq);
+ absoluteSequence = newSeq;
}
void tick() {
currentStep++;
currentStep %= numSteps;
}
void reset() {
- currentStep=0;
+ currentStep = 0;
}
int get() {
return absoluteSequence[currentStep];
@@ -44,9 +57,10 @@ struct HorseSequencer {
struct ComputerscareHorseADoodleDoo : Module {
int counter = 0;
- int numChannels=1;
+ int numChannels = 1;
ComputerscareSVGPanel* panelRef;
- float currentValues[16]={0.f};
+ float currentValues[16] = {0.f};
+ bool atFirstStepPoly[16] = {false};
enum ParamIds {
PATTERN_KNOB,
STEPS_KNOB,
@@ -66,7 +80,7 @@ struct ComputerscareHorseADoodleDoo : Module {
TRIGGER_OUTPUT,
EOC_OUTPUT,
REST_OUTPUT,
- NUM_OUTPUTS
+ NUM_OUTPUTS
};
enum LightIds {
NUM_LIGHTS
@@ -74,68 +88,87 @@ struct ComputerscareHorseADoodleDoo : Module {
rack::dsp::SchmittTrigger clockInputTrigger;
- rack::dsp::SchmittTrigger resetInputTrigger;
+ rack::dsp::SchmittTrigger resetInputTrigger;
- rack::dsp::SchmittTrigger clockManualTrigger;
- rack::dsp::SchmittTrigger resetManualTrigger;
+ rack::dsp::SchmittTrigger clockManualTrigger;
+ rack::dsp::SchmittTrigger resetManualTrigger;
- float lastPatternKnob=0.f;
- float lastStepsKnob=0.f;
- float lastDensityKnob=0.f;
+ float lastPatternKnob = 0.f;
+ float lastStepsKnob = 0.f;
+ float lastDensityKnob = 0.f;
- int seqVal= 0.f;
+ int seqVal = 0.f;
- HorseSequencer seq = HorseSequencer(0.f,8,0.f);
+ HorseSequencer seq = HorseSequencer(0.f, 8, 0.f);
ComputerscareHorseADoodleDoo() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
- configParam(PATTERN_KNOB,0.f,10.f,0.f,"Pattern");
- configParam(STEPS_KNOB,2.f,64.f,8.f,"Number of Steps");
- configParam(DENSITY_KNOB,-2.f,2.f,0.f,"Density");
-
- seq = HorseSequencer(0.f,8,0.f);
+ configParam(PATTERN_KNOB, 0.f, 10.f, 0.f, "Pattern");
+ configParam(STEPS_KNOB, 2.f, 64.f, 8.f, "Number of Steps");
+ configParam(DENSITY_KNOB, -2.f, 2.f, 0.f, "Density");
+
+ seq = HorseSequencer(0.f, 8, 0.f);
}
- void patternKnobChanged(float pattern,int numSteps,float density) {
- seq=HorseSequencer(pattern,numSteps,density);
+ void patternKnobChanged(float pattern, int numSteps, float density) {
+ seq = HorseSequencer(pattern, numSteps, density);
+ }
+ void checkKnobChanges() {
+ float patternKnob = params[PATTERN_KNOB].getValue();
+ float stepsKnob = params[STEPS_KNOB].getValue();
+ float densityKnob = params[DENSITY_KNOB].getValue();
+ if (patternKnob != lastPatternKnob || stepsKnob != lastStepsKnob || densityKnob != lastDensityKnob) {
+ patternKnobChanged(patternKnob, stepsKnob, densityKnob);
+ }
+ lastPatternKnob = patternKnob;
+ lastStepsKnob = stepsKnob;
+ lastDensityKnob = densityKnob;
}
-
void process(const ProcessArgs &args) override {
counter++;
- if(counter > 8) {
+ if (counter > 1081) {
counter = 0;
- float patternKnob=params[PATTERN_KNOB].getValue();
- float stepsKnob=params[STEPS_KNOB].getValue();
- float densityKnob=params[DENSITY_KNOB].getValue();
- if(patternKnob != lastPatternKnob || stepsKnob != lastStepsKnob || densityKnob != lastDensityKnob) {
- patternKnobChanged(patternKnob,stepsKnob,densityKnob);
- }
- lastPatternKnob=patternKnob;
- lastStepsKnob=stepsKnob;
- lastDensityKnob=densityKnob;
}
bool clockInputHigh = clockInputTrigger.isHigh();
bool clocked = clockInputTrigger.process(inputs[CLOCK_INPUT].getVoltage());
- if(clocked) {
+ if (clocked) {
seqVal = seq.tickAndGet();
+ for (int ch = 0; ch < numChannels; ch++) {
+ atFirstStepPoly[ch] = (seq.currentStep == 0);
+ }
+ checkKnobChanges();
}
if (inputs[CLOCK_INPUT].isConnected()) {
- for (int ch = 0; ch < numChannels; ch++) {
- outputs[TRIGGER_OUTPUT].setVoltage((clockInputHigh && seqVal==1/*activePolyStep[i][ch]*/) ? 10.0f : 0.0f, ch);
- //outputs[EOC_OUTPUT].setVoltage((currentTriggerIsHigh && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
- }
- }
- else {
- /* for (int ch = 0; ch < numChannels; ch++) {
- outputs[TRG_OUTPUT + i].setVoltage((globalGateIn && activePolyStep[i][ch]) ? 10.0f : 0.0f, ch);
- outputs[FIRST_STEP_OUTPUT + i].setVoltage((globalGateIn && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
- }*/
- }
+ for (int ch = 0; ch < numChannels; ch++) {
+ outputs[TRIGGER_OUTPUT].setVoltage((clockInputHigh && seqVal == 1/*activePolyStep[i][ch]*/) ? 10.0f : 0.0f, ch);
+ //outputs[EOC_OUTPUT].setVoltage((currentTriggerIsHigh && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
+ }
+ }
+ else {
+ /* for (int ch = 0; ch < numChannels; ch++) {
+ outputs[TRG_OUTPUT + i].setVoltage((globalGateIn && activePolyStep[i][ch]) ? 10.0f : 0.0f, ch);
+ outputs[FIRST_STEP_OUTPUT + i].setVoltage((globalGateIn && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
+ }*/
+ }
+
+
+ //if (outputs[EOC_OUTPUT].isConnected()) {
+ for (int ch = 0; ch < numChannels; ch++) {
+
+ if(atFirstStepPoly[ch]) {
+
+ outputs[EOC_OUTPUT].setVoltage((clockInputHigh && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
+
+ }
+ }
+ //outputs[EOC_OUTPUT].setVoltage((currentTriggerIsHigh && atFirstStepPoly[ch]) ? 10.f : 0.0f, ch);
+ //}
+
}
@@ -163,13 +196,13 @@ struct ComputerscareHorseADoodleDooWidget : ModuleWidget {
// ParamWidget* stepsKnob = createParam<LrgKnob>(Vec(108, 30), module, ComputerscarePatchSequencer::STEPS_PARAM);
- addInput(createInput<InPort>(Vec(18, 184), module, ComputerscareHorseADoodleDoo::CLOCK_INPUT));
- addInput(createInput<InPort>(Vec(18, 204), module, ComputerscareHorseADoodleDoo::RESET_INPUT));
+ addInput(createInput<InPort>(Vec(18, 184), module, ComputerscareHorseADoodleDoo::CLOCK_INPUT));
+ addInput(createInput<InPort>(Vec(18, 204), module, ComputerscareHorseADoodleDoo::RESET_INPUT));
- addLabeledKnob("Pattern",5,90,module,0,-2,0);
- addLabeledKnob("Num Steps",5,140,module,1,0,0);
- addLabeledKnob("Density",10,250,module,2,0,0);
+ addLabeledKnob("Pattern", 5, 90, module, 0, -2, 0);
+ addLabeledKnob("Num Steps", 5, 140, module, 1, 0, 0);
+ addLabeledKnob("Density", 10, 250, module, 2, 0, 0);
addOutput(createOutput<PointingUpPentagonPort>(Vec(38, 194), module, ComputerscareHorseADoodleDoo::TRIGGER_OUTPUT));
addOutput(createOutput<PointingUpPentagonPort>(Vec(38, 224), module, ComputerscareHorseADoodleDoo::EOC_OUTPUT));
