commit 057d2c62ef394d80b46db15850a5695a9026ee03
parent b7372d4e489da5fe30ec93445982d9084cb8a53a
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Thu, 18 Apr 2024 18:55:33 +0200
fix oscillator 2 parameter issues + redesign interface to match new parameters
Diffstat:
3 files changed, 85 insertions(+), 58 deletions(-)
diff --git a/source/xtJucePlugin/parameterDescriptions_xt.json b/source/xtJucePlugin/parameterDescriptions_xt.json
@@ -31,9 +31,9 @@
{"index":13 , "name":"O2Semi" , "min":52, "max":76, "isBipolar":true, "toText":"signed"},
{"index":14 , "name":"O2Detune" , "isBipolar":true},
- {"index":16 , "name":"O2BendRange" , "min":0, "max":122, "toText":"pbrange"},
- {"index":17 , "name":"O2KeyTrack" , "min":0, "max":76, "default":64, "toText":"keytrack76"},
- {"index":18 , "name":"O2FmAmount"},
+ {"index":16 , "name":"O2Sync" , "min":0, "max":1, "toText":"offOn"},
+ {"index":17 , "name":"O2BendRange" , "min":0, "max":122, "toText":"pbrange"},
+ {"index":18 , "name":"O2KeyTrack" , "min":0, "max":76, "default":64, "toText":"keytrack76"},
{"index":19 , "name":"O2Link" , "min":0, "max":1, "toText":"offOn"},
// Wavetable
@@ -781,32 +781,32 @@
{"type": "program"},
{"type": "param", "name": "Version"}, // 0
- {"type": "param", "name": "O1Octave"},
- {"type": "param", "name": "O1Semi"},
- {"type": "param", "name": "O1Detune"},
- {"type": "null"},
- {"type": "param", "name": "O1BendRange"},
- {"type": "param", "name": "O1KeyTrack"},
- {"type": "param", "name": "O1FmAmount"},
- {"type": "null"},
- {"type": "null"},
- {"type": "null"},
- {"type": "null"},
- {"type": "param", "name": "O2Octave"},
- {"type": "param", "name": "O2Semi"},
- {"type": "param", "name": "O2Detune"},
- {"type": "null"},
- {"type": "param", "name": "O2BendRange"},
- {"type": "param", "name": "O2KeyTrack"},
- {"type": "param", "name": "O2FmAmount"},
- {"type": "param", "name": "O2Link"},
- {"type": "null"},
- {"type": "null"},
- {"type": "null"},
- {"type": "null"},
- {"type": "null"},
- {"type": "param", "name": "Wave"},
- {"type": "param", "name": "W1StartW"},
+ {"type": "param", "name": "O1Octave"}, // 1
+ {"type": "param", "name": "O1Semi"}, // 2
+ {"type": "param", "name": "O1Detune"}, // 3
+ {"type": "null"}, // 4
+ {"type": "param", "name": "O1BendRange"}, // 5
+ {"type": "param", "name": "O1KeyTrack"}, // 6
+ {"type": "param", "name": "O1FmAmount"}, // 7
+ {"type": "null"}, // 9
+ {"type": "null"}, // 9
+ {"type": "null"}, // 10
+ {"type": "null"}, // 11
+ {"type": "param", "name": "O2Octave"}, // 12
+ {"type": "param", "name": "O2Semi"}, // 13
+ {"type": "param", "name": "O2Detune"}, // 14
+ {"type": "null"}, // 15
+ {"type": "param", "name": "O2Sync"}, // 16
+ {"type": "param", "name": "O2BendRange"}, // 17
+ {"type": "param", "name": "O2KeyTrack"}, // 18
+ {"type": "param", "name": "O2Link"}, // 19
+ {"type": "null"}, // 20
+ {"type": "null"}, //
+ {"type": "null"}, //
+ {"type": "null"}, //
+ {"type": "null"}, //
+ {"type": "param", "name": "Wave"}, //
+ {"type": "param", "name": "W1StartW"}, //
{"type": "param", "name": "W1StartP"},
{"type": "param", "name": "W1EnvAmount"},
{"type": "param", "name": "W1EnvVelAmount"},
diff --git a/source/xtJucePlugin/skins/xtDefault/xtDefault.json b/source/xtJucePlugin/skins/xtDefault/xtDefault.json
@@ -718,20 +718,47 @@
}
},
{
- "name" : "xtKnob",
- "rotary" : {
- },
- "spritesheet" : {
+ "name" : "xtButton",
+ "button" : {
+ "isToggle" : "1",
+ "normalImage" : "0",
+ "overImage" : "0",
+ "downImage" : "1",
+ "normalImageOn" : "1",
+ "overImageOn" : "1",
+ "downImageOn" : "1",
"x" : "328.8624",
"y" : "1051.851",
"width" : "128",
"height" : "128",
- "texture" : "xt_encoder_ranged",
+ "texture" : "xtknob",
+ "tileSizeX" : "128",
+ "tileSizeY" : "128"
+ },
+ "parameterAttachment" : {
+ "parameter" : "O2Sync"
+ }
+ },
+ {
+ "name" : "xtLed",
+ "button" : {
+ "isToggle" : "1",
+ "normalImage" : "0",
+ "overImage" : "0",
+ "downImage" : "0",
+ "normalImageOn" : "1",
+ "overImageOn" : "1",
+ "downImageOn" : "1",
+ "x" : "440.8624",
+ "y" : "1035.851",
+ "width" : "32",
+ "height" : "32",
+ "texture" : "led",
"tileSizeX" : "128",
"tileSizeY" : "128"
},
"parameterAttachment" : {
- "parameter" : "O2FmAmount"
+ "parameter" : "O2Sync"
}
},
{
@@ -739,7 +766,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "38.10242",
+ "x" : "52.86243",
"y" : "1282.485",
"width" : "128",
"height" : "128",
@@ -756,7 +783,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "217.3624",
+ "x" : "275.8624",
"y" : "1282.485",
"width" : "128",
"height" : "128",
@@ -778,13 +805,13 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "396.6224",
- "y" : "1282.485",
- "width" : "128",
- "height" : "128",
- "texture" : "xtknob",
- "tileSizeX" : "128",
- "tileSizeY" : "128"
+ "x" : "472.3624",
+ "y" : "1317.485",
+ "width" : "64",
+ "height" : "64",
+ "texture" : "xtknob_small",
+ "tileSizeX" : "64",
+ "tileSizeY" : "64"
},
"parameterAttachment" : {
"parameter" : "O2Link"
@@ -800,8 +827,8 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "508.6224",
- "y" : "1266.485",
+ "x" : "488.3624",
+ "y" : "1383.425",
"width" : "32",
"height" : "32",
"texture" : "led",
@@ -1031,7 +1058,7 @@
"rotary" : {
},
"spritesheet" : {
- "x" : "651.4058",
+ "x" : "667.2058",
"y" : "1282.485",
"width" : "128",
"height" : "128",
@@ -1053,7 +1080,7 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "828.2058",
+ "x" : "890.2058",
"y" : "1282.485",
"width" : "128",
"height" : "128",
@@ -1075,7 +1102,7 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "940.2058",
+ "x" : "1002.206",
"y" : "1266.485",
"width" : "32",
"height" : "32",
@@ -1097,13 +1124,13 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "1005.006",
- "y" : "1282.485",
- "width" : "128",
- "height" : "128",
- "texture" : "xtknob",
- "tileSizeX" : "128",
- "tileSizeY" : "128"
+ "x" : "1083.206",
+ "y" : "1315.485",
+ "width" : "64",
+ "height" : "64",
+ "texture" : "xtknob_small",
+ "tileSizeX" : "64",
+ "tileSizeY" : "64"
},
"parameterAttachment" : {
"parameter" : "W2Link"
@@ -1119,8 +1146,8 @@
"normalImageOn" : "1",
"overImageOn" : "1",
"downImageOn" : "1",
- "x" : "1117.006",
- "y" : "1266.485",
+ "x" : "1099.206",
+ "y" : "1380.905",
"width" : "32",
"height" : "32",
"texture" : "led",
diff --git a/source/xtJucePlugin/skins/xtDefault/xtPageOsc.png b/source/xtJucePlugin/skins/xtDefault/xtPageOsc.png
Binary files differ.
