etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-26 22:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: new sample map UI, part 4

Browse source 
right click menu
This commit is contained in:
tildearrow 2023-04-12 01:38:44 -05:00
parent e4bfcd9850
commit b9b121efdf
2 changed files with 77 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/gui.cpp
View file

@ -6514,6 +6514,7 @@ FurnaceGUI::FurnaceGUI():
sampleMapDigit(0), sampleMapDigit(0),
sampleMapColumn(0), sampleMapColumn(0),
sampleMapFocused(false), sampleMapFocused(false),
sampleMapWaitingInput(false),
macroDragStart(0,0), macroDragStart(0,0),
macroDragAreaSize(0,0), macroDragAreaSize(0,0),
macroDragCTarget(NULL), macroDragCTarget(NULL),

81
src/gui/insEdit.cpp
View file

@ -4394,6 +4394,7 @@ void FurnaceGUI::drawInsEdit() {
ins->type==DIV_INS_GA20) { ins->type==DIV_INS_GA20) {
if (ImGui::BeginTabItem((ins->type==DIV_INS_SU)?"Sound Unit":"Sample")) { if (ImGui::BeginTabItem((ins->type==DIV_INS_SU)?"Sound Unit":"Sample")) {
String sName; String sName;
bool wannaOpenSMPopup=false;
if (ins->amiga.initSample<0 || ins->amiga.initSample>=e->song.sampleLen) { if (ins->amiga.initSample<0 || ins->amiga.initSample>=e->song.sampleLen) {
sName="none selected"; sName="none selected";
} else { } else {
@ -4476,11 +4477,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("note"); ImGui::Text("note");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (sampleMapFocused) { ImGui::Text("sample name");
ImGui::Text("FOCUSED");
} else {
ImGui::Text("sample name");
}
int sampleMapMin=sampleMapSelStart; int sampleMapMin=sampleMapSelStart;
int sampleMapMax=sampleMapSelEnd; int sampleMapMax=sampleMapSelEnd;
if (sampleMapMin>sampleMapMax) { if (sampleMapMin>sampleMapMax) {
@ -4526,6 +4523,26 @@ void FurnaceGUI::drawInsEdit() {
if (sampleMapFocused && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && ImGui::IsMouseDown(ImGuiMouseButton_Left)) { if (sampleMapFocused && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && ImGui::IsMouseDown(ImGuiMouseButton_Left)) {
sampleMapSelEnd=i; sampleMapSelEnd=i;
} }
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
if (sampleMapSelStart==sampleMapSelEnd) {
sampleMapFocused=true;
sampleMapColumn=0;
sampleMapDigit=0;
sampleMapSelStart=i;
sampleMapSelEnd=i;
sampleMapMin=sampleMapSelStart;
sampleMapMax=sampleMapSelEnd;
if (sampleMapMin>sampleMapMax) {
sampleMapMin^=sampleMapMax;
sampleMapMax^=sampleMapMin;
sampleMapMin^=sampleMapMax;
}
}
if (sampleMapFocused) {
wannaOpenSMPopup=true;
}
}
ImGui::PopFont(); ImGui::PopFont();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -4556,6 +4573,26 @@ void FurnaceGUI::drawInsEdit() {
if (sampleMapFocused && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && ImGui::IsMouseDown(ImGuiMouseButton_Left)) { if (sampleMapFocused && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && ImGui::IsMouseDown(ImGuiMouseButton_Left)) {
sampleMapSelEnd=i; sampleMapSelEnd=i;
} }
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
if (sampleMapSelStart==sampleMapSelEnd) {
sampleMapFocused=true;
sampleMapColumn=1;
sampleMapDigit=0;
sampleMapSelStart=i;
sampleMapSelEnd=i;
sampleMapMin=sampleMapSelStart;
sampleMapMax=sampleMapSelEnd;
if (sampleMapMin>sampleMapMax) {
sampleMapMin^=sampleMapMax;
sampleMapMax^=sampleMapMin;
sampleMapMin^=sampleMapMax;
}
}
if (sampleMapFocused) {
wannaOpenSMPopup=true;
}
}
ImGui::PopFont(); ImGui::PopFont();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -4570,6 +4607,40 @@ void FurnaceGUI::drawInsEdit() {
sampleMapFocused=false; sampleMapFocused=false;
} }
ImGui::EndDisabled(); ImGui::EndDisabled();
if (wannaOpenSMPopup) {
ImGui::OpenPopup("SampleMapUtils");
}
if (ImGui::BeginPopup("SampleMapUtils",ImGuiWindowFlags_NoMove|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings)) {
if (sampleMapSelStart==sampleMapSelEnd && sampleMapSelStart>=0 && sampleMapSelStart<120) {
if (ImGui::MenuItem("set entire map to this note")) {
if (sampleMapSelStart>=0 && sampleMapSelStart<120) {
for (int i=0; i<120; i++) {
if (i==sampleMapSelStart) continue;
ins->amiga.noteMap[i].freq=ins->amiga.noteMap[sampleMapSelStart].freq;
}
}
}
if (ImGui::MenuItem("set entire map to this sample")) {
if (sampleMapSelStart>=0 && sampleMapSelStart<120) {
for (int i=0; i<120; i++) {
if (i==sampleMapSelStart) continue;
ins->amiga.noteMap[i].map=ins->amiga.noteMap[sampleMapSelStart].map;
}
}
}
}
if (ImGui::MenuItem("reset notes")) {
for (int i=0; i<120; i++) {
ins->amiga.noteMap[i].freq=i;
}
}
if (ImGui::MenuItem("clear map samples")) {
for (int i=0; i<120; i++) {
ins->amiga.noteMap[i].map=-1;
}
}
ImGui::EndPopup();
}
ImGui::EndTabItem(); ImGui::EndTabItem();
} else { } else {
sampleMapFocused=false; sampleMapFocused=false;