Skip to content

Commit 9f68187

Browse files
committed
Fancy Link Switch
1 parent 8236b79 commit 9f68187

File tree

8 files changed

+260
-19
lines changed

8 files changed

+260
-19
lines changed

Plateau2/Plateau2.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ Plateau2::Plateau2(const InstanceInfo& info)
161161
SVGs[4]->Hide(true);
162162

163163
//Extras Page Knobs
164-
Knobs[kPreDelayKnob] = new NeedleKnob(IRECT::MakeXYWH(140, 140, 35, 35), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kPreDelay1, kPreDelay2);
164+
Knobs[kPreDelayKnob] = new NeedleKnob(IRECT::MakeXYWH(140, 135, 35, 35), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kPreDelay1, kPreDelay2);
165165

166166
Knobs[kDiffusionDecayKnob] = new NeedleKnob(IRECT::MakeXYWH(233, 310, 56, 56), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kDiffusionDecay1, kDiffusionDecay2);
167167
Knobs[kDiffusionDecayKnob]->Bound = 72.6923f;
168168

169-
Knobs[kModVarianceKnob] = new NeedleKnob(IRECT::MakeXYWH(130, 220, 56, 56), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kModVariance1, kModVariance2);
169+
Knobs[kModVarianceKnob] = new NeedleKnob(IRECT::MakeXYWH(130, 200, 56, 56), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kModVariance1, kModVariance2);
170170

171171
Knobs[kVarianceKnob] = new NeedleKnob(IRECT::MakeXYWH(26, 310, 56, 56), NeedleSVG, NeedleBGSVG, NeedleFG1PNG, NeedleFG2PNG, kVariance1, kVariance2);
172172

@@ -208,6 +208,9 @@ Plateau2::Plateau2(const InstanceInfo& info)
208208
const ISVG DangerOffSVG = pGraphics->LoadSVG(DANGEROFF_FN);
209209
const ISVG DangerOnSVG = pGraphics->LoadSVG(DANGERON_FN);
210210

211+
const ISVG LinkOffSVG = pGraphics->LoadSVG(LINKOFF_FN);
212+
const ISVG LinkOnSVG = pGraphics->LoadSVG(LINKON_FN);
213+
211214
const ISVG HelpButtonSVG = pGraphics->LoadSVG(HELPBUTTON_FN);
212215

213216
//Main page Switches
@@ -257,11 +260,11 @@ Plateau2::Plateau2(const InstanceInfo& info)
257260
Switches[5] = new LEDSwitch(IRECT::MakeXYWH(210, 170, 102, 102), LEDScale, LedOffSVG, LedOn1SVG, LedOn2SVG, kNesting1, kNesting2);
258261

259262
//DANGER switch
260-
Switches[6] = new LEDSwitch(IRECT::MakeXYWH(102, 321, 112, 112), 1, DangerOffSVG, DangerOnSVG, DangerOnSVG, kDanger, kDanger);
263+
Switches[6] = new LEDSwitch(IRECT::MakeXYWH(102, 291, 112, 112), 1, DangerOffSVG, DangerOnSVG, DangerOnSVG, kDanger, kDanger);
261264

262265
Switches[7] = new LEDSwitch(IRECT::MakeXYWH(3, 170, 102, 102), LEDScale, LedOffSVG, LedOn1SVG, LedOn2SVG, kSoftClip1, kSoftClip2);
263266

264-
Switches[8] = new LEDSwitch(IRECT::MakeXYWH(3, 450, 102, 102), LEDScale, LedOffSVG, LedOnBothSVG, LedOnBothSVG, kLink1to2, kLink1to2);
267+
Switches[8] = new LEDSwitch(IRECT::MakeXYWH(102, 418, 112, 112), 1, LinkOffSVG, LinkOnSVG, LinkOnSVG, kLink1to2, kLink1to2);
265268

266269
//Routing page Switches
267270
Switches[9] = new LEDSwitch(IRECT::MakeXYWH(106.5, 374, 102, 102), LEDScale, LedOffSVG, LedOn1SVG, LedOn2SVG, k1to2, k2to1);

Plateau2/Plateau2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ enum EKnobs {
118118
kNumKnobs
119119
};
120120

121-
const int kNumSwitches = 10;
121+
const int kNumSwitches = 11;
122122
const int kNumButtons = 3;
123123
const int kNumPages = 3;
124124
const int kNumSVGs = 5;

Plateau2/config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
#define LEDONBOTH_FN "LEDButtonGradient.svg"
8282
#define DANGEROFF_FN "DangerOff.svg"
8383
#define DANGERON_FN "DangerOn.svg"
84+
#define LINKOFF_FN "LinkOff.svg"
85+
#define LINKON_FN "LinkOn.svg"
8486
#define HELPBUTTON_FN "HelpButton.svg"
8587
#define SEND1TO2_FN "Send1To2.svg"
8688
#define SEND2TO1_FN "Send2To1.svg"

Plateau2/resources/img/ExtrasPage.svg

Lines changed: 41 additions & 14 deletions
Loading

Plateau2/resources/img/LinkOff.svg

Lines changed: 92 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)