prepare for new sample map UI
This commit is contained in:
parent
ad2af793ba
commit
8d4fa6e0cc
|
@ -6472,8 +6472,11 @@ FurnaceGUI::FurnaceGUI():
|
||||||
samplePreviewOn(false),
|
samplePreviewOn(false),
|
||||||
samplePreviewKey((SDL_Scancode)0),
|
samplePreviewKey((SDL_Scancode)0),
|
||||||
samplePreviewNote(0),
|
samplePreviewNote(0),
|
||||||
arpMacroScroll(-12),
|
sampleMapSelStart(-1),
|
||||||
pitchMacroScroll(-80),
|
sampleMapSelEnd(-1),
|
||||||
|
sampleMapDigit(0),
|
||||||
|
sampleMapColumn(0),
|
||||||
|
sampleMapFocused(false),
|
||||||
macroDragStart(0,0),
|
macroDragStart(0,0),
|
||||||
macroDragAreaSize(0,0),
|
macroDragAreaSize(0,0),
|
||||||
macroDragCTarget(NULL),
|
macroDragCTarget(NULL),
|
||||||
|
|
|
@ -1679,8 +1679,11 @@ class FurnaceGUI {
|
||||||
std::vector<TouchPoint> pressedPoints;
|
std::vector<TouchPoint> pressedPoints;
|
||||||
std::vector<TouchPoint> releasedPoints;
|
std::vector<TouchPoint> releasedPoints;
|
||||||
|
|
||||||
int arpMacroScroll;
|
int sampleMapSelStart;
|
||||||
int pitchMacroScroll;
|
int sampleMapSelEnd;
|
||||||
|
int sampleMapDigit;
|
||||||
|
int sampleMapColumn;
|
||||||
|
bool sampleMapFocused;
|
||||||
|
|
||||||
ImVec2 macroDragStart;
|
ImVec2 macroDragStart;
|
||||||
ImVec2 macroDragAreaSize;
|
ImVec2 macroDragAreaSize;
|
||||||
|
|
|
@ -4425,6 +4425,7 @@ void FurnaceGUI::drawInsEdit() {
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
ImGui::Text("%s",noteNames[60+i]);
|
ImGui::Text("%s",noteNames[60+i]);
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
|
// TODO: new style sample map
|
||||||
if (sampleMap.map<0 || sampleMap.map>=e->song.sampleLen) {
|
if (sampleMap.map<0 || sampleMap.map>=e->song.sampleLen) {
|
||||||
sName="-- empty --";
|
sName="-- empty --";
|
||||||
sampleMap.map=-1;
|
sampleMap.map=-1;
|
||||||
|
|
Loading…
Reference in New Issue