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

post-merge changes

Browse source
This commit is contained in:
tildearrow 2024-06-23 04:36:21 -05:00
parent 54e9a31971
commit b4a00b8a81
4 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.h
View file

@ -52,7 +52,7 @@ class DivWorkPool;
#define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock(); #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock();
#define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false; #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false;
//#define DIV_UNSTABLE #define DIV_UNSTABLE
#define DIV_VERSION "dev213" #define DIV_VERSION "dev213"
#define DIV_ENGINE_VERSION 213 #define DIV_ENGINE_VERSION 213

22
src/gui/exportOptions.cpp
View file

@ -252,18 +252,18 @@ void FurnaceGUI::drawExportZSM(bool onWindow) {
void FurnaceGUI::drawExportTiuna(bool onWindow) { void FurnaceGUI::drawExportTiuna(bool onWindow) {
exitDisabledTimer=1; exitDisabledTimer=1;
ImGui::Text("this is NOT ROM export! (for now)\nfor use with TIunA driver, outputs asm source."); ImGui::Text(_("for use with TIunA driver. outputs asm source."));
ImGui::InputText("base song label name", &asmBaseLabel); //TODO validate label ImGui::InputText(_("base song label name"),&asmBaseLabel); // TODO: validate label
if (ImGui::InputInt("max size in first bank",&tiunaFirstBankSize,1,100)) { if (ImGui::InputInt(_("max size in first bank"),&tiunaFirstBankSize,1,100)) {
if (tiunaFirstBankSize<0) tiunaFirstBankSize=0; if (tiunaFirstBankSize<0) tiunaFirstBankSize=0;
if (tiunaFirstBankSize>4096) tiunaFirstBankSize=4096; if (tiunaFirstBankSize>4096) tiunaFirstBankSize=4096;
} }
if (ImGui::InputInt("max size in other banks",&tiunaOtherBankSize,1,100)) { if (ImGui::InputInt(_("max size in other banks"),&tiunaOtherBankSize,1,100)) {
if (tiunaOtherBankSize<16) tiunaOtherBankSize=16; if (tiunaOtherBankSize<16) tiunaOtherBankSize=16;
if (tiunaOtherBankSize>4096) tiunaOtherBankSize=4096; if (tiunaOtherBankSize>4096) tiunaOtherBankSize=4096;
} }
ImGui::Text("chips to export:"); ImGui::Text(_("chips to export:"));
int selected=0; int selected=0;
for (int i=0; i<e->song.systemLen; i++) { for (int i=0; i<e->song.systemLen; i++) {
DivSystem sys=e->song.system[i]; DivSystem sys=e->song.system[i];
@ -273,9 +273,9 @@ void FurnaceGUI::drawExportTiuna(bool onWindow) {
ImGui::EndDisabled(); ImGui::EndDisabled();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) { if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
if (!isTIA) { if (!isTIA) {
ImGui::SetTooltip("this chip is not supported by the file format!"); ImGui::SetTooltip(_("this chip is not supported by the file format!"));
} else if (selected>=1) { } else if (selected>=1) {
ImGui::SetTooltip("only one Atari TIA is supported!"); ImGui::SetTooltip(_("only one Atari TIA is supported!"));
} }
} }
if (isTIA && willExport[i]) selected++; if (isTIA && willExport[i]) selected++;
@ -283,18 +283,18 @@ void FurnaceGUI::drawExportTiuna(bool onWindow) {
if (selected>0) { if (selected>0) {
if (onWindow) { if (onWindow) {
ImGui::Separator(); ImGui::Separator();
if (ImGui::Button("Cancel",ImVec2(200.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); if (ImGui::Button(_("Cancel"),ImVec2(200.0f*dpiScale,0))) ImGui::CloseCurrentPopup();
ImGui::SameLine(); ImGui::SameLine();
} }
if (ImGui::Button("Export",ImVec2(200.0f*dpiScale,0))) { if (ImGui::Button(_("Export"),ImVec2(200.0f*dpiScale,0))) {
openFileDialog(GUI_FILE_EXPORT_TIUNA); openFileDialog(GUI_FILE_EXPORT_TIUNA);
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
} else { } else {
ImGui::Text("nothing to export"); ImGui::Text(_("nothing to export"));
if (onWindow) { if (onWindow) {
ImGui::Separator(); ImGui::Separator();
if (ImGui::Button("Cancel",ImVec2(400.0f*dpiScale,0))) ImGui::CloseCurrentPopup(); if (ImGui::Button(_("Cancel"),ImVec2(400.0f*dpiScale,0))) ImGui::CloseCurrentPopup();
} }
} }
} }

10
src/gui/gui.cpp
View file

@ -1927,11 +1927,11 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
); );
break; break;
case GUI_FILE_EXPORT_TIUNA: case GUI_FILE_EXPORT_TIUNA:
if (!dirExists(workingDirTiunaExport)) workingDirTiunaExport=getHomeDir(); if (!dirExists(workingDirROMExport)) workingDirROMExport=getHomeDir();
hasOpened=fileDialog->openSave( hasOpened=fileDialog->openSave(
"Export TIunA", "Export TIunA",
{"assembly files", "*.asm"}, {"assembly files", "*.asm"},
workingDirTiunaExport, workingDirROMExport,
dpiScale dpiScale
); );
break; break;
@ -4903,10 +4903,8 @@ bool FurnaceGUI::loop() {
case GUI_FILE_EXPORT_ZSM: case GUI_FILE_EXPORT_ZSM:
workingDirZSMExport=fileDialog->getPath()+DIR_SEPARATOR_STR; workingDirZSMExport=fileDialog->getPath()+DIR_SEPARATOR_STR;
break; break;
case GUI_FILE_EXPORT_TIUNA:
workingDirTiunaExport=fileDialog->getPath()+DIR_SEPARATOR_STR;
break;
case GUI_FILE_EXPORT_ROM: case GUI_FILE_EXPORT_ROM:
case GUI_FILE_EXPORT_TIUNA:
case GUI_FILE_EXPORT_TEXT: case GUI_FILE_EXPORT_TEXT:
case GUI_FILE_EXPORT_CMDSTREAM: case GUI_FILE_EXPORT_CMDSTREAM:
workingDirROMExport=fileDialog->getPath()+DIR_SEPARATOR_STR; workingDirROMExport=fileDialog->getPath()+DIR_SEPARATOR_STR;
@ -7304,7 +7302,6 @@ void FurnaceGUI::syncState() {
workingDirAudioExport=e->getConfString("lastDirAudioExport",workingDir); workingDirAudioExport=e->getConfString("lastDirAudioExport",workingDir);
workingDirVGMExport=e->getConfString("lastDirVGMExport",workingDir); workingDirVGMExport=e->getConfString("lastDirVGMExport",workingDir);
workingDirZSMExport=e->getConfString("lastDirZSMExport",workingDir); workingDirZSMExport=e->getConfString("lastDirZSMExport",workingDir);
workingDirTiunaExport=e->getConfString("lastDirTiunaExport",workingDir);
workingDirROMExport=e->getConfString("lastDirROMExport",workingDir); workingDirROMExport=e->getConfString("lastDirROMExport",workingDir);
workingDirFont=e->getConfString("lastDirFont",workingDir); workingDirFont=e->getConfString("lastDirFont",workingDir);
workingDirColors=e->getConfString("lastDirColors",workingDir); workingDirColors=e->getConfString("lastDirColors",workingDir);
@ -7464,7 +7461,6 @@ void FurnaceGUI::commitState(DivConfig& conf) {
conf.set("lastDirAudioExport",workingDirAudioExport); conf.set("lastDirAudioExport",workingDirAudioExport);
conf.set("lastDirVGMExport",workingDirVGMExport); conf.set("lastDirVGMExport",workingDirVGMExport);
conf.set("lastDirZSMExport",workingDirZSMExport); conf.set("lastDirZSMExport",workingDirZSMExport);
conf.set("lastDirTiunaExport",workingDirTiunaExport);
conf.set("lastDirROMExport",workingDirROMExport); conf.set("lastDirROMExport",workingDirROMExport);
conf.set("lastDirFont",workingDirFont); conf.set("lastDirFont",workingDirFont);
conf.set("lastDirColors",workingDirColors); conf.set("lastDirColors",workingDirColors);

2
src/gui/gui.h
View file

@ -1583,7 +1583,7 @@ class FurnaceGUI {
String workingDir, fileName, clipboard, warnString, errorString, lastError, curFileName, nextFile, sysSearchQuery, newSongQuery, paletteQuery; String workingDir, fileName, clipboard, warnString, errorString, lastError, curFileName, nextFile, sysSearchQuery, newSongQuery, paletteQuery;
String workingDirSong, workingDirIns, workingDirWave, workingDirSample, workingDirAudioExport; String workingDirSong, workingDirIns, workingDirWave, workingDirSample, workingDirAudioExport;
String workingDirVGMExport, workingDirZSMExport, workingDirTiunaExport, workingDirROMExport; String workingDirVGMExport, workingDirZSMExport, workingDirROMExport;
String workingDirFont, workingDirColors, workingDirKeybinds; String workingDirFont, workingDirColors, workingDirKeybinds;
String workingDirLayout, workingDirROM, workingDirTest; String workingDirLayout, workingDirROM, workingDirTest;
String workingDirConfig; String workingDirConfig;