From d556321a37904e89cd6cfadafe214e4c8a7f87ed Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 29 Oct 2017 10:54:56 -0400 Subject: [PATCH] Knob alignment after rescaling --- res/CKSS_rot_0.svg | 15 ++++++------ src/Braids.cpp | 14 +++++------ src/Clouds.cpp | 16 ++++++------- src/Elements.cpp | 60 +++++++++++++++++++++++----------------------- src/Frames.cpp | 6 ++--- src/Rings.cpp | 10 ++++---- src/Shades.cpp | 12 +++++----- src/Tides.cpp | 2 +- src/Warps.cpp | 12 +++++----- 9 files changed, 74 insertions(+), 73 deletions(-) diff --git a/res/CKSS_rot_0.svg b/res/CKSS_rot_0.svg index eb0f38c..3b9b673 100644 --- a/res/CKSS_rot_0.svg +++ b/res/CKSS_rot_0.svg @@ -9,8 +9,8 @@ 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="5.4612927mm" - height="3.7041667mm" + width="20.641106" + height="14" viewBox="0 0 5.4612927 3.7041666" version="1.1" id="svg56722" @@ -26,7 +26,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="-11.218396" + inkscape:cx="-70.236253" inkscape:cy="-5.9682032" inkscape:document-units="mm" inkscape:current-layer="layer1" @@ -35,11 +35,12 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="1274" - inkscape:window-height="1434" + inkscape:window-width="2560" + inkscape:window-height="1422" inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" /> + inkscape:window-y="18" + inkscape:window-maximized="0" + units="px" /> diff --git a/src/Braids.cpp b/src/Braids.cpp index 0f72d1c..9f82fa0 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -292,15 +292,15 @@ BraidsWidget::BraidsWidget() { addChild(createScrew(Vec(15, 365))); addChild(createScrew(Vec(210, 365))); - addParam(createParam(Vec(177, 60), module, Braids::SHAPE_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(176, 59), module, Braids::SHAPE_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(20, 139), module, Braids::FINE_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(98, 139), module, Braids::COARSE_PARAM, -2.0, 2.0, 0.0)); - addParam(createParam(Vec(177, 139), module, Braids::FM_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(19, 138), module, Braids::FINE_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(97, 138), module, Braids::COARSE_PARAM, -2.0, 2.0, 0.0)); + addParam(createParam(Vec(176, 138), module, Braids::FM_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(20, 218), module, Braids::TIMBRE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(98, 218), module, Braids::MODULATION_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(177, 218), module, Braids::COLOR_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(19, 217), module, Braids::TIMBRE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(97, 217), module, Braids::MODULATION_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(176, 217), module, Braids::COLOR_PARAM, 0.0, 1.0, 0.5)); addInput(createInput(Vec(10, 316), module, Braids::TRIG_INPUT)); addInput(createInput(Vec(47, 316), module, Braids::PITCH_INPUT)); diff --git a/src/Clouds.cpp b/src/Clouds.cpp index 8e4662b..14adde2 100644 --- a/src/Clouds.cpp +++ b/src/Clouds.cpp @@ -175,14 +175,14 @@ CloudsWidget::CloudsWidget() { // addParam(createParam(Vec(211, 51), module, Clouds::POSITION_PARAM, 0.0, 1.0, 0.5)); // addParam(createParam(Vec(239, 51), module, Clouds::POSITION_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(28, 94), module, Clouds::POSITION_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(109, 94), module, Clouds::SIZE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(191, 94), module, Clouds::PITCH_PARAM, -2.0, 2.0, 0.0)); - - addParam(createParam(Vec(15, 181), module, Clouds::IN_GAIN_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(82, 181), module, Clouds::DENSITY_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(147, 181), module, Clouds::TEXTURE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(214, 181), module, Clouds::BLEND_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(27, 93), module, Clouds::POSITION_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(108, 93), module, Clouds::SIZE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(190, 93), module, Clouds::PITCH_PARAM, -2.0, 2.0, 0.0)); + + addParam(createParam(Vec(14, 180), module, Clouds::IN_GAIN_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(81, 180), module, Clouds::DENSITY_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(146, 180), module, Clouds::TEXTURE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(213, 180), module, Clouds::BLEND_PARAM, 0.0, 1.0, 0.5)); addInput(createInput(Vec(15, 274), module, Clouds::FREEZE_INPUT)); addInput(createInput(Vec(58, 274), module, Clouds::TRIG_INPUT)); diff --git a/src/Elements.cpp b/src/Elements.cpp index 3057af8..d9c88f4 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -230,36 +230,36 @@ ElementsWidget::ElementsWidget() { addChild(createScrew(Vec(15, 365))); addChild(createScrew(Vec(480, 365))); - addParam(createParam(Vec(29, 43), module, Elements::CONTOUR_PARAM, 0.0, 1.0, 1.0)); - addParam(createParam(Vec(100, 43), module, Elements::BOW_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(170, 43), module, Elements::BLOW_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(240, 43), module, Elements::STRIKE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(311, 43), module, Elements::COARSE_PARAM, -30.0, 30.0, 0.0)); - addParam(createParam(Vec(382, 43), module, Elements::FINE_PARAM, -2.0, 2.0, 0.0)); - addParam(createParam(Vec(452, 43), module, Elements::FM_PARAM, -1.0, 1.0, 0.0)); - - addParam(createParam(Vec(116, 117), module, Elements::FLOW_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(213, 117), module, Elements::MALLET_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(327, 117), module, Elements::GEOMETRY_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(424, 117), module, Elements::BRIGHTNESS_PARAM, 0.0, 1.0, 0.5)); - - addParam(createParam(Vec(100, 203), module, Elements::BOW_TIMBRE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(171, 203), module, Elements::BLOW_TIMBRE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(240, 203), module, Elements::STRIKE_TIMBRE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(311, 203), module, Elements::DAMPING_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(381, 203), module, Elements::POSITION_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(452, 203), module, Elements::SPACE_PARAM, 0.0, 2.0, 0.0)); - - addParam(createParam(Vec(105, 274), module, Elements::BOW_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(143, 274), module, Elements::FLOW_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(182, 274), module, Elements::BLOW_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(220, 274), module, Elements::MALLET_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(258, 274), module, Elements::STRIKE_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(316, 274), module, Elements::DAMPING_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(355, 274), module, Elements::GEOMETRY_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(393, 274), module, Elements::POSITION_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(431, 274), module, Elements::BRIGHTNESS_MOD_PARAM, -1.0, 1.0, 0.0)); - addParam(createParam(Vec(470, 274), module, Elements::SPACE_MOD_PARAM, -2.0, 2.0, 0.0)); + addParam(createParam(Vec(28, 42), module, Elements::CONTOUR_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(99, 42), module, Elements::BOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(169, 42), module, Elements::BLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(239, 42), module, Elements::STRIKE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(310, 42), module, Elements::COARSE_PARAM, -30.0, 30.0, 0.0)); + addParam(createParam(Vec(381, 42), module, Elements::FINE_PARAM, -2.0, 2.0, 0.0)); + addParam(createParam(Vec(451, 42), module, Elements::FM_PARAM, -1.0, 1.0, 0.0)); + + addParam(createParam(Vec(115, 116), module, Elements::FLOW_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(212, 116), module, Elements::MALLET_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(326, 116), module, Elements::GEOMETRY_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(423, 116), module, Elements::BRIGHTNESS_PARAM, 0.0, 1.0, 0.5)); + + addParam(createParam(Vec(99, 202), module, Elements::BOW_TIMBRE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(170, 202), module, Elements::BLOW_TIMBRE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(239, 202), module, Elements::STRIKE_TIMBRE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(310, 202), module, Elements::DAMPING_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(380, 202), module, Elements::POSITION_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(451, 202), module, Elements::SPACE_PARAM, 0.0, 2.0, 0.0)); + + addParam(createParam(Vec(104.5, 273), module, Elements::BOW_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(142.5, 273), module, Elements::FLOW_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(181.5, 273), module, Elements::BLOW_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(219.5, 273), module, Elements::MALLET_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(257.5, 273), module, Elements::STRIKE_TIMBRE_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(315.5, 273), module, Elements::DAMPING_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(354.5, 273), module, Elements::GEOMETRY_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(392.5, 273), module, Elements::POSITION_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(430.5, 273), module, Elements::BRIGHTNESS_MOD_PARAM, -1.0, 1.0, 0.0)); + addParam(createParam(Vec(469.5, 273), module, Elements::SPACE_MOD_PARAM, -2.0, 2.0, 0.0)); addInput(createInput(Vec(20, 178), module, Elements::NOTE_INPUT)); addInput(createInput(Vec(55, 178), module, Elements::FM_INPUT)); diff --git a/src/Frames.cpp b/src/Frames.cpp index 8a55999..24c5ca6 100644 --- a/src/Frames.cpp +++ b/src/Frames.cpp @@ -279,7 +279,7 @@ FramesWidget::FramesWidget() { addParam(createParam(Vec(81, 52), module, Frames::GAIN2_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(149, 52), module, Frames::GAIN3_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(216, 52), module, Frames::GAIN4_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(91, 117), module, Frames::FRAME_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(89, 115), module, Frames::FRAME_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(208, 141), module, Frames::MODULATION_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(19, 123), module, Frames::ADD_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(19, 172), module, Frames::DEL_PARAM, 0.0, 1.0, 0.0)); @@ -306,8 +306,8 @@ FramesWidget::FramesWidget() { addChild(createLight>(Vec(61, 155), module, Frames::EDIT_LIGHT)); { RedGreenBlueLight *framesLight = new RedGreenBlueLight(); - framesLight->box.pos = Vec(102, 128); - framesLight->box.size = Vec(67, 67); + framesLight->box.pos = Vec(100, 126); + framesLight->box.size = Vec(71, 71); framesLight->module = module; framesLight->lightId = Frames::FRAME_LIGHT; addChild(framesLight); diff --git a/src/Rings.cpp b/src/Rings.cpp index 12e4a86..c6bee5c 100644 --- a/src/Rings.cpp +++ b/src/Rings.cpp @@ -255,12 +255,12 @@ RingsWidget::RingsWidget() { addParam(createParam(Vec(14, 40), module, Rings::POLYPHONY_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(179, 40), module, Rings::RESONATOR_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(30, 73), module, Rings::FREQUENCY_PARAM, 0.0, 60.0, 30.0)); - addParam(createParam(Vec(127, 73), module, Rings::STRUCTURE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(29, 72), module, Rings::FREQUENCY_PARAM, 0.0, 60.0, 30.0)); + addParam(createParam(Vec(126, 72), module, Rings::STRUCTURE_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(14, 159), module, Rings::BRIGHTNESS_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(84, 159), module, Rings::DAMPING_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(155, 159), module, Rings::POSITION_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(13, 158), module, Rings::BRIGHTNESS_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(83, 158), module, Rings::DAMPING_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(154, 158), module, Rings::POSITION_PARAM, 0.0, 1.0, 0.5)); addParam(createParam(Vec(19, 229), module, Rings::BRIGHTNESS_MOD_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(57, 229), module, Rings::FREQUENCY_MOD_PARAM, -1.0, 1.0, 0.0)); diff --git a/src/Shades.cpp b/src/Shades.cpp index 2cce679..4c2cd57 100644 --- a/src/Shades.cpp +++ b/src/Shades.cpp @@ -75,13 +75,13 @@ ShadesWidget::ShadesWidget() { addChild(createScrew(Vec(15, 0))); addChild(createScrew(Vec(15, 365))); - addParam(createParam(Vec(40, 41), module, Shades::GAIN1_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(40, 107), module, Shades::GAIN2_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(40, 173), module, Shades::GAIN3_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(40, 40), module, Shades::GAIN1_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(40, 106), module, Shades::GAIN2_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(40, 172), module, Shades::GAIN3_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(10, 52), module, Shades::MODE1_PARAM, 0.0, 1.0, 1.0)); - addParam(createParam(Vec(10, 118), module, Shades::MODE2_PARAM, 0.0, 1.0, 1.0)); - addParam(createParam(Vec(10, 184), module, Shades::MODE3_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(10, 51), module, Shades::MODE1_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(10, 117), module, Shades::MODE2_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(10, 183), module, Shades::MODE3_PARAM, 0.0, 1.0, 1.0)); addInput(createInput(Vec(9, 245), module, Shades::IN1_INPUT)); addInput(createInput(Vec(9, 281), module, Shades::IN2_INPUT)); diff --git a/src/Tides.cpp b/src/Tides.cpp index 80ea179..5067b00 100644 --- a/src/Tides.cpp +++ b/src/Tides.cpp @@ -204,7 +204,7 @@ TidesWidget::TidesWidget() { addParam(createParam(Vec(19, 52), module, Tides::MODE_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(19, 93), module, Tides::RANGE_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(79, 60), module, Tides::FREQUENCY_PARAM, -48.0, 48.0, 0.0)); + addParam(createParam(Vec(78, 60), module, Tides::FREQUENCY_PARAM, -48.0, 48.0, 0.0)); addParam(createParam(Vec(156, 66), module, Tides::FM_PARAM, -12.0, 12.0, 0.0)); addParam(createParam(Vec(13, 155), module, Tides::SHAPE_PARAM, -1.0, 1.0, 0.0)); diff --git a/src/Warps.cpp b/src/Warps.cpp index 6006435..2f91dde 100644 --- a/src/Warps.cpp +++ b/src/Warps.cpp @@ -138,12 +138,12 @@ WarpsWidget::WarpsWidget() { addChild(createScrew(Vec(15, 365))); addChild(createScrew(Vec(120, 365))); - addParam(createParam(Vec(30, 53), module, Warps::ALGORITHM_PARAM, 0.0, 8.0, 0.0)); + addParam(createParam(Vec(29, 52), module, Warps::ALGORITHM_PARAM, 0.0, 8.0, 0.0)); - addParam(createParam(Vec(95, 173), module, Warps::TIMBRE_PARAM, 0.0, 1.0, 0.5)); + addParam(createParam(Vec(94, 173), module, Warps::TIMBRE_PARAM, 0.0, 1.0, 0.5)); addParam(createParam(Vec(16, 182), module, Warps::STATE_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(15, 214), module, Warps::LEVEL1_PARAM, 0.0, 1.0, 1.0)); - addParam(createParam(Vec(54, 214), module, Warps::LEVEL2_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(14, 213), module, Warps::LEVEL1_PARAM, 0.0, 1.0, 1.0)); + addParam(createParam(Vec(53, 213), module, Warps::LEVEL2_PARAM, 0.0, 1.0, 1.0)); addInput(createInput(Vec(8, 273), module, Warps::LEVEL1_INPUT)); addInput(createInput(Vec(44, 273), module, Warps::LEVEL2_INPUT)); @@ -158,8 +158,8 @@ WarpsWidget::WarpsWidget() { addChild(createLight>(Vec(20, 167), module, Warps::CARRIER_GREEN_LIGHT)); { RedGreenBlueLight *algorithmLight = new RedGreenBlueLight(); - algorithmLight->box.pos = Vec(41, 64); - algorithmLight->box.size = Vec(67, 67); + algorithmLight->box.pos = Vec(40, 63); + algorithmLight->box.size = Vec(71, 71); algorithmLight->module = module; algorithmLight->lightId = Warps::ALGORITHM_LIGHT; addChild(algorithmLight);