commit bd2847f2328e95c552db86160ebdd87113c2c7b5
parent 77fc871b8eb28969cd46de154bfe9e517106ff47
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Fri, 10 May 2024 19:16:47 +0200
Merge remote-tracking branch 'gearmulator/main' into oss/main
Diffstat:
10 files changed, 104 insertions(+), 6 deletions(-)
diff --git a/source/xtJucePlugin/parameterDescriptions_xt.json b/source/xtJucePlugin/parameterDescriptions_xt.json
@@ -82,7 +82,7 @@
{"index":66, "name":"F1EnvAmount", "toText":"signed", "isBipolar":true},
{"index":67, "name":"F1EnvVelAmount", "toText":"signed", "isBipolar":true},
- {"index":70, "name":"F1ContextSensitive"},
+ {"index":70, "name":"F1Extra"},
{"index":73, "name":"F2Cutoff", "default":127},
{"index":74, "name":"F2Type", "min":0, "max":1, "isDiscrete":true, "toText":"filter2Type"},
@@ -658,7 +658,7 @@
"Amlifier Env Attack", "Amlifier Env Decay", "Amplifier Env Sustain", "Amplifier Env Release",
"LFO 1 Rate", "LFO 1 Shape", "LFO 1 Delay", "LFO 1 Sync", "LFO 1 Symmetry", "LFO 1 Humanize",
"LFO 2 Rate", "LFO 2 Shape", "LFO 2 Delay", "LFO 2 Sync", "LFO 2 Symmetry", "LFO 2 Humanize", "LFO 2 Phase",
- "Osc 1 FM Amount", "Filter 1 Context", "Glide Time",
+ "Osc 1 FM Amount", "Filter 1 Extra", "Glide Time",
"Control W", "Control X", "Control Y", "Control Z"
],
"playParamTargets":
@@ -683,7 +683,7 @@
"AmpEnvAttack", "AmpEnvDecay", "AmpEnvSustain", "AmpEnvRelease",
"Lfo1Rate", "Lfo1Shape", "Lfo1Delay", "Lfo1Sync", "Lfo1Symmetry", "Lfo1Humanize",
"Lfo2Rate", "Lfo2Shape", "Lfo2Delay", "Lfo2Sync", "Lfo2Symmetry", "Lfo2Humanize", "Lfo2Phase",
- "O1FmAmount", "F1ContextSensitive", "GlideTime",
+ "O1FmAmount", "F1Extra", "GlideTime",
"ControlW", "ControlX", "ControlY", "ControlZ"
],
"filter1Type":
@@ -841,7 +841,7 @@
"Pitch", "Osc 1 Pitch", "Osc 2 Pitch", "Wave 1 Startwave", "Wave 2 Startwave", "Mix Wave 1", "Mix Wave 2", "Mix Ring Mod", "Mix Noise", "Filter 1 Cutoff", "Filter 1 Resonance", "Filter 2 Cutoff",
"Volume", "Pan", "Filter Env Attack", "Filter Env Decay", "Filter Env Sustain", "Filter Env Release", "Amp Env Attack", "Amp Env Decay", "Amp Env Sustain", "Amp Env Release",
"Wave Env Times", "Wave Env Levels", "Free Env Times", "Free Env Levels", "LFO 1 Rate", "LFO 1 Level", "LFO 2 Rate", "LFO 2 Level", "Mod #1 Amount", "Mod #2 Amount", "Mod #3 Amount",
- "Mod #4 Amount", "FM Amount", "F1 Context"
+ "Mod #4 Amount", "FM Amount", "F1 Extra"
],
"midiChannel":
[
@@ -1083,7 +1083,7 @@
{"type": "param", "name": "F1EnvVelAmount"},
{"type": "null"},
{"type": "null"},
- {"type": "param", "name": "F1ContextSensitive"},
+ {"type": "param", "name": "F1Extra"},
{"type": "null"},
{"type": "null"},
{"type": "param", "name": "F2Cutoff"},
diff --git a/source/xtJucePlugin/skins/xtDefault/assets.cmake b/source/xtJucePlugin/skins/xtDefault/assets.cmake
@@ -10,7 +10,13 @@ set(ASSETS_xtDefault
${CMAKE_CURRENT_LIST_DIR}/led.png
${CMAKE_CURRENT_LIST_DIR}/xt_encoder_ranged.png
${CMAKE_CURRENT_LIST_DIR}/xt_encoder_ranged_red.png
+ ${CMAKE_CURRENT_LIST_DIR}/xt_encoder_unused.png
${CMAKE_CURRENT_LIST_DIR}/xtDefaultBG.png
+ ${CMAKE_CURRENT_LIST_DIR}/xtFilterExtraBandwidth.png
+ ${CMAKE_CURRENT_LIST_DIR}/xtFilterExtraBPOffset.png
+ ${CMAKE_CURRENT_LIST_DIR}/xtFilterExtraOsc2FM.png
+ ${CMAKE_CURRENT_LIST_DIR}/xtFilterExtraSHRate.png
+ ${CMAKE_CURRENT_LIST_DIR}/xtFilterExtraWave.png
${CMAKE_CURRENT_LIST_DIR}/xtknob.png
${CMAKE_CURRENT_LIST_DIR}/xtknob_minus.png
${CMAKE_CURRENT_LIST_DIR}/xtknob_plus.png
diff --git a/source/xtJucePlugin/skins/xtDefault/xtDefault.json b/source/xtJucePlugin/skins/xtDefault/xtDefault.json
@@ -2251,12 +2251,104 @@
"y" : "370.17",
"width" : "128",
"height" : "128",
+ "texture" : "xt_encoder_unused",
+ "tileSizeX" : "128",
+ "tileSizeY" : "128"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "0,1,2,3,4,5,10,11"
+ }
+ },
+ {
+ "name" : "xtKnob",
+ "rotary" : {
+ },
+ "spritesheet" : {
+ "x" : "2695.837",
+ "y" : "370.17",
+ "width" : "128",
+ "height" : "128",
"texture" : "xt_encoder_ranged",
"tileSizeX" : "128",
"tileSizeY" : "128"
},
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "6,7,8,9,12"
+ },
"parameterAttachment" : {
- "parameter" : "F1ContextSensitive"
+ "parameter" : "F1Extra"
+ }
+ },
+ {
+ "name": "xtFilterExtraWave",
+ "image": {
+ "x": "2715.0",
+ "y": "501.0",
+ "width": "91",
+ "height": "28",
+ "texture": "xtFilterExtraWave"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "6"
+ }
+ },
+ {
+ "name": "xtFilterExtraBPOffset",
+ "image": {
+ "x": "2680.0",
+ "y": "501.0",
+ "width": "161",
+ "height": "28",
+ "texture": "xtFilterExtraBPOffset"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "7"
+ }
+ },
+ {
+ "name": "xtFilterExtraOsc2FM",
+ "image": {
+ "x": "2684.0",
+ "y": "501.0",
+ "width": "152",
+ "height": "28",
+ "texture": "xtFilterExtraOsc2FM"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "8"
+ }
+ },
+ {
+ "name": "xtFilterExtraSHRate",
+ "image": {
+ "x": "2683.0",
+ "y": "501.0",
+ "width": "154",
+ "height": "28",
+ "texture": "xtFilterExtraSHRate"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "9"
+ }
+ },
+ {
+ "name": "xtFilterExtraBandwidth",
+ "image": {
+ "x": "2675.0",
+ "y": "501.0",
+ "width": "173",
+ "height": "28",
+ "texture": "xtFilterExtraBandwidth"
+ },
+ "condition": {
+ "enableOnParameter": "F1Type",
+ "enableOnValues": "12"
}
},
{
diff --git a/source/xtJucePlugin/skins/xtDefault/xtFilterExtraBPOffset.png b/source/xtJucePlugin/skins/xtDefault/xtFilterExtraBPOffset.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xtFilterExtraBandwidth.png b/source/xtJucePlugin/skins/xtDefault/xtFilterExtraBandwidth.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xtFilterExtraOsc2FM.png b/source/xtJucePlugin/skins/xtDefault/xtFilterExtraOsc2FM.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xtFilterExtraSHRate.png b/source/xtJucePlugin/skins/xtDefault/xtFilterExtraSHRate.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xtFilterExtraWave.png b/source/xtJucePlugin/skins/xtDefault/xtFilterExtraWave.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xtPageOsc.png b/source/xtJucePlugin/skins/xtDefault/xtPageOsc.png
Binary files differ.
diff --git a/source/xtJucePlugin/skins/xtDefault/xt_encoder_unused.png b/source/xtJucePlugin/skins/xtDefault/xt_encoder_unused.png
Binary files differ.
