otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix wiz lab AGAIN and implement repeat pat

Browse source 
0x0b + 0x0d = broken
This commit is contained in:
tildearrow 2021-12-21 17:42:27 -05:00
parent 7b360b55a7
commit c2669f208e
5 changed files with 80 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/gui/gui.cpp
View file

@ -269,6 +269,17 @@ void FurnaceGUI::drawEditControls() {
if (ImGui::Button(ICON_FA_STOP "##Stop")) {
e->stop();
}
ImGui::Text("Follow");
ImGui::SameLine();
ImGui::Checkbox("Orders",&followOrders);
ImGui::SameLine();
ImGui::Checkbox("Pattern",&followPattern);
bool repeatPattern=e->getRepeatPattern();
if (ImGui::Checkbox("Repeat pattern",&repeatPattern)) {
e->setRepeatPattern(repeatPattern);
}
}
if (ImGui::IsWindowFocused()) curWindow=GUI_WINDOW_EDIT_CONTROLS;
ImGui::End();
@ -365,7 +376,9 @@ void FurnaceGUI::drawOrders() {
ImGui::TableSetupScrollFreeze(0,1);
float lineHeight=(ImGui::GetTextLineHeight()+4*dpiScale);
if (e->isPlaying()) {
ImGui::SetScrollY((e->getOrder()+1)*lineHeight-(ImGui::GetContentRegionAvail().y/2));
if (followOrders) {
ImGui::SetScrollY((e->getOrder()+1)*lineHeight-(ImGui::GetContentRegionAvail().y/2));
}
}
ImGui::TableNextRow(0,lineHeight);
ImGui::TableNextColumn();
@ -954,7 +967,7 @@ void FurnaceGUI::drawPattern() {
int curRow=e->getRow();
if (e->isPlaying()) updateScroll(curRow);
if (nextScroll>-0.5f) {
ImGui::SetScrollY(nextScroll);
if (followPattern) ImGui::SetScrollY(nextScroll);
nextScroll=-1.0f;
}
ImGui::TableSetupScrollFreeze(1,1);
@ -1652,6 +1665,22 @@ void FurnaceGUI::doPaste() {
}
void FurnaceGUI::keyDown(SDL_Event& ev) {
// GLOBAL KEYS
switch (ev.key.keysym.sym) {
case SDLK_F5:
if (!e->isPlaying()) e->play();
break;
case SDLK_F6:
e->play();
break;
case SDLK_F7:
e->play();
break;
case SDLK_F8:
e->stop();
break;
}
// PER-WINDOW KEYS
switch (curWindow) {
case GUI_WINDOW_PATTERN: {
if (ev.key.keysym.mod&KMOD_CTRL) {
@ -1694,6 +1723,13 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
case SDLK_INSERT:
doInsert();
break;
case SDLK_RETURN:
if (e->isPlaying()) {
e->stop();
} else {
e->play();
}
break;
default:
if (selStart.xFine==0) { // note
try {
@ -2307,6 +2343,8 @@ FurnaceGUI::FurnaceGUI():
selecting(false),
curNibble(false),
extraChannelButtons(false),
followOrders(true),
followPattern(true),
curWindow(GUI_WINDOW_NOTHING),
arpMacroScroll(0),
macroDragStart(0,0),

2
src/gui/gui.h
View file

@ -97,7 +97,7 @@ class FurnaceGUI {
bool editControlsOpen, ordersOpen, insListOpen, songInfoOpen, patternOpen, insEditOpen;
bool waveListOpen, waveEditOpen, sampleListOpen, sampleEditOpen, aboutOpen, settingsOpen;
SelectionPoint selStart, selEnd;
bool selecting, curNibble, extraChannelButtons;
bool selecting, curNibble, extraChannelButtons, followOrders, followPattern;
FurnaceGUIWindows curWindow;
std::map<SDL_Keycode,int> noteKeys;