commit be617d8cf088763c5f70409b007300560798d254
parent cd576126ab24a74dfc78dee09dd3923f0c44f28c
Author: Matt Demanett <matt@demanett.net>
Date: Sat, 24 Mar 2018 01:12:05 -0400
FM-OP: clean up panel.
Diffstat:
4 files changed, 286 insertions(+), 143 deletions(-)
diff --git a/res-src/FMOp-src.svg b/res-src/FMOp-src.svg
@@ -2,9 +2,9 @@
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
- width="300"
+ width="150"
height="380"
- viewBox="0 0 300 380"
+ viewBox="0 0 150 380"
>
<style>
text {
@@ -47,6 +47,146 @@
</g>
</symbol>
+ <symbol id="knobguide-ratio" viewBox="0 0 88px 78px">
+ <g transform="translate(49 39)">
+ <g transform="rotate(-240) translate(19 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(240) translate(-11 3.5)">.01</text>
+ </g>
+
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-225) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-210) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-195) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-180) translate(22 0)" />
+
+ <g transform="rotate(-165) translate(19 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(165) translate(-5.5 3.5)">.5</text>
+ </g>
+
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-150) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-135) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-120) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-105) translate(22 0)" />
+
+ <g transform="rotate(-90) translate(19 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(90) translate(-2.7 3.5)">0</text>
+ </g>
+
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-75) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-60) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-45) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(-30) translate(22 0)" />
+
+ <g transform="rotate(-15) translate(19 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(15) translate(-2.7 3.5)">5</text>
+ </g>
+
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(0) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(15) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(30) translate(22 0)" />
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="rotate(45) translate(22 0)" />
+
+ <g transform="rotate(60) translate(19 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(-60) translate(-3 3.5)">10</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-linear" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
+ </g>
+ <g transform="rotate(-210) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-180) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-150) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-120) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-90) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-60) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(0) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-2.2 2.2)">1</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-time" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
+ </g>
+ <g transform="rotate(-172.92) translate(15 0)">
+ <polyline points="0,0 1.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-145.13) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(145.13) translate(-2.2 2.2)">1</text>
+ </g>
+ <g transform="rotate(-105.84) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-75.68) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-50.26) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-27.87) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(27.87) translate(-2.2 2.2)">5</text>
+ </g>
+ <g transform="rotate(-7.62) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(11) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(28.33) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(44.6) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(16 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-5 2.2)">10</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-centertick" viewBox="0 0 40px 40px">
+ <g transform="translate(20 20)">
+ <g transform="rotate(-90) translate(10 0)">
+ <polyline points="0,0 4,0" stroke-width="1" stroke="#333" />
+ </g>
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(20)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(43)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-20)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-43)" />
+ </g>
+ </symbol>
+
<symbol id="input" viewBox="0 0 24px 24px">
<g transform="translate(12 12)">
<circle cx="0" cy="0" r="5" stroke-width="1" stroke="#0f0" fill="#0f0" />
@@ -67,140 +207,148 @@
</g>
</symbol>
- <symbol id="light" viewBox="0 0 1.1px 1.1px">
- <rect width="3.2" height="3.2" fill="#0f0" />
- </symbol>
-
- <symbol id="light-red" viewBox="0 0 1.1px 1.1px">
- <rect width="3.2" height="3.2" fill="#f00" />
+ <symbol id="light-small" viewBox="0 0 6.4px 6.4px">
+ <rect width="6.4" height="6.4" fill="#0f0" />
</symbol>
</defs>
<rect width="100%" height="100%" fill="#ddd" />
- <polyline points="1,1 299,1 299,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
- <polyline points="0.5,0.5 299.5,0.5 299.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
- <polyline points="0,0 300,0 300,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+ <polyline points="1,1 149,1 149,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 149.5,0.5 149.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 150,0 150,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <!-- <rect width="35" height="20" fill="#0f0" transform="translate(0 0)" /> -->
+ <!-- <rect width="35" height="20" fill="#0f0" transform="translate(115 0)" /> -->
- <!-- <rect width="115" height="20" fill="#0f0" transform="translate(0 0)" /> -->
- <!-- <rect width="115" height="20" fill="#0f0" transform="translate(185 0)" /> -->
+ <!-- <polyline points="0,50 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(140 0)" /> -->
- <text class="title" x="114" y="19" font-size="12pt" letter-spacing="4px">FM-OP</text>
- <g transform="translate(110 374)">
+ <text class="title" x="39" y="19" font-size="12pt" letter-spacing="4px">FM-OP</text>
+ <g transform="translate(35.5 374)">
<text class="brand" font-size="8pt" letter-spacing="2px">BOGAUDIO</text>
<rect width="3.0" height="3" fill="#ddd" transform="translate(24 -5)" />
</g>
- <g transform="translate(10 50)">
- <g transform="translate(10 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">RATIO</text>
+ <g transform="translate(10 25)">
+ <!-- <rect width="78" height="68" fill="none" stroke="#0f0" /> -->
+ <g transform="translate(0 20)">
+ <!-- <polyline points="0,0 0,354" stroke="#0f0" stroke-width="1" fill="none" transform="translate(39 0)" /> -->
<use id="RATIO_PARAM" xlink:href="#knob" transform="translate(20 0)" />
</g>
- <g transform="translate(90 0)">
+ <use xlink:href="#knobguide-ratio" transform="translate(-10 0)" />
+ <g transform="translate(82 20)">
<text font-size="8pt" letter-spacing="2px" transform="translate(8 35) rotate(270)">FINE</text>
<use id="FINE_PARAM" xlink:href="#knob-smallest" transform="translate(20 12)" />
+ <!-- <polyline points="0,50 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(28 -100)" /> -->
</g>
+ <use xlink:href="#knobguide-centertick" transform="translate(90 20)" />
</g>
- <g transform="translate(10 130)">
- <g transform="translate(10 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">ATTACK</text>
+ <g transform="translate(87 92)">
+ <g transform="translate(0 0)">
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">ATT</text>
<use id="ATTACK_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
+ <!-- <rect width="30" height="18" fill="#0f0" transform="translate(20 26)" /> -->
</g>
- <g transform="translate(65 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 35) rotate(270)">DECAY</text>
+ <use xlink:href="#knobguide-time" transform="translate(10.5 -9.5)" />
+ <g transform="translate(0 43)">
+ <!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(-140 -10)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">DEC</text>
<use id="DECAY_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
+ <!-- <rect width="30" height="18" fill="#0f0" transform="translate(20 26)" /> -->
</g>
- <g transform="translate(120 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">SUSTAIN</text>
+ <use xlink:href="#knobguide-time" transform="translate(10.5 33.5)" />
+ <g transform="translate(0 86)">
+ <!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(-140 -10)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">SUS</text>
<use id="SUSTAIN_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
+ <!-- <rect width="30" height="18" fill="#0f0" transform="translate(20 26)" /> -->
</g>
- <g transform="translate(175 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">RELEASE</text>
+ <use xlink:href="#knobguide-linear" transform="translate(10.5 76.5)" />
+ <g transform="translate(0 129)">
+ <!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(-140 -10)" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">REL</text>
<use id="RELEASE_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
+ <!-- <rect width="30" height="18" fill="#0f0" transform="translate(20 26)" /> -->
</g>
+ <use xlink:href="#knobguide-time" transform="translate(10.5 119.5)" />
</g>
- <g transform="translate(20 160)">
- <g transform="translate(0 17.5)">
- <use id="BYPASS_LIGHT" xlink:href="#light" transform="translate(0 0)" />
- <text font-size="7pt" letter-spacing="2px" transform="translate(7 5)">BYPASS</text>
- </g>
- <use id="BYPASS_PARAM" xlink:href="#button-small" transform="translate(58 14.5)" />
- </g>
-
- <g transform="translate(10 215)">
- <g transform="translate(10 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 35) rotate(270)">DEPTH</text>
+ <g transform="translate(16 115)">
+ <g transform="translate(0 0)">
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 26) rotate(270)">FMD</text>
<use id="DEPTH_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
- <g transform="translate(65 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 45) rotate(270)">FEEDBACK</text>
+ <use xlink:href="#knobguide-linear" transform="translate(10.5 -9.5)" />
+ <g transform="translate(0 49)">
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">FBK</text>
<use id="FEEDBACK_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
- <g transform="translate(120 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 35) rotate(270)">LEVEL</text>
+ <use xlink:href="#knobguide-linear" transform="translate(10.5 39.5)" />
+ <g transform="translate(0 98)">
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 24) rotate(270)">LVL</text>
<use id="LEVEL_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
+ <use xlink:href="#knobguide-linear" transform="translate(10.5 88.5)" />
</g>
- <g transform="translate(0 270)">
- <g transform="translate(10 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="SUSTAIN_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(11.5 36)">S</text>
- </g>
- <g transform="translate(50 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="DEPTH_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(11.5 36)">D</text>
- </g>
- <g transform="translate(90 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="FEEDBACK_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(9 36)">FB</text>
- </g>
- <g transform="translate(130 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="LEVEL_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(11.5 36)">L</text>
- </g>
- <g transform="translate(255 17.5)">
- <use id="NEGATIVE_LIGHT" xlink:href="#light-red" transform="translate(0 0)" />
- <text font-size="7pt" letter-spacing="2px" transform="translate(7 5)">NEG</text>
+ <g transform="translate(15 241)">
+ <g transform="translate(0 17.5)">
+ <!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(0 3.3)" /> -->
+ <text font-size="6pt" letter-spacing="2px" transform="translate(0 6.2)">ENV:</text>
+ <g transform="translate(31 0)">
+ <use id="ENV_TO_LEVEL_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(10 6.2)">LVL</text>
+ <use id="ENV_TO_LEVEL_PARAM" xlink:href="#button-small" transform="translate(30 -1.2)" />
+ </g>
+ <g transform="translate(78 0)">
+ <use id="ENV_TO_FEEDBACK_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(10 6.2)">FBK</text>
+ <use id="ENV_TO_FEEDBACK_PARAM" xlink:href="#button-small" transform="translate(32 -1.2)" />
+ </g>
</g>
</g>
- <g transform="translate(0 320)">
- <g transform="translate(10 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="PITCH_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(1 36)">V/OCT</text>
- </g>
- <g transform="translate(50 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="GATE_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(3 36)">GATE</text>
+ <g transform="translate(0 269)">
+ <rect width="130" height="91" rx="5" fill="#bbb" transform="translate(10 0)" />
+ <rect width="97" height="91" rx="5" fill="#fafafa" transform="translate(10 0)" />
+ <rect width="130" height="44" rx="5" fill="#fafafa" transform="translate(10 0)" />
+ <rect width="10" height="10" fill="#fafafa" transform="translate(130 34)" />
+ <rect width="10" height="10" fill="#fafafa" transform="translate(97 81)" />
+
+ <g transform="translate(12 0)">
+ <use id="DEPTH_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5 40)">FMD</text>
</g>
- <g transform="translate(90 0)">
- <rect width="30" height="40" rx="5" fill="#fafafa" />
- <use id="FM_INPUT" xlink:href="#input" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(8.5 36)">FM</text>
+ <g transform="translate(44 0)">
+ <use id="FEEDBACK_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(9 40)">FB</text>
</g>
-
- <g transform="translate(180 0)">
- <rect width="30" height="40" rx="5" fill="#bbb" />
- <use id="PITCH_OUTPUT" xlink:href="#output" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(1 36)">V/OCT</text>
+ <g transform="translate(76 0)">
+ <use id="LEVEL_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(6 40)">LVL</text>
</g>
- <g transform="translate(220 0)">
- <rect width="30" height="40" rx="5" fill="#bbb" />
- <use id="GATE_OUTPUT" xlink:href="#output" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(3 36)">GATE</text>
+ <g transform="translate(108 0)">
+ <use id="SUSTAIN_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(6 40)">SUS</text>
</g>
- <g transform="translate(260 0)">
- <rect width="30" height="40" rx="5" fill="#bbb" />
- <use id="AUDIO_OUTPUT" xlink:href="#output" transform="translate(3 3)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(6 36)">OUT</text>
+
+ <g transform="translate(10 44)">
+ <g transform="translate(2 0)">
+ <use id="PITCH_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(1 40)">V/OCT</text>
+ </g>
+ <g transform="translate(34 0)">
+ <use id="GATE_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(3 40)">GATE</text>
+ </g>
+ <g transform="translate(66 0)">
+ <use id="FM_INPUT" xlink:href="#input" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(8.5 40)">FM</text>
+ </g>
+ <g transform="translate(98 0)">
+ <use id="AUDIO_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(6 40)">OUT</text>
+ </g>
</g>
</g>
</svg>
diff --git a/res/FMOp.svg b/res/FMOp.svg
Binary files differ.
diff --git a/src/FMOp.cpp b/src/FMOp.cpp
@@ -16,9 +16,9 @@ void FMOp::onSampleRateChange() {
}
void FMOp::step() {
- lights[BYPASS_LIGHT].value = !_envelopeOn;
- lights[NEGATIVE_LIGHT].value = 0.0f;
- if (!(outputs[PITCH_OUTPUT].active || outputs[GATE_OUTPUT].active || outputs[AUDIO_OUTPUT].active)) {
+ lights[ENV_TO_LEVEL_LIGHT].value = _levelEnvelopeOn;
+ lights[ENV_TO_FEEDBACK_LIGHT].value = _feedbackEnvelopeOn;
+ if (outputs[AUDIO_OUTPUT].active) {
return;
}
@@ -48,14 +48,14 @@ void FMOp::step() {
_baseHZ = cvToFrequency(_baseHZ);
_baseHZ *= ratio;
- bool envelopeOn = params[BYPASS_PARAM].value < 0.5f;
- if (_envelopeOn != envelopeOn) {
- if (_envelopeOn) {
+ bool levelEnvelopeOn = params[ENV_TO_LEVEL_PARAM].value < 0.5f;
+ if (_levelEnvelopeOn != levelEnvelopeOn) {
+ if (_levelEnvelopeOn) {
_envelope.reset();
}
- _envelopeOn = envelopeOn;
+ _levelEnvelopeOn = levelEnvelopeOn;
}
- if (_envelopeOn) {
+ if (_levelEnvelopeOn) {
float sustain = params[SUSTAIN_PARAM].value;
if (inputs[SUSTAIN_INPUT].active) {
sustain *= clamp(inputs[SUSTAIN_INPUT].value / 10.0f, 0.0f, 1.0f);
@@ -89,21 +89,18 @@ void FMOp::step() {
}
float out = _sineTable.nextFromPhasor(_phasor, Phasor::radiansToPhase(offset));
out *= _level;
- if (_envelopeOn) {
+ if (_levelEnvelopeOn) {
_gateTrigger.process(gateIn);
_envelope.setGate(_gateTrigger.isHigh());
out *= _envelope.next();
}
- lights[NEGATIVE_LIGHT].value = _phasor._delta + offset < 0.0f;
- outputs[PITCH_OUTPUT].value = pitchIn;
- outputs[GATE_OUTPUT].value = gateIn;
outputs[AUDIO_OUTPUT].value = out * 5.0f;
}
struct FMOpWidget : ModuleWidget {
FMOpWidget(FMOp* module) : ModuleWidget(module) {
- box.size = Vec(RACK_GRID_WIDTH * 20, RACK_GRID_HEIGHT);
+ box.size = Vec(RACK_GRID_WIDTH * 10, RACK_GRID_HEIGHT);
{
SVGPanel *panel = new SVGPanel();
@@ -118,31 +115,30 @@ struct FMOpWidget : ModuleWidget {
addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365)));
// generated by svg_widgets.rb
- auto ratioParamPosition = Vec(40.5, 50.5);
- auto fineParamPosition = Vec(120.0, 62.0);
- auto attackParamPosition = Vec(40.5, 130.5);
- auto decayParamPosition = Vec(95.5, 130.5);
- auto sustainParamPosition = Vec(150.5, 130.5);
- auto releaseParamPosition = Vec(205.5, 130.5);
- auto bypassParamPosition = Vec(78.0, 174.5);
- auto depthParamPosition = Vec(40.5, 215.5);
- auto feedbackParamPosition = Vec(95.5, 215.5);
- auto levelParamPosition = Vec(150.5, 215.5);
-
- auto sustainInputPosition = Vec(13.0, 273.0);
- auto depthInputPosition = Vec(53.0, 273.0);
- auto feedbackInputPosition = Vec(93.0, 273.0);
- auto levelInputPosition = Vec(133.0, 273.0);
- auto pitchInputPosition = Vec(13.0, 323.0);
- auto gateInputPosition = Vec(53.0, 323.0);
- auto fmInputPosition = Vec(93.0, 323.0);
-
- auto pitchOutputPosition = Vec(183.0, 323.0);
- auto gateOutputPosition = Vec(223.0, 323.0);
- auto audioOutputPosition = Vec(263.0, 323.0);
-
- auto bypassLightPosition = Vec(20.0, 177.5);
- auto negativeLightPosition = Vec(255.0, 287.5);
+ auto ratioParamPosition = Vec(30.5, 45.5);
+ auto fineParamPosition = Vec(112.0, 57.0);
+ auto attackParamPosition = Vec(107.5, 92.5);
+ auto decayParamPosition = Vec(107.5, 135.5);
+ auto sustainParamPosition = Vec(107.5, 178.5);
+ auto releaseParamPosition = Vec(107.5, 221.5);
+ auto depthParamPosition = Vec(36.5, 115.5);
+ auto feedbackParamPosition = Vec(36.5, 164.5);
+ auto levelParamPosition = Vec(36.5, 213.5);
+ auto envToLevelParamPosition = Vec(76.0, 257.3);
+ auto envToFeedbackParamPosition = Vec(125.0, 257.3);
+
+ auto depthInputPosition = Vec(15.0, 274.0);
+ auto feedbackInputPosition = Vec(47.0, 274.0);
+ auto levelInputPosition = Vec(79.0, 274.0);
+ auto sustainInputPosition = Vec(111.0, 274.0);
+ auto pitchInputPosition = Vec(15.0, 318.0);
+ auto gateInputPosition = Vec(47.0, 318.0);
+ auto fmInputPosition = Vec(79.0, 318.0);
+
+ auto audioOutputPosition = Vec(111.0, 318.0);
+
+ auto envToLevelLightPosition = Vec(46.0, 258.5);
+ auto envToFeedbackLightPosition = Vec(93.0, 258.5);
// end generated by svg_widgets.rb
addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, FMOp::RATIO_PARAM, -1.0, 1.0, 0.0));
@@ -151,10 +147,11 @@ struct FMOpWidget : ModuleWidget {
addParam(ParamWidget::create<Knob26>(decayParamPosition, module, FMOp::DECAY_PARAM, 0.0, 1.0, 0.1));
addParam(ParamWidget::create<Knob26>(sustainParamPosition, module, FMOp::SUSTAIN_PARAM, 0.0, 1.0, 1.0));
addParam(ParamWidget::create<Knob26>(releaseParamPosition, module, FMOp::RELEASE_PARAM, 0.0, 1.0, 0.3));
- addParam(ParamWidget::create<StatefulButton9>(bypassParamPosition, module, FMOp::BYPASS_PARAM, 0.0, 1.0, 1.0));
addParam(ParamWidget::create<Knob26>(depthParamPosition, module, FMOp::DEPTH_PARAM, 0.0, 1.0, 0.5));
addParam(ParamWidget::create<Knob26>(feedbackParamPosition, module, FMOp::FEEDBACK_PARAM, 0.0, 1.0, 0.0));
addParam(ParamWidget::create<Knob26>(levelParamPosition, module, FMOp::LEVEL_PARAM, 0.0, 1.0, 1.0));
+ addParam(ParamWidget::create<StatefulButton9>(envToLevelParamPosition, module, FMOp::ENV_TO_LEVEL_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<StatefulButton9>(envToFeedbackParamPosition, module, FMOp::ENV_TO_FEEDBACK_PARAM, 0.0, 1.0, 0.0));
addInput(Port::create<Port24>(sustainInputPosition, Port::INPUT, module, FMOp::SUSTAIN_INPUT));
addInput(Port::create<Port24>(depthInputPosition, Port::INPUT, module, FMOp::DEPTH_INPUT));
@@ -164,12 +161,10 @@ struct FMOpWidget : ModuleWidget {
addInput(Port::create<Port24>(gateInputPosition, Port::INPUT, module, FMOp::GATE_INPUT));
addInput(Port::create<Port24>(fmInputPosition, Port::INPUT, module, FMOp::FM_INPUT));
- addOutput(Port::create<Port24>(pitchOutputPosition, Port::OUTPUT, module, FMOp::PITCH_OUTPUT));
- addOutput(Port::create<Port24>(gateOutputPosition, Port::OUTPUT, module, FMOp::GATE_OUTPUT));
addOutput(Port::create<Port24>(audioOutputPosition, Port::OUTPUT, module, FMOp::AUDIO_OUTPUT));
- addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(bypassLightPosition, module, FMOp::BYPASS_LIGHT));
- addChild(ModuleLightWidget::create<TinyLight<RedLight>>(negativeLightPosition, module, FMOp::NEGATIVE_LIGHT));
+ addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToLevelLightPosition, module, FMOp::ENV_TO_LEVEL_LIGHT));
+ addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToFeedbackLightPosition, module, FMOp::ENV_TO_FEEDBACK_LIGHT));
}
};
diff --git a/src/FMOp.hpp b/src/FMOp.hpp
@@ -18,10 +18,11 @@ struct FMOp : Module {
DECAY_PARAM,
SUSTAIN_PARAM,
RELEASE_PARAM,
- BYPASS_PARAM,
DEPTH_PARAM,
FEEDBACK_PARAM,
LEVEL_PARAM,
+ ENV_TO_LEVEL_PARAM,
+ ENV_TO_FEEDBACK_PARAM,
NUM_PARAMS
};
@@ -37,15 +38,13 @@ struct FMOp : Module {
};
enum OutputsIds {
- PITCH_OUTPUT,
- GATE_OUTPUT,
AUDIO_OUTPUT,
NUM_OUTPUTS
};
enum LightsIds {
- BYPASS_LIGHT,
- NEGATIVE_LIGHT,
+ ENV_TO_LEVEL_LIGHT,
+ ENV_TO_FEEDBACK_LIGHT,
NUM_LIGHTS
};
@@ -55,7 +54,8 @@ struct FMOp : Module {
float _feedback = 0.0f;
float _depth = 0.0f;
float _level = 0.0f;
- bool _envelopeOn = false;
+ bool _levelEnvelopeOn = false;
+ bool _feedbackEnvelopeOn = false;
ADSR _envelope;
Phasor _phasor;
SineTableOscillator _sineTable;
