Merge branch 'master' of https://github.com/tildearrow/furnace into k007232
This commit is contained in:
commit
2b7b227539
204 changed files with 999 additions and 1264 deletions
|
|
@ -422,6 +422,7 @@ enum FurnaceGUIActions {
|
|||
GUI_ACTION_FULLSCREEN,
|
||||
GUI_ACTION_TX81Z_REQUEST,
|
||||
GUI_ACTION_PANIC,
|
||||
GUI_ACTION_CLEAR,
|
||||
|
||||
GUI_ACTION_WINDOW_EDIT_CONTROLS,
|
||||
GUI_ACTION_WINDOW_ORDERS,
|
||||
|
|
@ -521,6 +522,8 @@ enum FurnaceGUIActions {
|
|||
GUI_ACTION_PAT_COLLAPSE_SONG,
|
||||
GUI_ACTION_PAT_EXPAND_SONG,
|
||||
GUI_ACTION_PAT_LATCH,
|
||||
GUI_ACTION_PAT_SCROLL_MODE,
|
||||
GUI_ACTION_PAT_CLEAR_LATCH,
|
||||
GUI_ACTION_PAT_MAX,
|
||||
|
||||
GUI_ACTION_INS_LIST_MIN,
|
||||
|
|
@ -654,6 +657,12 @@ enum PasteMode {
|
|||
GUI_PASTE_MODE_INS_BG
|
||||
};
|
||||
|
||||
enum NoteCtrl {
|
||||
GUI_NOTE_OFF=100,
|
||||
GUI_NOTE_OFF_RELEASE=101,
|
||||
GUI_NOTE_RELEASE=102
|
||||
};
|
||||
|
||||
#define FURKMOD_CTRL (1U<<31)
|
||||
#define FURKMOD_SHIFT (1<<29)
|
||||
#define FURKMOD_META (1<<28)
|
||||
|
|
@ -1097,6 +1106,7 @@ class FurnaceGUI {
|
|||
int macroPointSize;
|
||||
int waveEditStyle;
|
||||
int displayInsTypeListMakeInsSample;
|
||||
int mobileEditPage;
|
||||
float mobileMenuPos, autoButtonSize, mobileEditAnim;
|
||||
ImVec2 mobileEditButtonPos, mobileEditButtonSize;
|
||||
const int* curSysSection;
|
||||
|
|
@ -1678,6 +1688,21 @@ class FurnaceGUI {
|
|||
bool followLog;
|
||||
|
||||
// piano
|
||||
enum PianoLayoutMode {
|
||||
PIANO_LAYOUT_STANDARD = 0,
|
||||
PIANO_LAYOUT_CONTINUOUS,
|
||||
PIANO_LAYOUT_AUTOMATIC,
|
||||
PIANO_LAYOUT_MAX
|
||||
};
|
||||
|
||||
enum PianoInputPadMode {
|
||||
PIANO_INPUT_PAD_DISABLE = 0,
|
||||
PIANO_INPUT_PAD_REPLACE,
|
||||
PIANO_INPUT_PAD_SPLIT_AUTO,
|
||||
PIANO_INPUT_PAD_SPLIT_VISIBLE,
|
||||
PIANO_INPUT_PAD_MAX
|
||||
};
|
||||
|
||||
int pianoOctaves, pianoOctavesEdit;
|
||||
bool pianoOptions, pianoSharePosition, pianoOptionsSet;
|
||||
float pianoKeyHit[180];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue