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

possibly solve vZoom/vScroll issue

Browse source 
move these to a new DivInstrumentTemp struct
this way, undo history is not altered every time these change

issue #2179
This commit is contained in:
tildearrow 2025-03-10 12:35:05 -05:00
parent b7a8745581
commit b46a60e96d
4 changed files with 82 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/fileOps/ftm.cpp
View file

@ -358,7 +358,6 @@ void copyMacro(DivInstrument* ins, DivInstrumentMacro* from, int macro_type, int
to->len = from->len; to->len = from->len;
to->delay = from->delay; to->delay = from->delay;
to->lenMemory = from->lenMemory;
to->mode = from->mode; to->mode = from->mode;
to->rel = from->rel; to->rel = from->rel;
to->speed = from->speed; to->speed = from->speed;
@ -390,7 +389,6 @@ void copyMacro(DivInstrument* ins, DivInstrumentMacro* from, int macro_type, int
wave->len = to->len; wave->len = to->len;
wave->delay = to->delay; wave->delay = to->delay;
wave->lenMemory = to->lenMemory;
wave->mode = to->mode; wave->mode = to->mode;
wave->rel = to->rel; wave->rel = to->rel;
wave->speed = to->speed; wave->speed = to->speed;

27
src/engine/instrument.h
View file

@ -267,11 +267,6 @@ struct DivInstrumentMacro {
// 32+: operator (top 3 bits select operator, starting from 1) // 32+: operator (top 3 bits select operator, starting from 1)
unsigned char macroType; unsigned char macroType;
// the following variables are used by the GUI and not saved in the file
int vScroll, vZoom;
int typeMemory[16];
unsigned char lenMemory;
explicit DivInstrumentMacro(unsigned char initType, bool initOpen=false): explicit DivInstrumentMacro(unsigned char initType, bool initOpen=false):
mode(0), mode(0),
open(initOpen), open(initOpen),
@ -280,12 +275,8 @@ struct DivInstrumentMacro {
speed(1), speed(1),
loop(255), loop(255),
rel(255), rel(255),
macroType(initType), macroType(initType) {
vScroll(0),
vZoom(-1),
lenMemory(0) {
memset(val,0,256*sizeof(int)); memset(val,0,256*sizeof(int));
memset(typeMemory,0,16*sizeof(int));
} }
}; };
@ -1002,6 +993,20 @@ struct DivInstrumentPOD {
} }
}; };
struct DivInstrumentTemp {
// the following variables are used by the GUI and not saved in the file
int vScroll[160];
int vZoom[160];
int typeMemory[160][16];
unsigned char lenMemory[160];
DivInstrumentTemp() {
memset(vScroll,0,160*sizeof(int));
memset(vZoom,-1,160*sizeof(int));
memset(typeMemory,0,160*16*sizeof(int));
memset(lenMemory,0,160*sizeof(int));
}
};
struct MemPatch { struct MemPatch {
MemPatch() : MemPatch() :
data(NULL) data(NULL)
@ -1044,6 +1049,8 @@ struct DivInstrumentUndoStep {
struct DivInstrument : DivInstrumentPOD { struct DivInstrument : DivInstrumentPOD {
String name; String name;
DivInstrumentTemp temp;
DivInstrument() : DivInstrument() :
name("") { name("") {
// clear and construct DivInstrumentPOD so it doesn't have any garbage in the padding // clear and construct DivInstrumentPOD so it doesn't have any garbage in the padding

6
src/gui/gui.h
View file

@ -52,8 +52,8 @@
#define RESET_WAVE_MACRO_ZOOM \ #define RESET_WAVE_MACRO_ZOOM \
for (DivInstrument* _wi: e->song.ins) { \ for (DivInstrument* _wi: e->song.ins) { \
_wi->std.waveMacro.vZoom=-1; \ _wi->temp.vZoom[DIV_MACRO_WAVE]=-1; \
_wi->std.waveMacro.vScroll=-1; \ _wi->temp.vScroll[DIV_MACRO_WAVE]=-1; \
} }
#define CHECK_LONG_HOLD (mobileUI && ImGui::GetIO().MouseDown[ImGuiMouseButton_Left] && ImGui::GetIO().MouseDownDuration[ImGuiMouseButton_Left]>=longThreshold && ImGui::GetIO().MouseDownDurationPrev[ImGuiMouseButton_Left]<longThreshold && ImGui::GetIO().MouseDragMaxDistanceSqr[ImGuiMouseButton_Left]<=ImGui::GetIO().ConfigInertialScrollToleranceSqr) #define CHECK_LONG_HOLD (mobileUI && ImGui::GetIO().MouseDown[ImGuiMouseButton_Left] && ImGui::GetIO().MouseDownDuration[ImGuiMouseButton_Left]>=longThreshold && ImGui::GetIO().MouseDownDurationPrev[ImGuiMouseButton_Left]<longThreshold && ImGui::GetIO().MouseDragMaxDistanceSqr[ImGuiMouseButton_Left]<=ImGui::GetIO().ConfigInertialScrollToleranceSqr)
@ -1362,6 +1362,7 @@ struct FurnaceGUISysCategory {
}; };
struct FurnaceGUIMacroDesc { struct FurnaceGUIMacroDesc {
DivInstrument* ins;
DivInstrumentMacro* macro; DivInstrumentMacro* macro;
int min, max; int min, max;
float height; float height;
@ -1376,6 +1377,7 @@ struct FurnaceGUIMacroDesc {
bool isPitch; bool isPitch;
FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float,void*)=NULL, bool bitfield=false, const char** bfVal=NULL, bool bit30Special=false, void* hfu=NULL, bool isArp=false, bool isPitch=false): FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float,void*)=NULL, bool bitfield=false, const char** bfVal=NULL, bool bit30Special=false, void* hfu=NULL, bool isArp=false, bool isPitch=false):
ins(NULL),
macro(m), macro(m),
height(macroHeight), height(macroHeight),
displayName(name), displayName(name),

158
src/gui/insEdit.cpp
View file

@ -2015,6 +2015,9 @@ void FurnaceGUI::drawFMPreview(const ImVec2& size) {
ImGui::PlotLines("##DebugFMPreview",asFloat,FM_PREVIEW_SIZE,0,NULL,-1.0,1.0,size); ImGui::PlotLines("##DebugFMPreview",asFloat,FM_PREVIEW_SIZE,0,NULL,-1.0,1.0,size);
} }
#define MACRO_VZOOM i.ins->temp.vZoom[i.macro->macroType]
#define MACRO_VSCROLL i.ins->temp.vScroll[i.macro->macroType]
void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float availableWidth, int index) { void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float availableWidth, int index) {
static float asFloat[256]; static float asFloat[256];
static int asInt[256]; static int asInt[256];
@ -2041,20 +2044,20 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
} }
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
if (i.macro->vZoom<1) { if (MACRO_VZOOM<1) {
if (i.macro->macroType==DIV_MACRO_ARP || i.isArp) { if (i.macro->macroType==DIV_MACRO_ARP || i.isArp) {
i.macro->vZoom=24; MACRO_VZOOM=24;
i.macro->vScroll=120-12; MACRO_VSCROLL=120-12;
} else if (i.macro->macroType==DIV_MACRO_PITCH || i.isPitch) { } else if (i.macro->macroType==DIV_MACRO_PITCH || i.isPitch) {
i.macro->vZoom=128; MACRO_VZOOM=128;
i.macro->vScroll=2048-64; MACRO_VSCROLL=2048-64;
} else { } else {
i.macro->vZoom=i.max-i.min; MACRO_VZOOM=i.max-i.min;
i.macro->vScroll=0; MACRO_VSCROLL=0;
} }
} }
if (i.macro->vZoom>(i.max-i.min)) { if (MACRO_VZOOM>(i.max-i.min)) {
i.macro->vZoom=i.max-i.min; MACRO_VZOOM=i.max-i.min;
} }
memset(doHighlight,0,256*sizeof(bool)); memset(doHighlight,0,256*sizeof(bool));
@ -2082,7 +2085,7 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
if (i.isBitfield) { if (i.isBitfield) {
PlotBitfield("##IMacro",asInt,totalFit,0,i.bitfieldBits,i.max,ImVec2(availableWidth,(i.macro->open&1)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),doHighlight,uiColors[GUI_COLOR_MACRO_HIGHLIGHT],i.color,i.hoverFunc,i.hoverFuncUser); PlotBitfield("##IMacro",asInt,totalFit,0,i.bitfieldBits,i.max,ImVec2(availableWidth,(i.macro->open&1)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),doHighlight,uiColors[GUI_COLOR_MACRO_HIGHLIGHT],i.color,i.hoverFunc,i.hoverFuncUser);
} else { } else {
PlotCustom("##IMacro",asFloat,totalFit,macroDragScroll,NULL,i.min+i.macro->vScroll,i.min+i.macro->vScroll+i.macro->vZoom,ImVec2(availableWidth,(i.macro->open&1)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),i.color,i.macro->len-macroDragScroll,i.hoverFunc,i.hoverFuncUser,i.blockMode,(i.macro->open&1)?genericGuide:NULL,doHighlight,uiColors[GUI_COLOR_MACRO_HIGHLIGHT]); PlotCustom("##IMacro",asFloat,totalFit,macroDragScroll,NULL,i.min+MACRO_VSCROLL,i.min+MACRO_VSCROLL+MACRO_VZOOM,ImVec2(availableWidth,(i.macro->open&1)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),i.color,i.macro->len-macroDragScroll,i.hoverFunc,i.hoverFuncUser,i.blockMode,(i.macro->open&1)?genericGuide:NULL,doHighlight,uiColors[GUI_COLOR_MACRO_HIGHLIGHT]);
} }
if ((i.macro->open&1) && (ImGui::IsItemClicked(ImGuiMouseButton_Left) || ImGui::IsItemClicked(ImGuiMouseButton_Right))) { if ((i.macro->open&1) && (ImGui::IsItemClicked(ImGuiMouseButton_Left) || ImGui::IsItemClicked(ImGuiMouseButton_Right))) {
ImGui::InhibitInertialScroll(); ImGui::InhibitInertialScroll();
@ -2092,8 +2095,8 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
macroDragMin=i.min; macroDragMin=i.min;
macroDragMax=i.max; macroDragMax=i.max;
} else { } else {
macroDragMin=i.min+i.macro->vScroll; macroDragMin=i.min+MACRO_VSCROLL;
macroDragMax=i.min+i.macro->vScroll+i.macro->vZoom; macroDragMax=i.min+MACRO_VSCROLL+MACRO_VZOOM;
} }
macroDragBitMode=i.isBitfield; macroDragBitMode=i.isBitfield;
macroDragInitialValueSet=false; macroDragInitialValueSet=false;
@ -2113,11 +2116,11 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
if (ctrlWheeling) { if (ctrlWheeling) {
if (ImGui::IsKeyDown(ImGuiKey_LeftShift) || ImGui::IsKeyDown(ImGuiKey_RightShift)) { if (ImGui::IsKeyDown(ImGuiKey_LeftShift) || ImGui::IsKeyDown(ImGuiKey_RightShift)) {
i.macro->vZoom+=wheelY*(1+(i.macro->vZoom>>4)); MACRO_VZOOM+=wheelY*(1+(MACRO_VZOOM>>4));
if (i.macro->vZoom<1) i.macro->vZoom=1; if (MACRO_VZOOM<1) MACRO_VZOOM=1;
if (i.macro->vZoom>(i.max-i.min)) i.macro->vZoom=i.max-i.min; if (MACRO_VZOOM>(i.max-i.min)) MACRO_VZOOM=i.max-i.min;
if ((i.macro->vScroll+i.macro->vZoom)>(i.max-i.min)) { if ((MACRO_VSCROLL+MACRO_VZOOM)>(i.max-i.min)) {
i.macro->vScroll=(i.max-i.min)-i.macro->vZoom; MACRO_VSCROLL=(i.max-i.min)-MACRO_VZOOM;
} }
} else if (settings.autoMacroStepSize==0) { } else if (settings.autoMacroStepSize==0) {
macroPointSize+=wheelY; macroPointSize+=wheelY;
@ -2125,9 +2128,9 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
if (macroPointSize>256) macroPointSize=256; if (macroPointSize>256) macroPointSize=256;
} }
} else if ((ImGui::IsKeyDown(ImGuiKey_LeftShift) || ImGui::IsKeyDown(ImGuiKey_RightShift)) && wheelY!=0) { } else if ((ImGui::IsKeyDown(ImGuiKey_LeftShift) || ImGui::IsKeyDown(ImGuiKey_RightShift)) && wheelY!=0) {
i.macro->vScroll+=wheelY*(1+(i.macro->vZoom>>4)); MACRO_VSCROLL+=wheelY*(1+(MACRO_VZOOM>>4));
if (i.macro->vScroll<0) i.macro->vScroll=0; if (MACRO_VSCROLL<0) MACRO_VSCROLL=0;
if (i.macro->vScroll>((i.max-i.min)-i.macro->vZoom)) i.macro->vScroll=(i.max-i.min)-i.macro->vZoom; if (MACRO_VSCROLL>((i.max-i.min)-MACRO_VZOOM)) MACRO_VSCROLL=(i.max-i.min)-MACRO_VZOOM;
} }
} }
@ -2135,18 +2138,18 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
if (!i.isBitfield) { if (!i.isBitfield) {
if (settings.oldMacroVSlider) { if (settings.oldMacroVSlider) {
ImGui::SameLine(0.0f); ImGui::SameLine(0.0f);
if (ImGui::VSliderInt("##IMacroVScroll",ImVec2(20.0f*dpiScale,i.height*dpiScale),&i.macro->vScroll,0,(i.max-i.min)-i.macro->vZoom,"",ImGuiSliderFlags_NoInput)) { if (ImGui::VSliderInt("##IMacroVScroll",ImVec2(20.0f*dpiScale,i.height*dpiScale),&MACRO_VSCROLL,0,(i.max-i.min)-MACRO_VZOOM,"",ImGuiSliderFlags_NoInput)) {
if (i.macro->vScroll<0) i.macro->vScroll=0; if (MACRO_VSCROLL<0) MACRO_VSCROLL=0;
if (i.macro->vScroll>((i.max-i.min)-i.macro->vZoom)) i.macro->vScroll=(i.max-i.min)-i.macro->vZoom; if (MACRO_VSCROLL>((i.max-i.min)-MACRO_VZOOM)) MACRO_VSCROLL=(i.max-i.min)-MACRO_VZOOM;
} }
if (ImGui::IsItemHovered() && ctrlWheeling) { if (ImGui::IsItemHovered() && ctrlWheeling) {
i.macro->vScroll+=wheelY*(1+(i.macro->vZoom>>4)); MACRO_VSCROLL+=wheelY*(1+(MACRO_VZOOM>>4));
if (i.macro->vScroll<0) i.macro->vScroll=0; if (MACRO_VSCROLL<0) MACRO_VSCROLL=0;
if (i.macro->vScroll>((i.max-i.min)-i.macro->vZoom)) i.macro->vScroll=(i.max-i.min)-i.macro->vZoom; if (MACRO_VSCROLL>((i.max-i.min)-MACRO_VZOOM)) MACRO_VSCROLL=(i.max-i.min)-MACRO_VZOOM;
} }
} else { } else {
ImS64 scrollV=(i.max-i.min-i.macro->vZoom)-i.macro->vScroll; ImS64 scrollV=(i.max-i.min-MACRO_VZOOM)-MACRO_VSCROLL;
ImS64 availV=i.macro->vZoom; ImS64 availV=MACRO_VZOOM;
ImS64 contentsV=(i.max-i.min); ImS64 contentsV=(i.max-i.min);
ImGui::SameLine(0.0f); ImGui::SameLine(0.0f);
@ -2156,15 +2159,15 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
scrollbarPos.Max.y+=i.height*dpiScale; scrollbarPos.Max.y+=i.height*dpiScale;
ImGui::Dummy(ImVec2(ImGui::GetStyle().ScrollbarSize,i.height*dpiScale)); ImGui::Dummy(ImVec2(ImGui::GetStyle().ScrollbarSize,i.height*dpiScale));
if (ImGui::IsItemHovered() && ctrlWheeling) { if (ImGui::IsItemHovered() && ctrlWheeling) {
i.macro->vScroll+=wheelY*(1+(i.macro->vZoom>>4)); MACRO_VSCROLL+=wheelY*(1+(MACRO_VZOOM>>4));
if (i.macro->vScroll<0) i.macro->vScroll=0; if (MACRO_VSCROLL<0) MACRO_VSCROLL=0;
if (i.macro->vScroll>((i.max-i.min)-i.macro->vZoom)) i.macro->vScroll=(i.max-i.min)-i.macro->vZoom; if (MACRO_VSCROLL>((i.max-i.min)-MACRO_VZOOM)) MACRO_VSCROLL=(i.max-i.min)-MACRO_VZOOM;
} }
ImGuiID scrollbarID=ImGui::GetID("##IMacroVScroll"); ImGuiID scrollbarID=ImGui::GetID("##IMacroVScroll");
ImGui::KeepAliveID(scrollbarID); ImGui::KeepAliveID(scrollbarID);
if (ImGui::ScrollbarEx(scrollbarPos,scrollbarID,ImGuiAxis_Y,&scrollV,availV,contentsV,0)) { if (ImGui::ScrollbarEx(scrollbarPos,scrollbarID,ImGuiAxis_Y,&scrollV,availV,contentsV,0)) {
i.macro->vScroll=(i.max-i.min-i.macro->vZoom)-scrollV; MACRO_VSCROLL=(i.max-i.min-MACRO_VZOOM)-scrollV;
} }
} }
} }
@ -2411,14 +2414,14 @@ void FurnaceGUI::drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float avail
/* swap memory */ \ /* swap memory */ \
/* this way the macro isn't corrupted if the user decides to go */ \ /* this way the macro isn't corrupted if the user decides to go */ \
/* back to sequence mode */ \ /* back to sequence mode */ \
i.macro->len^=i.macro->lenMemory; \ i.macro->len^=i.ins->temp.lenMemory[i.macro->macroType]; \
i.macro->lenMemory^=i.macro->len; \ i.ins->temp.lenMemory[i.macro->macroType]^=i.macro->len; \
i.macro->len^=i.macro->lenMemory; \ i.macro->len^=i.ins->temp.lenMemory[i.macro->macroType]; \
\ \
for (int j=0; j<16; j++) { \ for (int j=0; j<16; j++) { \
i.macro->val[j]^=i.macro->typeMemory[j]; \ i.macro->val[j]^=i.ins->temp.typeMemory[i.macro->macroType][j]; \
i.macro->typeMemory[j]^=i.macro->val[j]; \ i.ins->temp.typeMemory[i.macro->macroType][j]^=i.macro->val[j]; \
i.macro->val[j]^=i.macro->typeMemory[j]; \ i.macro->val[j]^=i.ins->temp.typeMemory[i.macro->macroType][j]; \
} \ } \
\ \
/* if ADSR/LFO, populate min/max */ \ /* if ADSR/LFO, populate min/max */ \
@ -4525,8 +4528,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER
op.sus=susOn; op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].susMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SUS+(i<<5)]=-1;
} }
popWarningColor(); popWarningColor();
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
@ -4639,8 +4642,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER
opE.fixed=fixedOn; opE.fixed=fixedOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].dtMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_DT+(i<<5)]=-1;
} }
if (ins->type==DIV_INS_ESFM) { if (ins->type==DIV_INS_ESFM) {
if (fixedOn) { if (fixedOn) {
@ -5301,8 +5304,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER
op.sus=susOn; op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].susMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SUS+(i<<5)]=-1;
} }
popWarningColor(); popWarningColor();
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
@ -5403,8 +5406,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER
opE.fixed=fixedOn; opE.fixed=fixedOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].dtMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_DT+(i<<5)]=-1;
} }
ImGui::EndTable(); ImGui::EndTable();
@ -5624,8 +5627,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER if (ImGui::Checkbox(_("Pitch control"),&susOn)) { PARAMETER
op.sus=susOn; op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].susMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SUS+(i<<5)]=-1;
} }
popWarningColor(); popWarningColor();
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
@ -5964,8 +5967,8 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER if (ImGui::Checkbox(ESFM_NAME(ESFM_FIXED),&fixedOn)) { PARAMETER
opE.fixed=fixedOn; opE.fixed=fixedOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly // HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_SSG+(i<<5)]=-1;
ins->std.opMacros[i].dtMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_DT+(i<<5)]=-1;
} }
} }
@ -6041,7 +6044,7 @@ void FurnaceGUI::drawInsSID3(DivInstrument* ins) {
if (ImGui::Checkbox(_("Wavetable channel"),&ins->sid3.doWavetable)) { if (ImGui::Checkbox(_("Wavetable channel"),&ins->sid3.doWavetable)) {
PARAMETER; PARAMETER;
ins->std.waveMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_WAVE]=-1;
for (int i=0; i<256; i++) { for (int i=0; i<256; i++) {
ins->std.waveMacro.val[i]=0; ins->std.waveMacro.val[i]=0;
} }
@ -6133,7 +6136,7 @@ void FurnaceGUI::drawInsSID3(DivInstrument* ins) {
ins->sid3.resetDuty=resetDuty; ins->sid3.resetDuty=resetDuty;
} }
if (ImGui::Checkbox(_("Absolute Duty Macro"),&ins->sid3.dutyIsAbs)) { if (ImGui::Checkbox(_("Absolute Duty Macro"),&ins->sid3.dutyIsAbs)) {
ins->std.dutyMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_DUTY]=-1;
PARAMETER; PARAMETER;
} }
} }
@ -6257,7 +6260,7 @@ void FurnaceGUI::drawInsSID3(DivInstrument* ins) {
bool absCutoff=filt->absoluteCutoff; bool absCutoff=filt->absoluteCutoff;
if (ImGui::Checkbox(buffer,&absCutoff)) { PARAMETER if (ImGui::Checkbox(buffer,&absCutoff)) { PARAMETER
filt->absoluteCutoff=!filt->absoluteCutoff; filt->absoluteCutoff=!filt->absoluteCutoff;
ins->std.opMacros[i].d2rMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_OP_D2R+(i<<5)]=-1;
} }
snprintf(buffer,100,_("Change cutoff with pitch##bindcutoff%d"),i+1); snprintf(buffer,100,_("Change cutoff with pitch##bindcutoff%d"),i+1);
@ -6597,46 +6600,7 @@ void FurnaceGUI::drawInsEdit() {
ins->type=i; ins->type=i;
// reset macro zoom // reset macro zoom
ins->std.volMacro.vZoom=-1; memset(ins->temp.vZoom,-1,sizeof(ins->temp.vZoom));
ins->std.dutyMacro.vZoom=-1;
ins->std.waveMacro.vZoom=-1;
ins->std.ex1Macro.vZoom=-1;
ins->std.ex2Macro.vZoom=-1;
ins->std.ex3Macro.vZoom=-1;
ins->std.ex4Macro.vZoom=-1;
ins->std.ex5Macro.vZoom=-1;
ins->std.ex6Macro.vZoom=-1;
ins->std.ex7Macro.vZoom=-1;
ins->std.ex8Macro.vZoom=-1;
ins->std.panLMacro.vZoom=-1;
ins->std.panRMacro.vZoom=-1;
ins->std.phaseResetMacro.vZoom=-1;
ins->std.algMacro.vZoom=-1;
ins->std.fbMacro.vZoom=-1;
ins->std.fmsMacro.vZoom=-1;
ins->std.amsMacro.vZoom=-1;
for (int j=0; j<4; j++) {
ins->std.opMacros[j].amMacro.vZoom=-1;
ins->std.opMacros[j].arMacro.vZoom=-1;
ins->std.opMacros[j].drMacro.vZoom=-1;
ins->std.opMacros[j].multMacro.vZoom=-1;
ins->std.opMacros[j].rrMacro.vZoom=-1;
ins->std.opMacros[j].slMacro.vZoom=-1;
ins->std.opMacros[j].tlMacro.vZoom=-1;
ins->std.opMacros[j].dt2Macro.vZoom=-1;
ins->std.opMacros[j].rsMacro.vZoom=-1;
ins->std.opMacros[j].dtMacro.vZoom=-1;
ins->std.opMacros[j].d2rMacro.vZoom=-1;
ins->std.opMacros[j].ssgMacro.vZoom=-1;
ins->std.opMacros[j].damMacro.vZoom=-1;
ins->std.opMacros[j].dvbMacro.vZoom=-1;
ins->std.opMacros[j].egtMacro.vZoom=-1;
ins->std.opMacros[j].kslMacro.vZoom=-1;
ins->std.opMacros[j].susMacro.vZoom=-1;
ins->std.opMacros[j].vibMacro.vZoom=-1;
ins->std.opMacros[j].wsMacro.vZoom=-1;
ins->std.opMacros[j].ksrMacro.vZoom=-1;
}
} }
} }
ImGui::EndCombo(); ImGui::EndCombo();
@ -7212,11 +7176,11 @@ void FurnaceGUI::drawInsEdit() {
} }
if (ImGui::Checkbox(_("Absolute Cutoff Macro"),&ins->c64.filterIsAbs)) { if (ImGui::Checkbox(_("Absolute Cutoff Macro"),&ins->c64.filterIsAbs)) {
ins->std.algMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_ALG]=-1;
PARAMETER; PARAMETER;
} }
if (ImGui::Checkbox(_("Absolute Duty Macro"),&ins->c64.dutyIsAbs)) { if (ImGui::Checkbox(_("Absolute Duty Macro"),&ins->c64.dutyIsAbs)) {
ins->std.dutyMacro.vZoom=-1; ins->temp.vZoom[DIV_MACRO_DUTY]=-1;
PARAMETER; PARAMETER;
} }
@ -8650,8 +8614,8 @@ void FurnaceGUI::drawInsEdit() {
macroList.push_back(FurnaceGUIMacroDesc(_("PWM Boundary"),&ins->std.amsMacro,0,15,64,uiColors[GUI_COLOR_MACRO_OTHER])); macroList.push_back(FurnaceGUIMacroDesc(_("PWM Boundary"),&ins->std.amsMacro,0,15,64,uiColors[GUI_COLOR_MACRO_OTHER]));
// workaround, because the gui will not set // workaround, because the gui will not set
// zoom or scroll if we're not in macros tab // zoom or scroll if we're not in macros tab
ins->std.ex7Macro.vZoom=128; ins->temp.vZoom[DIV_MACRO_EX7]=128;
ins->std.ex7Macro.vScroll=2048-64; ins->temp.vScroll[DIV_MACRO_EX7]=2048-64;
drawMacros(macroList,macroEditStateMacros); drawMacros(macroList,macroEditStateMacros);
ImGui::EndTabItem(); ImGui::EndTabItem();
} }