From d3166352ec2cc59af9d35188359fcfed8e7e7007 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 9 Nov 2021 17:15:55 -0500 Subject: [PATCH] Move components and panels to their own res/ subdir. Add component license to LICENSE.md. --- LICENSE.md | 7 ++- README.md | 2 + res/{ => components}/BananutBlack.svg | 0 res/{ => components}/BananutRed.svg | 0 res/{ => components}/BefacoButton_0.svg | 0 res/{ => components}/BefacoButton_1.svg | 0 res/{ => components}/BefacoSwitchHoriz_0.svg | 0 res/{ => components}/BefacoSwitchHoriz_1.svg | 0 res/{ => components}/BefacoSwitchHoriz_2.svg | 0 .../BefacoTinyKnobBlack_bg.svg | 0 .../BefacoTinyKnobDarkGrey_bg.svg | 0 .../BefacoTinyKnobLightGrey_bg.svg | 0 res/{ => components}/BefacoTinyKnobRed_bg.svg | 0 res/{ => components}/BefacoTinyPointWhite.svg | 0 res/{ => components}/CrossfaderBackground.svg | 0 res/{ => components}/CrossfaderHandle.svg | 0 res/{ => components}/Davies1900hBlack.svg | 0 res/{ => components}/Davies1900hDarkGrey.svg | 0 .../Davies1900hDarkGrey_bg.svg | 0 res/{ => components}/Davies1900hLargeGrey.svg | 0 .../Davies1900hLargeGrey_bg.svg | 0 res/{ => components}/Davies1900hLightGrey.svg | 0 .../Davies1900hLightGrey_bg.svg | 0 res/{ => components}/Knurlie.svg | 0 res/{ => components}/SwitchNarrow_0.svg | 0 res/{ => components}/SwitchNarrow_1.svg | 0 res/{ => panels}/ABC.svg | 0 res/{ => panels}/ADSR.svg | 0 res/{ => panels}/ChoppingKinky.svg | 0 res/{ => panels}/DualAtenuverter.svg | 0 res/{ => panels}/EvenVCO.svg | 0 res/{ => panels}/HexmixVCA.svg | 0 res/{ => panels}/Kickall.svg | 0 res/{ => panels}/Mex.svg | 0 res/{ => panels}/Mixer.svg | 0 res/{ => panels}/Morphader.svg | 0 res/{ => panels}/Muxlicer.svg | 0 res/{ => panels}/Percall.svg | 0 res/{ => panels}/Rampage.svg | 0 res/{ => panels}/STMix.svg | 0 res/{ => panels}/SamplingModulator.svg | 0 res/{ => panels}/SlewLimiter.svg | 0 res/{ => panels}/SpringReverb.svg | 0 src/ABC.cpp | 2 +- src/ADSR.cpp | 2 +- src/ChoppingKinky.cpp | 2 +- src/DualAtenuverter.cpp | 2 +- src/EvenVCO.cpp | 2 +- src/HexmixVCA.cpp | 2 +- src/Kickall.cpp | 2 +- src/Mex.cpp | 2 +- src/Mixer.cpp | 2 +- src/Morphader.cpp | 2 +- src/Muxlicer.hpp | 2 +- src/Percall.cpp | 2 +- src/Rampage.cpp | 2 +- src/STMix.cpp | 2 +- src/SamplingModulator.cpp | 2 +- src/SlewLimiter.cpp | 2 +- src/SpringReverb.cpp | 2 +- src/plugin.hpp | 46 +++++++++---------- 61 files changed, 47 insertions(+), 42 deletions(-) rename res/{ => components}/BananutBlack.svg (100%) rename res/{ => components}/BananutRed.svg (100%) rename res/{ => components}/BefacoButton_0.svg (100%) rename res/{ => components}/BefacoButton_1.svg (100%) rename res/{ => components}/BefacoSwitchHoriz_0.svg (100%) rename res/{ => components}/BefacoSwitchHoriz_1.svg (100%) rename res/{ => components}/BefacoSwitchHoriz_2.svg (100%) rename res/{ => components}/BefacoTinyKnobBlack_bg.svg (100%) rename res/{ => components}/BefacoTinyKnobDarkGrey_bg.svg (100%) rename res/{ => components}/BefacoTinyKnobLightGrey_bg.svg (100%) rename res/{ => components}/BefacoTinyKnobRed_bg.svg (100%) rename res/{ => components}/BefacoTinyPointWhite.svg (100%) rename res/{ => components}/CrossfaderBackground.svg (100%) rename res/{ => components}/CrossfaderHandle.svg (100%) rename res/{ => components}/Davies1900hBlack.svg (100%) rename res/{ => components}/Davies1900hDarkGrey.svg (100%) rename res/{ => components}/Davies1900hDarkGrey_bg.svg (100%) rename res/{ => components}/Davies1900hLargeGrey.svg (100%) rename res/{ => components}/Davies1900hLargeGrey_bg.svg (100%) rename res/{ => components}/Davies1900hLightGrey.svg (100%) rename res/{ => components}/Davies1900hLightGrey_bg.svg (100%) rename res/{ => components}/Knurlie.svg (100%) rename res/{ => components}/SwitchNarrow_0.svg (100%) rename res/{ => components}/SwitchNarrow_1.svg (100%) rename res/{ => panels}/ABC.svg (100%) rename res/{ => panels}/ADSR.svg (100%) rename res/{ => panels}/ChoppingKinky.svg (100%) rename res/{ => panels}/DualAtenuverter.svg (100%) rename res/{ => panels}/EvenVCO.svg (100%) rename res/{ => panels}/HexmixVCA.svg (100%) rename res/{ => panels}/Kickall.svg (100%) rename res/{ => panels}/Mex.svg (100%) rename res/{ => panels}/Mixer.svg (100%) rename res/{ => panels}/Morphader.svg (100%) rename res/{ => panels}/Muxlicer.svg (100%) rename res/{ => panels}/Percall.svg (100%) rename res/{ => panels}/Rampage.svg (100%) rename res/{ => panels}/STMix.svg (100%) rename res/{ => panels}/SamplingModulator.svg (100%) rename res/{ => panels}/SlewLimiter.svg (100%) rename res/{ => panels}/SpringReverb.svg (100%) diff --git a/LICENSE.md b/LICENSE.md index f1ef771..21399cd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,8 @@ -All **source code** is copyright © 2019-2020 Andrew Belt and Befaco contributers. +All **source code** is copyright © 2019-2021 [VCV](https://vcvrack.com/) and contributers. This program is free software: you can redistribute it and/or modify it under the terms of the [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html) as published by the [Free Software Foundation](https://www.fsf.org/), either version 3 of the License, or (at your option) any later version. -The **panel graphics** in the `res/` directory are copyright © Befaco and are used and distributed with permission. +The **panel graphics** in the `res/panels/` directory are copyright © [Befaco](https://www.befaco.org/) and are used and distributed with permission. + +The **component graphics** in the `res/components/` directory are copyright © [VCV](https://vcvrack.com/) and licensed under [CC BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/). +Non-commercial use is allowed with appropriate credit and indication of the original license. diff --git a/README.md b/README.md index 69eee2d..875d962 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Based on [Befaco](http://www.befaco.org/) Eurorack modules. [VCV Library page](https://library.vcvrack.com/Befaco) +[License](LICENSE.md) + ## Differences with hardware diff --git a/res/BananutBlack.svg b/res/components/BananutBlack.svg similarity index 100% rename from res/BananutBlack.svg rename to res/components/BananutBlack.svg diff --git a/res/BananutRed.svg b/res/components/BananutRed.svg similarity index 100% rename from res/BananutRed.svg rename to res/components/BananutRed.svg diff --git a/res/BefacoButton_0.svg b/res/components/BefacoButton_0.svg similarity index 100% rename from res/BefacoButton_0.svg rename to res/components/BefacoButton_0.svg diff --git a/res/BefacoButton_1.svg b/res/components/BefacoButton_1.svg similarity index 100% rename from res/BefacoButton_1.svg rename to res/components/BefacoButton_1.svg diff --git a/res/BefacoSwitchHoriz_0.svg b/res/components/BefacoSwitchHoriz_0.svg similarity index 100% rename from res/BefacoSwitchHoriz_0.svg rename to res/components/BefacoSwitchHoriz_0.svg diff --git a/res/BefacoSwitchHoriz_1.svg b/res/components/BefacoSwitchHoriz_1.svg similarity index 100% rename from res/BefacoSwitchHoriz_1.svg rename to res/components/BefacoSwitchHoriz_1.svg diff --git a/res/BefacoSwitchHoriz_2.svg b/res/components/BefacoSwitchHoriz_2.svg similarity index 100% rename from res/BefacoSwitchHoriz_2.svg rename to res/components/BefacoSwitchHoriz_2.svg diff --git a/res/BefacoTinyKnobBlack_bg.svg b/res/components/BefacoTinyKnobBlack_bg.svg similarity index 100% rename from res/BefacoTinyKnobBlack_bg.svg rename to res/components/BefacoTinyKnobBlack_bg.svg diff --git a/res/BefacoTinyKnobDarkGrey_bg.svg b/res/components/BefacoTinyKnobDarkGrey_bg.svg similarity index 100% rename from res/BefacoTinyKnobDarkGrey_bg.svg rename to res/components/BefacoTinyKnobDarkGrey_bg.svg diff --git a/res/BefacoTinyKnobLightGrey_bg.svg b/res/components/BefacoTinyKnobLightGrey_bg.svg similarity index 100% rename from res/BefacoTinyKnobLightGrey_bg.svg rename to res/components/BefacoTinyKnobLightGrey_bg.svg diff --git a/res/BefacoTinyKnobRed_bg.svg b/res/components/BefacoTinyKnobRed_bg.svg similarity index 100% rename from res/BefacoTinyKnobRed_bg.svg rename to res/components/BefacoTinyKnobRed_bg.svg diff --git a/res/BefacoTinyPointWhite.svg b/res/components/BefacoTinyPointWhite.svg similarity index 100% rename from res/BefacoTinyPointWhite.svg rename to res/components/BefacoTinyPointWhite.svg diff --git a/res/CrossfaderBackground.svg b/res/components/CrossfaderBackground.svg similarity index 100% rename from res/CrossfaderBackground.svg rename to res/components/CrossfaderBackground.svg diff --git a/res/CrossfaderHandle.svg b/res/components/CrossfaderHandle.svg similarity index 100% rename from res/CrossfaderHandle.svg rename to res/components/CrossfaderHandle.svg diff --git a/res/Davies1900hBlack.svg b/res/components/Davies1900hBlack.svg similarity index 100% rename from res/Davies1900hBlack.svg rename to res/components/Davies1900hBlack.svg diff --git a/res/Davies1900hDarkGrey.svg b/res/components/Davies1900hDarkGrey.svg similarity index 100% rename from res/Davies1900hDarkGrey.svg rename to res/components/Davies1900hDarkGrey.svg diff --git a/res/Davies1900hDarkGrey_bg.svg b/res/components/Davies1900hDarkGrey_bg.svg similarity index 100% rename from res/Davies1900hDarkGrey_bg.svg rename to res/components/Davies1900hDarkGrey_bg.svg diff --git a/res/Davies1900hLargeGrey.svg b/res/components/Davies1900hLargeGrey.svg similarity index 100% rename from res/Davies1900hLargeGrey.svg rename to res/components/Davies1900hLargeGrey.svg diff --git a/res/Davies1900hLargeGrey_bg.svg b/res/components/Davies1900hLargeGrey_bg.svg similarity index 100% rename from res/Davies1900hLargeGrey_bg.svg rename to res/components/Davies1900hLargeGrey_bg.svg diff --git a/res/Davies1900hLightGrey.svg b/res/components/Davies1900hLightGrey.svg similarity index 100% rename from res/Davies1900hLightGrey.svg rename to res/components/Davies1900hLightGrey.svg diff --git a/res/Davies1900hLightGrey_bg.svg b/res/components/Davies1900hLightGrey_bg.svg similarity index 100% rename from res/Davies1900hLightGrey_bg.svg rename to res/components/Davies1900hLightGrey_bg.svg diff --git a/res/Knurlie.svg b/res/components/Knurlie.svg similarity index 100% rename from res/Knurlie.svg rename to res/components/Knurlie.svg diff --git a/res/SwitchNarrow_0.svg b/res/components/SwitchNarrow_0.svg similarity index 100% rename from res/SwitchNarrow_0.svg rename to res/components/SwitchNarrow_0.svg diff --git a/res/SwitchNarrow_1.svg b/res/components/SwitchNarrow_1.svg similarity index 100% rename from res/SwitchNarrow_1.svg rename to res/components/SwitchNarrow_1.svg diff --git a/res/ABC.svg b/res/panels/ABC.svg similarity index 100% rename from res/ABC.svg rename to res/panels/ABC.svg diff --git a/res/ADSR.svg b/res/panels/ADSR.svg similarity index 100% rename from res/ADSR.svg rename to res/panels/ADSR.svg diff --git a/res/ChoppingKinky.svg b/res/panels/ChoppingKinky.svg similarity index 100% rename from res/ChoppingKinky.svg rename to res/panels/ChoppingKinky.svg diff --git a/res/DualAtenuverter.svg b/res/panels/DualAtenuverter.svg similarity index 100% rename from res/DualAtenuverter.svg rename to res/panels/DualAtenuverter.svg diff --git a/res/EvenVCO.svg b/res/panels/EvenVCO.svg similarity index 100% rename from res/EvenVCO.svg rename to res/panels/EvenVCO.svg diff --git a/res/HexmixVCA.svg b/res/panels/HexmixVCA.svg similarity index 100% rename from res/HexmixVCA.svg rename to res/panels/HexmixVCA.svg diff --git a/res/Kickall.svg b/res/panels/Kickall.svg similarity index 100% rename from res/Kickall.svg rename to res/panels/Kickall.svg diff --git a/res/Mex.svg b/res/panels/Mex.svg similarity index 100% rename from res/Mex.svg rename to res/panels/Mex.svg diff --git a/res/Mixer.svg b/res/panels/Mixer.svg similarity index 100% rename from res/Mixer.svg rename to res/panels/Mixer.svg diff --git a/res/Morphader.svg b/res/panels/Morphader.svg similarity index 100% rename from res/Morphader.svg rename to res/panels/Morphader.svg diff --git a/res/Muxlicer.svg b/res/panels/Muxlicer.svg similarity index 100% rename from res/Muxlicer.svg rename to res/panels/Muxlicer.svg diff --git a/res/Percall.svg b/res/panels/Percall.svg similarity index 100% rename from res/Percall.svg rename to res/panels/Percall.svg diff --git a/res/Rampage.svg b/res/panels/Rampage.svg similarity index 100% rename from res/Rampage.svg rename to res/panels/Rampage.svg diff --git a/res/STMix.svg b/res/panels/STMix.svg similarity index 100% rename from res/STMix.svg rename to res/panels/STMix.svg diff --git a/res/SamplingModulator.svg b/res/panels/SamplingModulator.svg similarity index 100% rename from res/SamplingModulator.svg rename to res/panels/SamplingModulator.svg diff --git a/res/SlewLimiter.svg b/res/panels/SlewLimiter.svg similarity index 100% rename from res/SlewLimiter.svg rename to res/panels/SlewLimiter.svg diff --git a/res/SpringReverb.svg b/res/panels/SpringReverb.svg similarity index 100% rename from res/SpringReverb.svg rename to res/panels/SpringReverb.svg diff --git a/src/ABC.cpp b/src/ABC.cpp index cc6c6f1..ec9aa17 100644 --- a/src/ABC.cpp +++ b/src/ABC.cpp @@ -114,7 +114,7 @@ struct ABC : Module { struct ABCWidget : ModuleWidget { ABCWidget(ABC* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ABC.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/ABC.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/ADSR.cpp b/src/ADSR.cpp index c7e09e5..b65b756 100644 --- a/src/ADSR.cpp +++ b/src/ADSR.cpp @@ -304,7 +304,7 @@ struct ADSR : Module { struct ADSRWidget : ModuleWidget { ADSRWidget(ADSR* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ADSR.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/ADSR.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/ChoppingKinky.cpp b/src/ChoppingKinky.cpp index 64d5559..b66481f 100644 --- a/src/ChoppingKinky.cpp +++ b/src/ChoppingKinky.cpp @@ -306,7 +306,7 @@ struct ChoppingKinky : Module { struct ChoppingKinkyWidget : ModuleWidget { ChoppingKinkyWidget(ChoppingKinky* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ChoppingKinky.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/ChoppingKinky.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/DualAtenuverter.cpp b/src/DualAtenuverter.cpp index 998f445..46c8f77 100644 --- a/src/DualAtenuverter.cpp +++ b/src/DualAtenuverter.cpp @@ -99,7 +99,7 @@ struct DualAtenuverter : Module { struct DualAtenuverterWidget : ModuleWidget { DualAtenuverterWidget(DualAtenuverter* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DualAtenuverter.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/DualAtenuverter.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/EvenVCO.cpp b/src/EvenVCO.cpp index 32182da..4a05058 100644 --- a/src/EvenVCO.cpp +++ b/src/EvenVCO.cpp @@ -215,7 +215,7 @@ struct EvenVCO : Module { struct EvenVCOWidget : ModuleWidget { EvenVCOWidget(EvenVCO* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EvenVCO.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/EvenVCO.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/HexmixVCA.cpp b/src/HexmixVCA.cpp index dc53a4d..eeb2c1d 100644 --- a/src/HexmixVCA.cpp +++ b/src/HexmixVCA.cpp @@ -146,7 +146,7 @@ struct HexmixVCA : Module { struct HexmixVCAWidget : ModuleWidget { HexmixVCAWidget(HexmixVCA* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/HexmixVCA.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/HexmixVCA.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/Kickall.cpp b/src/Kickall.cpp index 10dbc24..ba4067c 100644 --- a/src/Kickall.cpp +++ b/src/Kickall.cpp @@ -127,7 +127,7 @@ struct Kickall : Module { struct KickallWidget : ModuleWidget { KickallWidget(Kickall* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Kickall.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Kickall.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); diff --git a/src/Mex.cpp b/src/Mex.cpp index 6ceb64f..0d55d9e 100644 --- a/src/Mex.cpp +++ b/src/Mex.cpp @@ -97,7 +97,7 @@ struct Mex : Module { struct MexWidget : ModuleWidget { MexWidget(Mex* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mex.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Mex.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); diff --git a/src/Mixer.cpp b/src/Mixer.cpp index 9574fd0..7b813fc 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -106,7 +106,7 @@ struct Mixer : Module { struct MixerWidget : ModuleWidget { MixerWidget(Mixer* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mixer.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Mixer.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/Morphader.cpp b/src/Morphader.cpp index 9bfd636..608c1c4 100644 --- a/src/Morphader.cpp +++ b/src/Morphader.cpp @@ -232,7 +232,7 @@ struct Morphader : Module { struct MorphaderWidget : ModuleWidget { MorphaderWidget(Morphader* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Morphader.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Morphader.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/Muxlicer.hpp b/src/Muxlicer.hpp index 1208512..e9fdfd8 100644 --- a/src/Muxlicer.hpp +++ b/src/Muxlicer.hpp @@ -702,7 +702,7 @@ struct MuxlicerWidget : ModuleWidget { MuxlicerWidget(Muxlicer* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Muxlicer.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Muxlicer.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/Percall.cpp b/src/Percall.cpp index 52388a3..86c1e56 100644 --- a/src/Percall.cpp +++ b/src/Percall.cpp @@ -171,7 +171,7 @@ struct Percall : Module { struct PercallWidget : ModuleWidget { PercallWidget(Percall* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Percall.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Percall.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/Rampage.cpp b/src/Rampage.cpp index cf923a9..8b2f959 100644 --- a/src/Rampage.cpp +++ b/src/Rampage.cpp @@ -343,7 +343,7 @@ struct Rampage : Module { struct RampageWidget : ModuleWidget { RampageWidget(Rampage* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Rampage.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Rampage.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x - 30, 0))); diff --git a/src/STMix.cpp b/src/STMix.cpp index 74d175f..fb7f245 100644 --- a/src/STMix.cpp +++ b/src/STMix.cpp @@ -105,7 +105,7 @@ struct STMix : Module { struct STMixWidget : ModuleWidget { STMixWidget(STMix* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/STMix.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/STMix.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); diff --git a/src/SamplingModulator.cpp b/src/SamplingModulator.cpp index a802e5b..69730ca 100644 --- a/src/SamplingModulator.cpp +++ b/src/SamplingModulator.cpp @@ -217,7 +217,7 @@ struct SamplingModulator : Module { struct SamplingModulatorWidget : ModuleWidget { SamplingModulatorWidget(SamplingModulator* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SamplingModulator.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/SamplingModulator.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/SlewLimiter.cpp b/src/SlewLimiter.cpp index 7034149..f6c5e08 100644 --- a/src/SlewLimiter.cpp +++ b/src/SlewLimiter.cpp @@ -91,7 +91,7 @@ struct SlewLimiter : Module { struct SlewLimiterWidget : ModuleWidget { SlewLimiterWidget(SlewLimiter* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SlewLimiter.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/SlewLimiter.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/SpringReverb.cpp b/src/SpringReverb.cpp index dff907b..1194787 100644 --- a/src/SpringReverb.cpp +++ b/src/SpringReverb.cpp @@ -150,7 +150,7 @@ struct SpringReverb : Module { struct SpringReverbWidget : ModuleWidget { SpringReverbWidget(SpringReverb* module) { setModule(module); - setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SpringReverb.svg"))); + setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/SpringReverb.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(15, 365))); diff --git a/src/plugin.hpp b/src/plugin.hpp index 2792255..f1d1729 100644 --- a/src/plugin.hpp +++ b/src/plugin.hpp @@ -28,7 +28,7 @@ extern Model* modelMex; struct Knurlie : SvgScrew { Knurlie() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/Knurlie.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Knurlie.svg"))); } }; @@ -38,49 +38,49 @@ struct BefacoTinyKnobWhite : BefacoTinyKnob { struct BefacoTinyKnobRed : BefacoTinyKnob { BefacoTinyKnobRed() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyPointWhite.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyKnobRed_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyPointWhite.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyKnobRed_bg.svg"))); } }; struct BefacoTinyKnobDarkGrey : BefacoTinyKnob { BefacoTinyKnobDarkGrey() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyPointWhite.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyKnobDarkGrey_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyPointWhite.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyKnobDarkGrey_bg.svg"))); } }; struct BefacoTinyKnobLightGrey : BefacoTinyKnob { BefacoTinyKnobLightGrey() { - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyKnobLightGrey_bg.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyKnobLightGrey_bg.svg"))); } }; struct BefacoTinyKnobBlack : BefacoTinyKnob { BefacoTinyKnobBlack() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyPointWhite.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/BefacoTinyKnobBlack_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyPointWhite.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoTinyKnobBlack_bg.svg"))); } }; struct Davies1900hLargeGreyKnob : Davies1900hKnob { Davies1900hLargeGreyKnob() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hLargeGrey.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hLargeGrey_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hLargeGrey.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hLargeGrey_bg.svg"))); } }; struct Davies1900hLightGreyKnob : Davies1900hKnob { Davies1900hLightGreyKnob() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hLightGrey.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hLightGrey_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hLightGrey.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hLightGrey_bg.svg"))); } }; struct Davies1900hDarkGreyKnob : Davies1900hKnob { Davies1900hDarkGreyKnob() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hDarkGrey.svg"))); - bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/Davies1900hDarkGrey_bg.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hDarkGrey.svg"))); + bg->setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/Davies1900hDarkGrey_bg.svg"))); } }; @@ -89,7 +89,7 @@ using Davies1900hDarkBlackAlt = Davies1900hBlackKnob; struct BananutRed : app::SvgPort { BananutRed() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/BananutRed.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BananutRed.svg"))); } }; /** Deprecated alias */ @@ -97,7 +97,7 @@ using BefacoOutputPort = BananutRed; struct BananutBlack : app::SvgPort { BananutBlack() { - setSvg(Svg::load(asset::plugin(pluginInstance, "res/BananutBlack.svg"))); + setSvg(Svg::load(asset::plugin(pluginInstance, "res/components/BananutBlack.svg"))); } }; /** Deprecated alias */ @@ -105,15 +105,15 @@ using BefacoInputPort = BananutRed; struct CKSSNarrow : app::SvgSwitch { CKSSNarrow() { - addFrame(Svg::load(asset::plugin(pluginInstance, "res/SwitchNarrow_0.svg"))); - addFrame(Svg::load(asset::plugin(pluginInstance, "res/SwitchNarrow_1.svg"))); + addFrame(Svg::load(asset::plugin(pluginInstance, "res/components/SwitchNarrow_0.svg"))); + addFrame(Svg::load(asset::plugin(pluginInstance, "res/components/SwitchNarrow_1.svg"))); } }; struct Crossfader : app::SvgSlider { Crossfader() { - setBackgroundSvg(Svg::load(asset::plugin(pluginInstance, "res/CrossfaderBackground.svg"))); - setHandleSvg(Svg::load(asset::plugin(pluginInstance, "res/CrossfaderHandle.svg"))); + setBackgroundSvg(Svg::load(asset::plugin(pluginInstance, "res/components/CrossfaderBackground.svg"))); + setHandleSvg(Svg::load(asset::plugin(pluginInstance, "res/components/CrossfaderHandle.svg"))); minHandlePos = mm2px(Vec(4.5f, -0.8f)); maxHandlePos = mm2px(Vec(34.5, -0.8f)); horizontal = true; @@ -125,9 +125,9 @@ struct Crossfader : app::SvgSlider { struct BefacoSwitchHorizontal : app::SvgSwitch { BefacoSwitchHorizontal() { - addFrame(Svg::load(asset::plugin(pluginInstance, "res/BefacoSwitchHoriz_0.svg"))); - addFrame(Svg::load(asset::plugin(pluginInstance, "res/BefacoSwitchHoriz_1.svg"))); - addFrame(Svg::load(asset::plugin(pluginInstance, "res/BefacoSwitchHoriz_2.svg"))); + addFrame(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoSwitchHoriz_0.svg"))); + addFrame(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoSwitchHoriz_1.svg"))); + addFrame(Svg::load(asset::plugin(pluginInstance, "res/components/BefacoSwitchHoriz_2.svg"))); } };