From 80f218ecd71f625d796c1ea95f661e7d1beba88f Mon Sep 17 00:00:00 2001 From: sickozell Date: Tue, 26 Dec 2023 11:30:17 +0100 Subject: [PATCH] update to v2.6.2 --- README.md | 2 +- changelog.md | 1 + res/Holder8.svg | 124 +++++++++++++++++++++++++----------------------- src/Holder8.cpp | 33 +++++++------ 4 files changed, 85 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 0033c49..bc5ae2e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SickoCV v2.6.2 VCV Rack plugin modules -![SickoCV modules 2 6 2](https://github.com/sickozell/SickoCV/assets/80784296/29c113e7-2e4b-4046-979c-20932d159923) +![SickoCV modules 2 6 2](https://github.com/sickozell/SickoCV/assets/80784296/752c5b87-5991-43a6-94fa-47f05531cb17) ## table of contents - [Common modules behavior](#common-modules-behavior) diff --git a/changelog.md b/changelog.md index 23efa42..7474f2a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ ### 2.6.2 (2023-12-26) - added holder, holder Compact and holder8 modules +- sickoLooper: added visible context menu options even if unselectable ### 2.6.1 (2023-12-17) - sickoLooper: added dark green color to the display bar when the loop is still playing even if its recording is finished diff --git a/res/Holder8.svg b/res/Holder8.svg index 233bb14..0d1fcac 100644 --- a/res/Holder8.svg +++ b/res/Holder8.svg @@ -24,15 +24,15 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="2.828427" - inkscape:cx="149.72987" - inkscape:cy="173.94828" + inkscape:zoom="7.9999996" + inkscape:cx="135.68751" + inkscape:cy="57.750003" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1272" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer4" + inkscape:current-layer="layer5" showguides="true" /> @@ -180,21 +180,21 @@ id="path4420" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="19" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="M 43.200242,22.810512 A 4.4000001,4.4000001 0 0 1 41.150168,17.861196 4.4000001,4.4000001 0 0 1 45.400242,14.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" + d="M 42.800244,22.810512 A 4.4000001,4.4000001 0 0 1 40.75017,17.861196 4.4000001,4.4000001 0 0 1 45.000244,14.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" sodipodi:open="true" /> @@ -203,14 +203,14 @@ id="path10131" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="35.699993" + sodipodi:cx="34.699993" sodipodi:cy="19.041279" sodipodi:rx="3.5" sodipodi:ry="3.5" sodipodi:start="2.268928" sodipodi:end="0.87266463" sodipodi:arc-type="arc" - d="m 33.450237,21.722434 a 3.5,3.5 0 0 1 -1.039168,-3.878226 3.5,3.5 0 0 1 3.288924,-2.302929 3.5,3.5 0 0 1 3.288924,2.302929 3.5,3.5 0 0 1 -1.039167,3.878226" + d="m 32.450237,21.722434 a 3.5,3.5 0 0 1 -1.039168,-3.878226 3.5,3.5 0 0 1 3.288924,-2.302929 3.5,3.5 0 0 1 3.288924,2.302929 3.5,3.5 0 0 1 -1.039167,3.878226" sodipodi:open="true" /> @@ -301,21 +301,21 @@ id="path42112" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="47" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="M 43.200242,50.810512 A 4.4000001,4.4000001 0 0 1 41.150168,45.861196 4.4000001,4.4000001 0 0 1 45.400242,42.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" + d="M 42.800244,50.810512 A 4.4000001,4.4000001 0 0 1 40.75017,45.861196 4.4000001,4.4000001 0 0 1 45.000244,42.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" sodipodi:open="true" /> @@ -350,21 +350,21 @@ id="path42128" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="61" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="M 43.200242,64.810512 A 4.4000001,4.4000001 0 0 1 41.150168,59.861196 4.4000001,4.4000001 0 0 1 45.400242,56.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" + d="M 42.800244,64.810512 A 4.4000001,4.4000001 0 0 1 40.75017,59.861196 4.4000001,4.4000001 0 0 1 45.000244,56.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" sodipodi:open="true" /> @@ -399,21 +399,21 @@ id="path42144" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="75" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="M 43.200242,78.810512 A 4.4000001,4.4000001 0 0 1 41.150168,73.861196 4.4000001,4.4000001 0 0 1 45.400242,70.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" + d="M 42.800244,78.810512 A 4.4000001,4.4000001 0 0 1 40.75017,73.861196 4.4000001,4.4000001 0 0 1 45.000244,70.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" sodipodi:open="true" /> @@ -448,21 +448,21 @@ id="path42160" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="89" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="M 43.200242,92.810512 A 4.4000001,4.4000001 0 0 1 41.150168,87.861196 4.4000001,4.4000001 0 0 1 45.400242,84.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" + d="M 42.800244,92.810512 A 4.4000001,4.4000001 0 0 1 40.75017,87.861196 4.4000001,4.4000001 0 0 1 45.000244,84.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.261196 4.4000001,4.4000001 0 0 1 -2.050074,4.949316" sodipodi:open="true" /> @@ -497,21 +497,21 @@ id="path42176" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="103" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="m 43.200242,106.81051 a 4.4000001,4.4000001 0 0 1 -2.050074,-4.94931 4.4000001,4.4000001 0 0 1 4.250074,-3.2612 4.4000001,4.4000001 0 0 1 4.250074,3.2612 4.4000001,4.4000001 0 0 1 -2.050074,4.94931" + d="M 42.800244,106.81051 A 4.4000001,4.4000001 0 0 1 40.75017,101.8612 4.4000001,4.4000001 0 0 1 45.000244,98.6 a 4.4000001,4.4000001 0 0 1 4.250074,3.2612 4.4000001,4.4000001 0 0 1 -2.050074,4.94931" sodipodi:open="true" /> @@ -546,21 +546,21 @@ id="path42918" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="45.400242" + sodipodi:cx="45.000244" sodipodi:cy="117" sodipodi:rx="4.4000001" sodipodi:ry="4.4000001" sodipodi:start="2.0943951" sodipodi:end="1.0471976" sodipodi:arc-type="arc" - d="m 43.200242,120.81051 a 4.4000001,4.4000001 0 0 1 -2.050074,-4.94931 4.4000001,4.4000001 0 0 1 4.250074,-3.2612 4.4000001,4.4000001 0 0 1 4.250074,3.2612 4.4000001,4.4000001 0 0 1 -2.050074,4.94931" + d="m 42.800244,120.81051 a 4.4000001,4.4000001 0 0 1 -2.050074,-4.94931 4.4000001,4.4000001 0 0 1 4.250074,-3.2612 4.4000001,4.4000001 0 0 1 4.250074,3.2612 4.4000001,4.4000001 0 0 1 -2.050074,4.94931" sodipodi:open="true" /> @@ -600,14 +600,14 @@ id="path46212" inkscape:label="circle 1" sodipodi:type="arc" - sodipodi:cx="35.699993" + sodipodi:cx="34.699993" sodipodi:cy="33.041279" sodipodi:rx="3.5" sodipodi:ry="3.5" sodipodi:start="2.268928" sodipodi:end="0.87266463" sodipodi:arc-type="arc" - d="m 33.450237,35.722434 a 3.5,3.5 0 0 1 -1.039168,-3.878226 3.5,3.5 0 0 1 3.288924,-2.302929 3.5,3.5 0 0 1 3.288924,2.302929 3.5,3.5 0 0 1 -1.039167,3.878226" + d="m 32.450237,35.722434 a 3.5,3.5 0 0 1 -1.039168,-3.878226 3.5,3.5 0 0 1 3.288924,-2.302929 3.5,3.5 0 0 1 3.288924,2.302929 3.5,3.5 0 0 1 -1.039167,3.878226" sodipodi:open="true" /> SCL PRB IN T&H + inkscape:label="scl" + transform="translate(-0.39999904)"> + inkscape:label="prb" + transform="translate(-1.0000014)"> + transform="translate(-1.257318)"> + transform="translate(-0.847223,-1.5399671e-4)"> + inkscape:label="scl" + transform="translate(-0.39999904)"> + inkscape:label="prb" + transform="translate(-1.0000014)"> + transform="translate(-1.257318)"> + transform="translate(-0.847223,-1.5399671e-4)"> (Vec(0, 0))); - addChild(createWidget(Vec(box.size.x - RACK_GRID_WIDTH, 0))); - addChild(createWidget(Vec(0, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); - addChild(createWidget(Vec(box.size.x - RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); + addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); + addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); // buttons --- 4.1 // trimpot --- x 3.7 --- y 4.3 @@ -479,28 +479,33 @@ struct Holder8Widget : ModuleWidget { // smallRoundKnob --- x 4.6 --- y 5.1 // roundBlackKnob --- x 5.7 --- y 6.4 // input/output --- 4.5 - - constexpr float xStart = 6.6f; - constexpr float xDelta = 9.7f; constexpr float yStart = 19.f; constexpr float yDelta = 14.f; + const float xTrg = 6.6; + const float xMode = 15.6; + const float xIn = 24.6; + const float xProb = 34.7; + const float xScale = 45; + const float xOffset = 55.1; + const float xOut = 64.8; + for (int track = 0; track < MAX_TRACKS; track++) { - addInput(createInputCentered(mm2px(Vec(xStart, yStart+(track*yDelta))), module, Holder8::TRIG_INPUT+track)); + addInput(createInputCentered(mm2px(Vec(xTrg, yStart+(track*yDelta))), module, Holder8::TRIG_INPUT+track)); - addParam(createLightParamCentered>>(mm2px(Vec(xStart+xDelta, yStart+(track*yDelta))), module, Holder8::MODE_SWITCH+track, Holder8::MODE_LIGHT+track)); + addParam(createLightParamCentered>>(mm2px(Vec(xMode, yStart+(track*yDelta))), module, Holder8::MODE_SWITCH+track, Holder8::MODE_LIGHT+track)); - addInput(createInputCentered(mm2px(Vec(xStart+(2*xDelta), yStart+(track*yDelta))), module, Holder8::IN_INPUT+track)); + addInput(createInputCentered(mm2px(Vec(xIn, yStart+(track*yDelta))), module, Holder8::IN_INPUT+track)); - addParam(createParamCentered(mm2px(Vec(xStart+(3*xDelta), yStart+(track*yDelta))), module, Holder8::PROB_PARAM+track)); + addParam(createParamCentered(mm2px(Vec(xProb, yStart+(track*yDelta))), module, Holder8::PROB_PARAM+track)); - addParam(createParamCentered(mm2px(Vec(xStart+(4*xDelta), yStart+(track*yDelta))), module, Holder8::SCALE_PARAM+track)); + addParam(createParamCentered(mm2px(Vec(xScale, yStart+(track*yDelta))), module, Holder8::SCALE_PARAM+track)); - addParam(createParamCentered(mm2px(Vec(xStart+(5*xDelta), yStart+(track*yDelta))), module, Holder8::OFFSET_PARAM+track)); + addParam(createParamCentered(mm2px(Vec(xOffset, yStart+(track*yDelta))), module, Holder8::OFFSET_PARAM+track)); - addOutput(createOutputCentered(mm2px(Vec(xStart+(6*xDelta), yStart+(track*yDelta))), module, Holder8::OUT_OUTPUT+track)); + addOutput(createOutputCentered(mm2px(Vec(xOut, yStart+(track*yDelta))), module, Holder8::OUT_OUTPUT+track)); } }