From c1982fc035558905d9923e6ec7b4d74507f393d9 Mon Sep 17 00:00:00 2001 From: s-ol Date: Fri, 8 Dec 2017 22:41:45 +0100 Subject: smaller pannels and VC modulo gain --- res/CircleVCO.svg | 171 +++++++++++++++++------------------------ res/Modulo.svg | 225 ++++++++++++++++++++++++++++++++---------------------- res/WrapComp.svg | 23 ++++-- src/CircleVCO.cpp | 14 ++-- src/Modulo.cpp | 15 ++-- src/WrapComp.cpp | 10 +-- 6 files changed, 240 insertions(+), 218 deletions(-) diff --git a/res/CircleVCO.svg b/res/CircleVCO.svg index 8531d4c..ca4daa8 100644 --- a/res/CircleVCO.svg +++ b/res/CircleVCO.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="90" + width="60" height="380" - viewBox="0 0 23.812501 100.54167" + viewBox="0 0 15.875001 100.54167" version="1.1" id="svg8" inkscape:version="0.92.2 5c3e80d, 2017-08-06" @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="27.681321" - inkscape:cy="199.25832" + inkscape:cx="-79.818679" + inkscape:cy="170.68689" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -37,9 +37,9 @@ inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:window-width="1358" - inkscape:window-height="744" + inkscape:window-height="730" inkscape:window-x="0" - inkscape:window-y="16" + inkscape:window-y="34" inkscape:window-maximized="0" showguides="false" /> - - - - - - - - - - - - - + transform="translate(-3.9625765,-8.4666666)"> + transform="translate(-3.943361,-21.436551)"> - - - - - + id="text3831" + transform="translate(-8.6347871,0.21693435)"> + id="text3831-3" + transform="translate(1.4331605,-8.5950003)"> + + + + + + + + + + + + + + style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + d="m 28.326958,266.45729 v 0.29353 q -0.14056,-0.13092 -0.300413,-0.19569 -0.158474,-0.0648 -0.337619,-0.0648 -0.352778,0 -0.540191,0.21635 -0.187413,0.21497 -0.187413,0.62287 0,0.40652 0.187413,0.62288 0.187413,0.21497 0.540191,0.21497 0.179145,0 0.337619,-0.0648 0.159853,-0.0648 0.300413,-0.19568 v 0.29077 q -0.146072,0.0992 -0.310059,0.14882 -0.162608,0.0496 -0.344509,0.0496 -0.467155,0 -0.735873,-0.28525 -0.268717,-0.28663 -0.268717,-0.78135 0,-0.49609 0.268717,-0.78135 0.268718,-0.28663 0.735873,-0.28663 0.184657,0 0.347265,0.0496 0.163987,0.0482 0.307303,0.14607 z" /> + style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + d="m 29.346706,266.99059 q -0.20395,0 -0.322461,0.15986 -0.118511,0.15847 -0.118511,0.43546 0,0.27698 0.117133,0.43684 0.118511,0.15847 0.323839,0.15847 0.202571,0 0.321083,-0.15985 0.118511,-0.15986 0.118511,-0.43546 0,-0.27423 -0.118511,-0.43408 -0.118512,-0.16124 -0.321083,-0.16124 z m 0,-0.21497 q 0.330729,0 0.51952,0.21497 0.188791,0.21498 0.188791,0.59532 0,0.37896 -0.188791,0.59531 -0.188791,0.21497 -0.51952,0.21497 -0.332107,0 -0.520899,-0.21497 -0.187413,-0.21635 -0.187413,-0.59531 0,-0.38034 0.187413,-0.59532 0.188792,-0.21497 0.520899,-0.21497 z" /> + style="font-style:normal;font-weight:normal;font-size:2.82222223px;line-height:2;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + d="m 31.45786,266.8583 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115755,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17363 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271472,0.0951 l 0.08682,0.0193 q 0.270095,0.0579 0.383094,0.16398 0.114377,0.10474 0.114377,0.29353 0,0.21497 -0.170876,0.34037 -0.169499,0.1254 -0.467155,0.1254 -0.124024,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276985,0.11025 0.136426,0.0358 0.270096,0.0358 0.179145,0 0.275607,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10335 -0.07028,-0.15848 -0.0689,-0.0551 -0.304546,-0.1061 l -0.0882,-0.0207 q -0.235644,-0.0496 -0.340375,-0.15159 -0.104731,-0.10335 -0.104731,-0.2825 0,-0.21773 0.15434,-0.33624 0.154341,-0.11851 0.438216,-0.11851 0.14056,0 0.264584,0.0207 0.124023,0.0207 0.228754,0.062 z" /> diff --git a/res/Modulo.svg b/res/Modulo.svg index 0423036..bafe2c1 100644 --- a/res/Modulo.svg +++ b/res/Modulo.svg @@ -15,23 +15,10 @@ version="1.1" id="svg8" inkscape:version="0.92.2 5c3e80d, 2017-08-06" - sodipodi:docname="Modulo.svg"> + sodipodi:docname="Modulo.svg" + enable-background="new"> - - - - + id="defs2" /> + style="display:inline;"> + inkscape:connector-curvature="0" /> + + + + + + + + + + + + aria-label="Staircase" + transform="translate(0,-3.1748906)"> + d="m 2.9255753,263.41395 v 0.27148 q -0.1584744,-0.0758 -0.2990343,-0.113 -0.1405599,-0.0372 -0.2714735,-0.0372 -0.2273764,0 -0.3513998,0.0882 -0.1226454,0.0882 -0.1226454,0.25081 0,0.13642 0.081304,0.2067 0.082682,0.0689 0.3114367,0.11162 l 0.1681207,0.0344 q 0.3114366,0.0593 0.4588867,0.20947 0.1488282,0.14882 0.1488282,0.39963 0,0.29903 -0.2011936,0.45337 -0.1998156,0.15434 -0.5870443,0.15434 -0.1460721,0 -0.3114367,-0.0331 -0.1639866,-0.0331 -0.3403755,-0.0978 v -0.28663 q 0.1694987,0.0951 0.3321073,0.14331 0.1626085,0.0482 0.3197049,0.0482 0.2384006,0 0.3679362,-0.0937 0.1295356,-0.0937 0.1295356,-0.26734 0,-0.15159 -0.093707,-0.23702 -0.092329,-0.0854 -0.3045465,-0.12816 l -0.1694987,-0.0331 q -0.3114367,-0.062 -0.4506185,-0.1943 -0.1391819,-0.13229 -0.1391819,-0.36793 0,-0.27286 0.1915473,-0.42995 0.1929254,-0.1571 0.5305448,-0.1571 0.144694,0 0.2949002,0.0262 0.1502062,0.0262 0.3073031,0.0786 z" + inkscape:connector-curvature="0" /> + d="m 3.7234595,263.42222 v 0.43822 H 4.245736 v 0.19706 H 3.7234595 v 0.83784 q 0,0.18879 0.050987,0.24254 0.052366,0.0537 0.2108399,0.0537 H 4.245736 v 0.21222 H 3.9852868 q -0.2935222,0 -0.4051433,-0.10887 -0.1116211,-0.11024 -0.1116211,-0.39963 v -0.8378 H 3.2824872 v -0.19706 h 0.1860352 v -0.43822 z" + inkscape:connector-curvature="0" /> + d="m 5.2820208,264.628 q -0.3073025,0 -0.4258138,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089572,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281575,-0.15021 0.1281575,-0.39826 v -0.0565 z m 0.5057401,-0.10473 v 0.88057 H 5.5342018 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169488,0.0661 -0.2370226,0 -0.3775825,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736329,-0.39274 0.1750108,-0.13229 0.5208985,-0.13229 h 0.3555338 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.3224609,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309136,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z" + inkscape:connector-curvature="0" /> + d="m 6.3114157,263.86044 h 0.253559 v 1.5434 h -0.253559 z m 0,-0.60083 h 0.253559 v 0.32108 h -0.253559 z" + inkscape:connector-curvature="0" /> + d="m 7.9884879,264.09746 q -0.042719,-0.0248 -0.093707,-0.0358 -0.049609,-0.0124 -0.1102431,-0.0124 -0.214974,0 -0.3307292,0.14056 -0.1143772,0.13918 -0.1143772,0.40101 v 0.81304 h -0.254937 v -1.5434 h 0.254937 v 0.23977 q 0.079926,-0.14056 0.2080838,-0.20808 0.1281576,-0.0689 0.3114367,-0.0689 0.026183,0 0.057878,0.004 0.031695,0.003 0.07028,0.01 z" + inkscape:connector-curvature="0" /> + d="m 9.3072707,263.91969 v 0.23702 q -0.107487,-0.0592 -0.216352,-0.0882 -0.107487,-0.0303 -0.21773,-0.0303 -0.2466689,0 -0.3830947,0.1571 -0.1364258,0.15572 -0.1364258,0.43822 0,0.28249 0.1364258,0.43959 0.1364258,0.15572 0.3830947,0.15572 0.110243,0 0.21773,-0.0289 0.108865,-0.0303 0.216352,-0.0896 v 0.23426 q -0.1061089,0.0496 -0.2204861,0.0744 -0.1129991,0.0248 -0.2411567,0.0248 -0.3486437,0 -0.5539714,-0.21911 -0.2053277,-0.2191 -0.2053277,-0.59117 0,-0.37759 0.2067057,-0.59394 0.2080838,-0.21635 0.5691299,-0.21635 0.1171332,0 0.2287543,0.0248 0.1116211,0.0234 0.216352,0.0717 z" + inkscape:connector-curvature="0" /> + d="m 10.452421,264.628 q -0.307303,0 -0.425814,0.0703 -0.1185112,0.0703 -0.1185112,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425342,0.0785 0.21084,0 0.337619,-0.14882 0.128159,-0.15021 0.128159,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.08682,0.14056 -0.216352,0.20809 -0.129536,0.0661 -0.316949,0.0661 -0.2370224,0 -0.3775823,-0.13229 -0.1391819,-0.13367 -0.1391819,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750104,-0.13229 0.5208984,-0.13229 h 0.355534 v -0.0248 q 0,-0.17501 -0.115755,-0.27009 -0.114377,-0.0965 -0.322461,-0.0965 -0.132292,0 -0.257693,0.0317 -0.1254018,0.0317 -0.2411571,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700951,-0.0799 0.130914,-0.0276 0.254938,-0.0276 0.334863,0 0.500227,0.17363 0.165365,0.17363 0.165365,0.52641 z" + inkscape:connector-curvature="0" /> + d="m 12.465735,263.90591 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115756,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17364 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271474,0.0951 l 0.08682,0.0193 q 0.270096,0.0579 0.383095,0.16398 0.114377,0.10473 0.114377,0.29353 0,0.21497 -0.170877,0.34037 -0.169498,0.1254 -0.467155,0.1254 -0.124023,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276986,0.11025 0.136426,0.0358 0.270095,0.0358 0.179145,0 0.275608,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10336 -0.07028,-0.15848 -0.0689,-0.0551 -0.304547,-0.10611 l -0.08819,-0.0207 q -0.235645,-0.0496 -0.340376,-0.15158 -0.10473,-0.10335 -0.10473,-0.2825 0,-0.21773 0.15434,-0.33624 0.15434,-0.11851 0.438216,-0.11851 0.14056,0 0.264583,0.0207 0.124024,0.0207 0.228755,0.062 z" + inkscape:connector-curvature="0" /> + d="m 14.273721,264.56875 v 0.12402 H 13.1079 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282497,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21497 -0.214974,-0.21498 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117134,-0.3321 -0.112999,-0.12403 -0.300412,-0.12403 -0.212218,0 -0.340376,0.11989 -0.126779,0.11989 -0.146072,0.33762 z" + inkscape:connector-curvature="0" /> + aria-label="Input" + transform="translate(0,-16.933335)"> + d="m 4.4531304,238.72062 h 0.2783638 v 2.05741 H 4.4531304 Z" + inkscape:connector-curvature="0" /> + d="m 6.5573949,239.84648 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.085438,-0.32797 -0.085438,-0.10886 -0.2563151,-0.10886 -0.2053277,0 -0.323839,0.13091 -0.1185113,0.13091 -0.1185113,0.35691 v 0.8723 H 5.264795 v -1.5434 h 0.2549371 v 0.23978 q 0.09095,-0.13919 0.2135959,-0.20809 0.1240235,-0.0689 0.2852539,-0.0689 0.2659614,0 0.4023872,0.16537 0.1364258,0.16398 0.1364258,0.48369 z" + inkscape:connector-curvature="0" /> + d="m 7.311182,240.54652 v 0.81855 H 7.0562449 v -2.13044 H 7.311182 v 0.23426 q 0.079926,-0.1378 0.2011936,-0.20395 0.1226454,-0.0675 0.2921441,-0.0675 0.2811198,0 0.4561307,0.22324 0.1763889,0.22324 0.1763889,0.58705 0,0.3638 -0.1763889,0.58704 -0.1750109,0.22324 -0.4561307,0.22324 -0.1694987,0 -0.2921441,-0.0661 -0.1212674,-0.0675 -0.2011936,-0.20533 z m 0.862652,-0.53881 q 0,-0.27974 -0.1157553,-0.43822 -0.1143771,-0.15985 -0.3155707,-0.15985 -0.2011936,0 -0.3169489,0.15985 -0.1143771,0.15848 -0.1143771,0.43822 0,0.27974 0.1143771,0.43959 0.1157553,0.15848 0.3169489,0.15848 0.2011936,0 0.3155707,-0.15848 0.1157553,-0.15985 0.1157553,-0.43959 z" + inkscape:connector-curvature="0" /> + d="m 8.831158,240.16894 v -0.93431 h 0.253559 v 0.92466 q 0,0.21911 0.085438,0.32935 0.085438,0.10887 0.2563151,0.10887 0.2053277,0 0.323839,-0.13092 0.1198894,-0.13091 0.1198894,-0.35691 v -0.87505 h 0.2535595 v 1.5434 H 9.8701989 v -0.23702 q -0.092329,0.14056 -0.214974,0.20946 -0.1212674,0.0675 -0.2824979,0.0675 -0.2659614,0 -0.4037652,-0.16536 -0.1378038,-0.16537 -0.1378038,-0.48369 z m 0.6380317,-0.97152 z" + inkscape:connector-curvature="0" /> + d="m 10.899594,238.79641 v 0.43822 h 0.522276 v 0.19706 h -0.522276 v 0.83784 q 0,0.1888 0.05099,0.24254 0.05237,0.0537 0.21084,0.0537 h 0.260449 v 0.21222 h -0.260449 q -0.293522,0 -0.405143,-0.10886 -0.111621,-0.11025 -0.111621,-0.39964 v -0.83784 h -0.186036 v -0.19706 h 0.186036 v -0.43822 z" + inkscape:connector-curvature="0" /> + aria-label="Gain" + transform="translate(0,10.054167)"> + d="m 6.4127012,229.06108 v -0.5526 H 5.9579486 v -0.22875 h 0.7303603 v 0.88332 q -0.1612305,0.11438 -0.3555339,0.17363 -0.1943034,0.0579 -0.4147895,0.0579 -0.4823134,0 -0.755165,-0.28112 -0.2714736,-0.2825 -0.2714736,-0.78548 0,-0.50436 0.2714736,-0.78548 0.2728516,-0.2825 0.755165,-0.2825 0.2011936,0 0.3817166,0.0496 0.1819011,0.0496 0.3348633,0.14607 v 0.29628 q -0.1543403,-0.13091 -0.3279731,-0.19706 -0.1736328,-0.0661 -0.3651802,-0.0661 -0.3775825,0 -0.5677517,0.21083 -0.1887913,0.21084 -0.1887913,0.62839 0,0.41617 0.1887913,0.62701 0.1901692,0.21084 0.5677517,0.21084 0.1474501,0 0.2632054,-0.0248 0.1157552,-0.0262 0.2080837,-0.0799 z" + inkscape:connector-curvature="0" /> + d="m 7.8885804,228.57876 q -0.3073026,0 -0.4258139,0.0703 -0.1185113,0.0703 -0.1185113,0.23978 0,0.13505 0.088195,0.21498 0.089573,0.0785 0.2425347,0.0785 0.2108399,0 0.3376194,-0.14882 0.1281576,-0.15021 0.1281576,-0.39826 v -0.0565 z m 0.50574,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.086816,0.14056 -0.216352,0.20809 -0.1295356,0.0661 -0.3169489,0.0661 -0.2370225,0 -0.3775825,-0.13229 -0.1391818,-0.13367 -0.1391818,-0.35691 0,-0.26045 0.1736328,-0.39274 0.1750109,-0.13229 0.5208985,-0.13229 h 0.3555339 v -0.0248 q 0,-0.17501 -0.1157552,-0.27009 -0.1143772,-0.0965 -0.322461,-0.0965 -0.1322917,0 -0.2576932,0.0317 -0.1254015,0.0317 -0.2411567,0.0951 v -0.23426 q 0.1391819,-0.0538 0.2700955,-0.0799 0.1309137,-0.0276 0.2549371,-0.0276 0.3348633,0 0.5002279,0.17363 0.1653646,0.17363 0.1653646,0.52641 z" + inkscape:connector-curvature="0" /> + d="m 8.917975,227.8112 h 0.253559 v 1.5434 H 8.917975 Z m 0,-0.60083 h 0.253559 v 0.32108 H 8.917975 Z" + inkscape:connector-curvature="0" /> + d="m 10.983654,228.42305 v 0.93155 h -0.253559 v -0.92329 q 0,-0.2191 -0.08544,-0.32797 -0.08544,-0.10886 -0.256315,-0.10886 -0.205328,0 -0.323839,0.13091 -0.1185116,0.13091 -0.1185116,0.35691 v 0.8723 H 9.6910543 v -1.5434 h 0.2549371 v 0.23977 q 0.090951,-0.13918 0.2135956,-0.20808 0.124024,-0.0689 0.285254,-0.0689 0.265962,0 0.402387,0.16536 0.136426,0.16399 0.136426,0.4837 z" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + id="path3884" + d="m -0.52916667,220.08676 8.68626027,-6.01357 v 6.41447 l 9.8202274,-5.66971" + style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + inkscape:connector-curvature="0" + id="path3888" + d="M -0.46772171,258.0486 H 5.0113039 v -3.47451 h 3.0067823 v 3.34087 h 5.8799298 v -2.53906 h 2.539061" + style="fill:none;stroke:#000000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> diff --git a/src/CircleVCO.cpp b/src/CircleVCO.cpp index 849d1e4..b1bbaab 100644 --- a/src/CircleVCO.cpp +++ b/src/CircleVCO.cpp @@ -52,20 +52,18 @@ CircleVCOWidget::CircleVCOWidget() { setPanel(SVG::load(assetPlugin(plugin, "res/CircleVCO.svg"))); addChild(createScrew(Vec(RACK_GRID_WIDTH, 0))); - addChild(createScrew(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); - addChild(createScrew(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createScrew(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); PJ301MPort p; - Davies1900hBlackKnob k; + RoundSmallBlackKnob k; Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2); Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2); - addParam(createParam(kcenter.plus(Vec(0, 90)), module, CircleVCO::PITCH_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(kcenter.plus(Vec(0, 90)), module, CircleVCO::PITCH_PARAM, 0.0, 1.0, 0.0)); - addInput(createInput(center.plus(Vec(0, 180)), module, CircleVCO::PITCH_INPUT)); + addInput(createInput(center.plus(Vec(0, 144)), module, CircleVCO::PITCH_INPUT)); - addOutput(createOutput(center.plus(Vec(-18, 250)), module, CircleVCO::SIN_OUTPUT)); - addOutput(createOutput(center.plus(Vec( 18, 250)), module, CircleVCO::COS_OUTPUT)); - addOutput(createOutput(center.plus(Vec(0, 315)), module, CircleVCO::PHS_OUTPUT)); + addOutput(createOutput(center.plus(Vec(0, 218)), module, CircleVCO::SIN_OUTPUT)); + addOutput(createOutput(center.plus(Vec(0, 268)), module, CircleVCO::COS_OUTPUT)); + addOutput(createOutput(center.plus(Vec(0, 318)), module, CircleVCO::PHS_OUTPUT)); } diff --git a/src/Modulo.cpp b/src/Modulo.cpp index 8b2cb6a..838f3ae 100644 --- a/src/Modulo.cpp +++ b/src/Modulo.cpp @@ -7,6 +7,7 @@ struct Modulo : Module { }; enum InputIds { SIGNAL_INPUT, + GAIN_INPUT, NUM_INPUTS }; enum OutputIds { @@ -24,7 +25,7 @@ struct Modulo : Module { void Modulo::step() { - float gain = powf(2.0, params[GAIN_PARAM].value); + float gain = powf(2.0, params[GAIN_PARAM].value) + inputs[GAIN_INPUT].value; float val = inputs[SIGNAL_INPUT].value * gain; float stair = floorf(val); float wrap = val - stair; @@ -43,14 +44,16 @@ ModuloWidget::ModuloWidget() { addChild(createScrew(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); PJ301MPort p; - Davies1900hBlackKnob k; + RoundSmallBlackKnob k; Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2); Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2); - addParam(createParam(kcenter.plus(Vec(0, 90)), module, Modulo::GAIN_PARAM, -3.0, 3.0, 0.0)); - addInput(createInput(center.plus(Vec(0, 145)), module, Modulo::SIGNAL_INPUT)); + addInput(createInput(center.plus(Vec(0, 120)), module, Modulo::SIGNAL_INPUT)); + addInput(createInput(center.plus(Vec(-15, 180)), module, Modulo::GAIN_INPUT)); - addOutput(createOutput(center.plus(Vec(0, 275)), module, Modulo::STAIR_OUTPUT)); - addOutput(createOutput(center.plus(Vec(0, 347)), module, Modulo::WRAP_OUTPUT)); + addParam(createParam(kcenter.plus(Vec(15, 180)), module, Modulo::GAIN_PARAM, -3.0, 3.0, 0.0)); + + addOutput(createOutput(center.plus(Vec(0, 265)), module, Modulo::STAIR_OUTPUT)); + addOutput(createOutput(center.plus(Vec(0, 345)), module, Modulo::WRAP_OUTPUT)); } diff --git a/src/WrapComp.cpp b/src/WrapComp.cpp index f8240eb..3da185d 100644 --- a/src/WrapComp.cpp +++ b/src/WrapComp.cpp @@ -57,7 +57,7 @@ WrapCompWidget::WrapCompWidget() { addChild(createScrew(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); PJ301MPort p; - Davies1900hBlackKnob k; + RoundSmallBlackKnob k; MediumLight l; Vec center = Vec(box.size.x, 0).minus(p.box.size).div(2); Vec kcenter = Vec(box.size.x, 0).minus(k.box.size).div(2); @@ -65,17 +65,17 @@ WrapCompWidget::WrapCompWidget() { addInput(createInput(center.plus(Vec(0, 70)), module, WrapComp::SIGNAL_INPUT)); - addParam(createParam(kcenter.plus(Vec(25, 135)), module, WrapComp::OFFSET_PARAM, -5.0, 5.0, 0.0)); + addParam(createParam(kcenter.plus(Vec(25, 135)), module, WrapComp::OFFSET_PARAM, -5.0, 5.0, 0.0)); addInput(createInput(center.plus(Vec(-25, 135)), module, WrapComp::OFFSET_INPUT)); - addParam(createParam(kcenter.plus(Vec(25, 210)), module, WrapComp::RANGE_PARAM, -5.0, 5.0, 0.0)); + addParam(createParam(kcenter.plus(Vec(25, 210)), module, WrapComp::RANGE_PARAM, -5.0, 5.0, 0.0)); addInput(createInput(center.plus(Vec(-25, 210)), module, WrapComp::RANGE_INPUT)); addChild(createLight>(lcenter.plus(Vec(-15, 255)), module, WrapComp::A_LIGHT)); addChild(createLight>(lcenter.plus(Vec( 15, 255)), module, WrapComp::B_LIGHT)); - addParam(createParam(kcenter.plus(Vec(-25, 280)), module, WrapComp::A_OUT_PARAM, -8.0, 8.0, 1.0)); - addParam(createParam(kcenter.plus(Vec( 25, 280)), module, WrapComp::B_OUT_PARAM, -8.0, 8.0, 0.0)); + addParam(createParam(kcenter.plus(Vec(-25, 280)), module, WrapComp::A_OUT_PARAM, -8.0, 8.0, 1.0)); + addParam(createParam(kcenter.plus(Vec( 25, 280)), module, WrapComp::B_OUT_PARAM, -8.0, 8.0, 0.0)); addOutput(createOutput(center.plus(Vec(0, 315)), module, WrapComp::MAIN_OUTPUT)); } -- cgit v1.2.3