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

GUI: fix bit 30 macro offset/scale bugs

Browse source
This commit is contained in:
tildearrow 2025-04-08 16:41:12 -05:00
parent 0112cb82b2
commit d4e34db5b6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/insEdit.cpp
View file

@ -8717,12 +8717,14 @@ void FurnaceGUI::drawInsEdit() {
for (int i=0; i<lastMacroDesc.macro->len; i++) { for (int i=0; i<lastMacroDesc.macro->len; i++) {
int val=0; int val=0;
bool bit30=false;
if ((i-macroOffX)>=0 && (i-macroOffX)<lastMacroDesc.macro->len) { if ((i-macroOffX)>=0 && (i-macroOffX)<lastMacroDesc.macro->len) {
val=oldData[i-macroOffX]+macroOffY; bit30=enBit30(oldData[i-macroOffX]);
val=deBit30(oldData[i-macroOffX])+macroOffY;
if (val<lastMacroDesc.min) val=lastMacroDesc.min; if (val<lastMacroDesc.min) val=lastMacroDesc.min;
if (val>lastMacroDesc.max) val=lastMacroDesc.max; if (val>lastMacroDesc.max) val=lastMacroDesc.max;
} }
lastMacroDesc.macro->val[i]=val; lastMacroDesc.macro->val[i]=val^(bit30?0x40000000:0);
} }
if (lastMacroDesc.macro->loop<lastMacroDesc.macro->len) { if (lastMacroDesc.macro->loop<lastMacroDesc.macro->len) {
@ -8755,13 +8757,15 @@ void FurnaceGUI::drawInsEdit() {
for (int i=0; i<lastMacroDesc.macro->len; i++) { for (int i=0; i<lastMacroDesc.macro->len; i++) {
int val=0; int val=0;
bool bit30=false;
double posX=round((double)i*(100.0/macroScaleX)-0.01); double posX=round((double)i*(100.0/macroScaleX)-0.01);
if (posX>=0 && posX<lastMacroDesc.macro->len) { if (posX>=0 && posX<lastMacroDesc.macro->len) {
val=round((double)oldData[(int)posX]*(macroScaleY/100.0)); val=round((double)deBit30(oldData[(int)posX])*(macroScaleY/100.0));
bit30=enBit30(oldData[(int)posX]);
if (val<lastMacroDesc.min) val=lastMacroDesc.min; if (val<lastMacroDesc.min) val=lastMacroDesc.min;
if (val>lastMacroDesc.max) val=lastMacroDesc.max; if (val>lastMacroDesc.max) val=lastMacroDesc.max;
} }
lastMacroDesc.macro->val[i]=val; lastMacroDesc.macro->val[i]=val^(bit30?0x40000000:0);
} }
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();