commit 62d930969fcfecb58841e0d14d84356fdc0e49ff
parent 7953b2ce50f579bd4c257d1f4d49da122e97cfb2
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Sat, 10 Aug 2024 19:18:06 +0200
UI update
Diffstat:
8 files changed, 45 insertions(+), 57 deletions(-)
diff --git a/source/nord/n2x/n2xJucePlugin/n2xLfo.cpp b/source/nord/n2x/n2xJucePlugin/n2xLfo.cpp
@@ -8,7 +8,7 @@ namespace n2xJucePlugin
Lfo::Lfo(Editor& _editor, const uint8_t _index)
: m_editor(_editor)
, m_index(_index)
- , m_button(_editor.findComponentT<juce::Button>(_index ? "PerfLfo2SyncA" : "PerfLfo1SyncA"))
+ , m_slider(_editor.findComponentT<juce::Slider>(_index ? "PerfLfo2SyncA" : "PerfLfo1SyncA"))
{
m_onCurrentPartChanged.set(_editor.getN2xController().onCurrentPartChanged, [this](const uint8_t&)
{
@@ -23,22 +23,22 @@ namespace n2xJucePlugin
return std::string("PerfLfo") + std::to_string(_lfoIndex+1) + "Sync" + static_cast<char>('A' + _part);
}
- void Lfo::bind()
+ void Lfo::bind() const
{
const auto& controller = m_editor.getN2xController();
- auto* syncMultiParam = controller.getParameter(getSyncMultiParamName(controller.getCurrentPart(), m_index), 0);
+ const auto paramName = getSyncMultiParamName(controller.getCurrentPart(), m_index);
- m_onSyncMultiParamChanged.set(syncMultiParam, [this](pluginLib::Parameter* const& _parameter)
- {
- updateState(_parameter);
- });
+ const auto paramIdx = controller.getParameterIndexByName(paramName);
+
+ auto& binding = m_editor.getParameterBinding();
- updateState(syncMultiParam);
+ binding.unbind(m_slider);
+ binding.bind(*m_slider, paramIdx, 0);
}
void Lfo::updateState(const pluginLib::Parameter* _param) const
{
- m_button->setToggleState(_param->getUnnormalizedValue() > 0, juce::dontSendNotification);
+ m_slider->setValue(_param->getUnnormalizedValue());
}
}
diff --git a/source/nord/n2x/n2xJucePlugin/n2xLfo.h b/source/nord/n2x/n2xJucePlugin/n2xLfo.h
@@ -14,18 +14,16 @@ namespace n2xJucePlugin
public:
Lfo(Editor& _editor, uint8_t _index);
- static std::string getSyncMultiParamName(const uint8_t _part, const uint8_t _lfoIndex);
+ static std::string getSyncMultiParamName(uint8_t _part, uint8_t _lfoIndex);
private:
- void bind();
+ void bind() const;
void updateState(const pluginLib::Parameter* _param) const;
Editor& m_editor;
const uint8_t m_index;
- juce::Button* m_button;
+ juce::Slider* m_slider;
- pluginLib::ParameterListener m_onSyncMultiParamChanged;
- pluginLib::ParameterListener m_onSyncRateParamChanged;
pluginLib::EventListener<uint8_t> m_onCurrentPartChanged;
};
}
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/assets.cmake b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/assets.cmake
@@ -11,6 +11,7 @@ set(ASSETS_n2xTrancy
${CMAKE_CURRENT_LIST_DIR}/button_red.png
${CMAKE_CURRENT_LIST_DIR}/button_round.png
${CMAKE_CURRENT_LIST_DIR}/DSEG7Classic-BoldItalic.ttf
+ ${CMAKE_CURRENT_LIST_DIR}/h_slider.png
${CMAKE_CURRENT_LIST_DIR}/knob_big.png
${CMAKE_CURRENT_LIST_DIR}/panel_1_main.png
${CMAKE_CURRENT_LIST_DIR}/panel_1_main_arpeggiator.png
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/h_slider.png b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/h_slider.png
Binary files differ.
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/n2xTrancy.json b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/n2xTrancy.json
@@ -25,17 +25,16 @@
{ "name" : "VoiceMode_2", "parameterAttachment" : { "parameter" : "VoiceMode", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "518", "y" : "964", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":120 } },
{ "name" : "VoiceMode_3", "parameterAttachment" : { "parameter" : "VoiceMode", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "518", "y" : "1001", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":120 } },
- { "name" : "PerfMidiChannelA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "203", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70"} },
- { "name" : "PerfMidiChannelB", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "276", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70"} },
- { "name" : "PerfMidiChannelC", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "349", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70"} },
- { "name" : "PerfMidiChannelD", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "422", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70"} },
-
- { "name" : "PerfSlotActiveA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "218", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_a", "tileSizeX" : "74", "tileSizeY" : "56"} },
- { "name" : "PerfSlotActiveB", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "291", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_b", "tileSizeX" : "74", "tileSizeY" : "56"} },
- { "name" : "PerfSlotActiveC", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "364", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_c", "tileSizeX" : "74", "tileSizeY" : "56"} },
- { "name" : "PerfSlotActiveD", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "437", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_d", "tileSizeX" : "74", "tileSizeY" : "56"} },
-
-
+ { "name" : "PerfMidiChannelA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "203", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" } },
+ { "name" : "PerfMidiChannelB", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "276", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" } },
+ { "name" : "PerfMidiChannelC", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "349", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" } },
+ { "name" : "PerfMidiChannelD", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "422", "y" : "1063", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" } },
+
+ { "name" : "PerfSlotActiveA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "218", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_a", "tileSizeX" : "74", "tileSizeY" : "56" } },
+ { "name" : "PerfSlotActiveB", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "291", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_b", "tileSizeX" : "74", "tileSizeY" : "56" } },
+ { "name" : "PerfSlotActiveC", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "364", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_c", "tileSizeX" : "74", "tileSizeY" : "56" } },
+ { "name" : "PerfSlotActiveD", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "437", "y" : "1023", "width" : "74", "height" : "56", "texture" : "button_d", "tileSizeX" : "74", "tileSizeY" : "56" } },
+
{ "name" : "OctaveShift_1", "parameterAttachment" : { "parameter" : "OctaveShift", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1053", "y" : "938", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150 } },
{ "name" : "OctaveShift_2", "parameterAttachment" : { "parameter" : "OctaveShift", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1053", "y" : "975", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150 } },
{ "name" : "OctaveShift_3", "parameterAttachment" : { "parameter" : "OctaveShift", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1053", "y" : "1012", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150 } },
@@ -70,15 +69,12 @@
{ "name" : "O1Waveform_1", "parameterAttachment" : { "parameter" : "O1Waveform", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "684", "y" : "79", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "O1Waveform_2", "parameterAttachment" : { "parameter" : "O1Waveform", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "684", "y" : "116", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "O1Waveform_3", "parameterAttachment" : { "parameter" : "O1Waveform", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "684", "y" : "153", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "O1Waveform_4", "parameterAttachment" : { "parameter" : "O1Waveform", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "684", "y" : "190", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
-
-
+ { "name" : "O1Waveform_4", "parameterAttachment" : { "parameter" : "O1Waveform", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "684", "y" : "190", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "O2PitchFine", "parameterAttachment" : { "parameter" : "O2PitchFine" }, "rotary" : { }, "spritesheet" : { "x" : "923", "y" : "377", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
{ "name" : "O2Pitch", "parameterAttachment" : { "parameter" : "O2Pitch" }, "rotary" : { }, "spritesheet" : { "x" : "921", "y" : "107", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
{ "name" : "O2Pitch_LED", "button" : { "isToggle" : "0", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "942", "y" : "27", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" } },
-
{ "name" : "O2Waveform_1", "parameterAttachment" : { "parameter" : "O2Waveform", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1101", "y" : "79", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "O2Waveform_2", "parameterAttachment" : { "parameter" : "O2Waveform", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1101", "y" : "116", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "O2Waveform_3", "parameterAttachment" : { "parameter" : "O2Waveform", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1101", "y" : "153", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
@@ -90,7 +86,6 @@
{ "name" : "Sync", "parameterAttachment" : { "parameter" : "Sync"}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "888", "y" : "602", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150} },
{ "name" : "RingMod", "parameterAttachment" : { "parameter" : "RingMod"}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "888", "y" : "565", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150} },
-
{ "name" : "Cutoff", "parameterAttachment" : { "parameter" : "Cutoff" }, "rotary" : { }, "spritesheet" : { "x" : "1344", "y" : "619", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
{ "name" : "Resonance", "parameterAttachment" : { "parameter" : "Resonance" }, "rotary" : { }, "spritesheet" : { "x" : "1504", "y" : "619", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
{ "name" : "FilterEnvAmount", "parameterAttachment" : { "parameter" : "FilterEnvAmount" }, "rotary" : { }, "spritesheet" : { "x" : "1664", "y" : "619", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
@@ -111,24 +106,24 @@
{ "name" : "FilterType_4", "parameterAttachment" : { "parameter" : "FilterType", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1954", "y" : "480", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
{ "name" : "FilterType_5", "parameterAttachment" : { "parameter" : "FilterType", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1954", "y" : "517", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
- { "name" : "Distortion", "parameterAttachment" : { "parameter" : "Distortion"}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1954", "y" : "705", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150} },
-
-
- { "name" : "PerfLfo1SyncA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "485", "y" : "-13", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
- { "name" : "Lfo1Rate", "parameterAttachment" : { "parameter" : "Lfo1Rate" }, "rotary" : { }, "spritesheet" : { "x" : "36", "y" : "88", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
- { "name" : "Lfo1Level", "parameterAttachment" : { "parameter" : "Lfo1Level" }, "rotary" : { }, "spritesheet" : { "x" : "508", "y" : "88", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
-
- { "name" : "Lfo1Waveform_1", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "50", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Waveform_2", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "87", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Waveform_3", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "124", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Waveform_4", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "161", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Waveform_5", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "198", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
-
- { "name" : "Lfo1Dest_1", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "50", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Dest_2", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "87", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Dest_3", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "124", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Dest_4", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "161", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
- { "name" : "Lfo1Dest_5", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "198", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Distortion", "parameterAttachment" : { "parameter" : "Distortion"}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "1954", "y" : "705", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":150} },
+
+ { "name" : "PerfLfo1SyncA", "parameterAttachment" : { "parameter" : "PerfLfo1SyncA" }, "rotary" : { "style" : "LinearHorizontal"}, "spritesheet" : { "x" : "500", "y" : "2", "width" : "140", "height" : "40", "texture" : "h_slider", "tileSizeX" : "300", "tileSizeY" : "70" } },
+
+ { "name" : "Lfo1Rate", "parameterAttachment" : { "parameter" : "Lfo1Rate" }, "rotary" : { }, "spritesheet" : { "x" : "36", "y" : "88", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
+ { "name" : "Lfo1Level", "parameterAttachment" : { "parameter" : "Lfo1Level" }, "rotary" : { }, "spritesheet" : { "x" : "508", "y" : "88", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
+
+ { "name" : "Lfo1Waveform_1", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "50", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Waveform_2", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "87", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Waveform_3", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "124", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Waveform_4", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "161", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Waveform_5", "parameterAttachment" : { "parameter" : "Lfo1Waveform", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "198", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+
+ { "name" : "Lfo1Dest_1", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "50", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Dest_2", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "87", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Dest_3", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "124", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Dest_4", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "161", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
+ { "name" : "Lfo1Dest_5", "parameterAttachment" : { "parameter" : "Lfo1Dest", "value":1}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "313", "y" : "198", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{
"name" : "LFO2",
@@ -138,7 +133,6 @@
{ "name" : "Lfo2Dest_LFO2_OSC1+2", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":4}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "45", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "Lfo2Dest_LFO2_AMP", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":3}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "82", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
{ "name" : "Lfo2Dest_LFO2_FILTER", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":7}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "119", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":100 } },
-
]
},
@@ -152,17 +146,12 @@
{ "name" : "Lfo2Dest_LFO2_DOWN", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":0}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "119", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
{ "name" : "Lfo2Dest_LFO2_UP_DOWN", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":2}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "156", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
{ "name" : "Lfo2Dest_LFO2_RANDOM", "parameterAttachment" : { "parameter" : "Lfo2Dest", "value":5}, "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "162", "y" : "193", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
-
-
-
-
]
},
- { "name" : "PerfLfo2SyncA", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "350", "y" : "254", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70", "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":130 } },
- { "name" : "ArpEnabled", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "485", "y" : "254", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":90} },
-
-
+ { "name" : "PerfLfo2SyncA", "parameterAttachment" : { "parameter" : "PerfLfo2SyncA" }, "rotary" : { "style" : "LinearHorizontal"}, "spritesheet" : { "x" : "352", "y" : "269", "width" : "140", "height" : "40", "texture" : "h_slider", "tileSizeX" : "300", "tileSizeY" : "70" } },
+ { "name" : "ArpEnabled", "button" : { "isToggle" : "1", "normalImage" : "0", "overImage" : "0", "downImage" : "0", "normalImageOn" : "1", "overImageOn" : "1", "downImageOn" : "1", "x" : "485", "y" : "254", "width" : "70", "height" : "70", "texture" : "button_round", "tileSizeX" : "70", "tileSizeY" : "70" , "hitOffsetT":20, "hitOffsetB":-20, "hitOffsetR":90} },
+
{ "name" : "Lfo2Rate", "parameterAttachment" : { "parameter" : "Lfo2Rate" }, "rotary" : { }, "spritesheet" : { "x" : "36", "y" : "350", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
{ "name" : "ArpRange", "parameterAttachment" : { "parameter" : "ArpRange" }, "rotary" : { }, "spritesheet" : { "x" : "508", "y" : "350", "width" : "113", "height" : "113", "texture" : "knob_big", "tileSizeX" : "113", "tileSizeY" : "113" } },
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main.png b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main.png
Binary files differ.
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main_arpeggiator.png b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main_arpeggiator.png
Binary files differ.
diff --git a/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main_lfo2.png b/source/nord/n2x/n2xJucePlugin/skins/n2xTrancy/panel_1_main_lfo2.png
Binary files differ.
