Merge branch 'chanColorsEtc' into inf2
This commit is contained in:
commit
fea3bab550
11 changed files with 207 additions and 92 deletions
|
|
@ -2090,6 +2090,7 @@ class FurnaceGUI {
|
|||
int sampleImportInstDetune;
|
||||
int mixerStyle;
|
||||
int mixerLayout;
|
||||
float channelFeedbackGamma;
|
||||
String mainFontPath;
|
||||
String headFontPath;
|
||||
String patFontPath;
|
||||
|
|
@ -2344,6 +2345,7 @@ class FurnaceGUI {
|
|||
sampleImportInstDetune(0),
|
||||
mixerStyle(1),
|
||||
mixerLayout(0),
|
||||
channelFeedbackGamma(1.0f),
|
||||
mainFontPath(""),
|
||||
headFontPath(""),
|
||||
patFontPath(""),
|
||||
|
|
@ -2696,9 +2698,10 @@ class FurnaceGUI {
|
|||
bool oscZoomSlider;
|
||||
|
||||
// per-channel oscilloscope
|
||||
int chanOscCols, chanOscAutoColsType, chanOscColorX, chanOscColorY, chanOscCenterStrat;
|
||||
int chanOscCols, chanOscColorX, chanOscColorY, chanOscCenterStrat, chanOscColorMode;
|
||||
float chanOscWindowSize, chanOscTextX, chanOscTextY, chanOscAmplify, chanOscLineSize;
|
||||
bool chanOscWaveCorr, chanOscOptions, updateChanOscGradTex, chanOscUseGrad, chanOscNormalize, chanOscRandomPhase;
|
||||
bool chanOscWaveCorr, chanOscOptions, updateChanOscGradTex, chanOscUseGrad;
|
||||
bool chanOscNormalize, chanOscRandomPhase, chanOscAutoCols;
|
||||
String chanOscTextFormat;
|
||||
ImVec4 chanOscColor, chanOscTextColor;
|
||||
Gradient2D chanOscGrad;
|
||||
|
|
@ -2838,7 +2841,11 @@ class FurnaceGUI {
|
|||
|
||||
int pianoOctaves, pianoOctavesEdit;
|
||||
bool pianoOptions, pianoSharePosition, pianoOptionsSet;
|
||||
float pianoKeyHit[180];
|
||||
struct pianoKeyState {
|
||||
float value;
|
||||
int chan;
|
||||
};
|
||||
pianoKeyState pianoKeyHit[180];
|
||||
bool pianoKeyPressed[180];
|
||||
bool pianoReadonly;
|
||||
int pianoOffset, pianoOffsetEdit;
|
||||
|
|
@ -3102,7 +3109,7 @@ class FurnaceGUI {
|
|||
bool importConfig(String path);
|
||||
bool exportConfig(String path);
|
||||
|
||||
float computeGradPos(int type, int chan);
|
||||
float computeGradPos(int type, int chan, int totalChans);
|
||||
|
||||
void resetColors();
|
||||
void resetKeybinds();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue