prepare for new sample map UI

This commit is contained in:
tildearrow 2023-04-10 19:49:14 -05:00
parent ad2af793ba
commit 8d4fa6e0cc
3 changed files with 11 additions and 4 deletions

View File

@ -6472,8 +6472,11 @@ FurnaceGUI::FurnaceGUI():
samplePreviewOn(false),
samplePreviewKey((SDL_Scancode)0),
samplePreviewNote(0),
arpMacroScroll(-12),
pitchMacroScroll(-80),
sampleMapSelStart(-1),
sampleMapSelEnd(-1),
sampleMapDigit(0),
sampleMapColumn(0),
sampleMapFocused(false),
macroDragStart(0,0),
macroDragAreaSize(0,0),
macroDragCTarget(NULL),

View File

@ -1679,8 +1679,11 @@ class FurnaceGUI {
std::vector<TouchPoint> pressedPoints;
std::vector<TouchPoint> releasedPoints;
int arpMacroScroll;
int pitchMacroScroll;
int sampleMapSelStart;
int sampleMapSelEnd;
int sampleMapDigit;
int sampleMapColumn;
bool sampleMapFocused;
ImVec2 macroDragStart;
ImVec2 macroDragAreaSize;

View File

@ -4425,6 +4425,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::TableNextColumn();
ImGui::Text("%s",noteNames[60+i]);
ImGui::TableNextColumn();
// TODO: new style sample map
if (sampleMap.map<0 || sampleMap.map>=e->song.sampleLen) {
sName="-- empty --";
sampleMap.map=-1;