BogaudioModules

BogaudioModules for VCV Rack
Log | Files | Refs | README | LICENSE

commit d47513f904543d5b96d476a9157f4e7b3914512c
parent 3bf0a9d75857d03983cd27fe6576421a9476272e
Author: Matt Demanett <matt@demanett.net>
Date:   Sat,  8 Aug 2020 21:26:54 -0400

Merge branch 'master' of github.com:bogaudio/BogaudioModules

Diffstat:
Mres-pp/SampleHold-dark-pp.svg | 8++++----
Mres-pp/SampleHold-lowcontrast-pp.svg | 8++++----
Mres-pp/SampleHold-pp.svg | 8++++----
Mres-pp/Switch-dark-pp.svg | 4++--
Mres-pp/Switch-lowcontrast-pp.svg | 4++--
Mres-pp/Switch-pp.svg | 4++--
Mres-src/SampleHold-src.svg | 8++++----
Mres-src/Switch-src.svg | 4++--
Mres/SampleHold-dark.svg | 0
Mres/SampleHold-lowcontrast.svg | 0
Mres/SampleHold.svg | 0
Mres/Switch-dark.svg | 0
Mres/Switch-lowcontrast.svg | 0
Mres/Switch.svg | 0
Mres/skin_css_values.json | 0
Mscripts/open_module.rb | 20++++++++------------
Msrc/module.cpp | 8+++++++-
Msrc/skins.cpp | 2+-
Msrc/widgets.hpp | 1+
19 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/res-pp/SampleHold-dark-pp.svg b/res-pp/SampleHold-dark-pp.svg @@ -189,7 +189,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -198,7 +198,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -256,7 +256,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -265,7 +265,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> diff --git a/res-pp/SampleHold-lowcontrast-pp.svg b/res-pp/SampleHold-lowcontrast-pp.svg @@ -189,7 +189,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -198,7 +198,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -256,7 +256,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -265,7 +265,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> diff --git a/res-pp/SampleHold-pp.svg b/res-pp/SampleHold-pp.svg @@ -125,7 +125,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -134,7 +134,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT1_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -192,7 +192,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <g transform="translate(17 -1.3)"><svg id="TRACK2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> @@ -201,7 +201,7 @@ polyline.knob-tick { </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <g transform="translate(17 -1.3)"><svg id="INVERT2_PARAM"> <g transform="translate(4.5 4.5)"> <circle r="4" stroke-width="1" stroke="#00f" fill="#f00"/> diff --git a/res-pp/Switch-dark-pp.svg b/res-pp/Switch-dark-pp.svg @@ -201,7 +201,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW1_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> @@ -241,7 +241,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW2_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> diff --git a/res-pp/Switch-lowcontrast-pp.svg b/res-pp/Switch-lowcontrast-pp.svg @@ -201,7 +201,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW1_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> @@ -241,7 +241,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW2_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> diff --git a/res-pp/Switch-pp.svg b/res-pp/Switch-pp.svg @@ -137,7 +137,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW1_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> @@ -177,7 +177,7 @@ polyline.knob-tick { <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none"/> </g> </svg></g> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <g transform="translate(2 29.3)"><svg id="LOW2_LIGHT"> <rect width="6.4" height="6.4" fill="#0f0"/> </svg></g> diff --git a/res-src/SampleHold-src.svg b/res-src/SampleHold-src.svg @@ -26,12 +26,12 @@ </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <def id="TRACK1_PARAM" xlink:href="#button-small" transform="translate(17 -1.3)"/> </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <def id="INVERT1_PARAM" xlink:href="#button-small" transform="translate(17 -1.3)"/> </g> @@ -66,12 +66,12 @@ </g> <g transform="translate(9.5 41)"> - <text font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> + <text class="input-label" font-size="5pt" letter-spacing="1px" transform="translate(0 5.5)">TRK</text> <def id="TRACK2_PARAM" xlink:href="#button-small" transform="translate(17 -1.3)"/> </g> <g transform="translate(9.5 52)"> - <text font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> + <text class="input-label" font-size="5pt" letter-spacing="1.2px" transform="translate(1 5.5)">INV</text> <def id="INVERT2_PARAM" xlink:href="#button-small" transform="translate(17 -1.3)"/> </g> diff --git a/res-src/Switch-src.svg b/res-src/Switch-src.svg @@ -27,7 +27,7 @@ </g> <g transform="translate(5.5 36)"> <def id="LOW1_INPUT" xlink:href="#input" transform="translate(5 3)"/> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <def id="LOW1_LIGHT" xlink:href="#light-small" transform="translate(2 29.3)"/> </g> <g class="io-group" transform="translate(5.5 77)"> @@ -48,7 +48,7 @@ </g> <g transform="translate(5.5 36)"> <def id="LOW2_INPUT" xlink:href="#input" transform="translate(5 3)"/> - <text font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> + <text class="input-label" font-size="5pt" letter-spacing="2px" transform="translate(11.0 35)">LOW</text> <def id="LOW2_LIGHT" xlink:href="#light-small" transform="translate(2 29.3)"/> </g> <g class="io-group" transform="translate(5.5 77)"> diff --git a/res/SampleHold-dark.svg b/res/SampleHold-dark.svg Binary files differ. diff --git a/res/SampleHold-lowcontrast.svg b/res/SampleHold-lowcontrast.svg Binary files differ. diff --git a/res/SampleHold.svg b/res/SampleHold.svg Binary files differ. diff --git a/res/Switch-dark.svg b/res/Switch-dark.svg Binary files differ. diff --git a/res/Switch-lowcontrast.svg b/res/Switch-lowcontrast.svg Binary files differ. diff --git a/res/Switch.svg b/res/Switch.svg Binary files differ. diff --git a/res/skin_css_values.json b/res/skin_css_values.json Binary files differ. diff --git a/scripts/open_module.rb b/scripts/open_module.rb @@ -3,16 +3,12 @@ require 'optparse' options = { - skin: [], - skins_only: false + skins: false } option_parser = OptionParser.new do |opts| opts.banner = "Usage: #{$0} [options] [module slug, or any module .svg or source file]" - opts.on('--skin=[skin name]', 'Open the res-pp/ file for the given skin along with everything else') do |v| - options[:skin] << v if v - end - opts.on('-o', '--skins_only', 'Only open specified skins (not default)') do - options[:skins_only] = true + opts.on('--skins', 'Open the skin res-pp/ files along with everything else') do + options[:skins] = true end opts.on_tail('-h', '--help', 'Show this message') do puts opts @@ -56,11 +52,11 @@ def open(d, f) end open('res-src', "#{slug}-src.svg") -unless options[:skins_only] - open('res-pp', "#{slug}-pp.svg") -end -options[:skin].each do |skin| - open('res-pp', "#{slug}-#{skin}-pp.svg") +open('res-pp', "#{slug}-pp.svg") +if options[:skins] + Dir.glob(File.absolute_path(File.join(File.dirname($0), '..', 'res-pp', "#{slug}-*-pp.svg"))).each do |fn| + open('res-pp', File.basename(fn)) + end end open('src', "#{slug}.hpp") open('src', "#{slug}.cpp") diff --git a/src/module.cpp b/src/module.cpp @@ -221,12 +221,18 @@ void BGModuleWidget::createScrews() { this->addChild(w); }; - if (hp > 8) { + if (hp > 13) { screw(Vec(15, 0)); screw(Vec(box.size.x - 30, 0)); screw(Vec(15, 365)); screw(Vec(box.size.x - 30, 365)); } + else if (hp > 8) { + screw(Vec(0, 0)); + screw(Vec(box.size.x - 15, 0)); + screw(Vec(0, 365)); + screw(Vec(box.size.x - 15, 365)); + } else { screw(Vec(0, 0)); screw(Vec(box.size.x - 15, 365)); diff --git a/src/skins.cpp b/src/skins.cpp @@ -101,7 +101,7 @@ void Skins::loadSkins() { _available.push_back(Skin("lowcontrast", "Dark (low-contrast)")); _default = "light"; - std::string path = rack::asset::user("BogaudioModules.json"); + std::string path = rack::asset::user("Bogaudio.json"); if (access(path.c_str(), R_OK) != 0) { return; } diff --git a/src/widgets.hpp b/src/widgets.hpp @@ -120,6 +120,7 @@ struct StatefulButton : ParamWidget { void randomize() override; void onDragStart(const event::DragStart& e) override; void onDragEnd(const event::DragEnd& e) override; + void onDoubleClick(const event::DoubleClick& e) override {} }; struct StatefulButton9 : StatefulButton {