piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 15:19:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

* remove old 'threaded 3D' setting from emu settings dialog

Browse Source 
* remove 'antialiasing' for now
This commit is contained in:
Arisotura
2019-05-25 20:51:26 +02:00
parent 94f5ecb647
commit af581513fb
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libui_sdl/DlgEmuSettings.cpp
View File

@ -37,7 +37,6 @@ bool opened;
uiWindow* win; uiWindow* win;
uiCheckbox* cbDirectBoot; uiCheckbox* cbDirectBoot;
uiCheckbox* cbThreaded3D;
int OnCloseWindow(uiWindow* window, void* blarg) int OnCloseWindow(uiWindow* window, void* blarg)
@ -55,14 +54,11 @@ void OnCancel(uiButton* btn, void* blarg)
void OnOk(uiButton* btn, void* blarg) void OnOk(uiButton* btn, void* blarg)
{ {
Config::DirectBoot = uiCheckboxChecked(cbDirectBoot); Config::DirectBoot = uiCheckboxChecked(cbDirectBoot);
Config::Threaded3D = uiCheckboxChecked(cbThreaded3D);
Config::Save(); Config::Save();
uiControlDestroy(uiControl(win)); uiControlDestroy(uiControl(win));
opened = false; opened = false;
ApplyNewSettings(0);
} }
void Open() void Open()
@ -87,9 +83,6 @@ void Open()
cbDirectBoot = uiNewCheckbox("Boot game directly"); cbDirectBoot = uiNewCheckbox("Boot game directly");
uiBoxAppend(in_ctrl, uiControl(cbDirectBoot), 0); uiBoxAppend(in_ctrl, uiControl(cbDirectBoot), 0);
cbThreaded3D = uiNewCheckbox("Threaded 3D renderer");
uiBoxAppend(in_ctrl, uiControl(cbThreaded3D), 0);
} }
{ {
@ -110,7 +103,6 @@ void Open()
} }
uiCheckboxSetChecked(cbDirectBoot, Config::DirectBoot); uiCheckboxSetChecked(cbDirectBoot, Config::DirectBoot);
uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D);
uiControlShow(uiControl(win)); uiControlShow(uiControl(win));
} }

16
src/libui_sdl/DlgVideoSettings.cpp
View File

@ -59,14 +59,14 @@ void UpdateControls()
uiControlEnable(uiControl(cbGLDisplay)); uiControlEnable(uiControl(cbGLDisplay));
uiControlEnable(uiControl(cbThreaded3D)); uiControlEnable(uiControl(cbThreaded3D));
uiControlDisable(uiControl(cbResolution)); uiControlDisable(uiControl(cbResolution));
uiControlDisable(uiControl(cbAntialias)); //uiControlDisable(uiControl(cbAntialias));
} }
else else
{ {
uiControlDisable(uiControl(cbGLDisplay)); uiControlDisable(uiControl(cbGLDisplay));
uiControlDisable(uiControl(cbThreaded3D)); uiControlDisable(uiControl(cbThreaded3D));
uiControlEnable(uiControl(cbResolution)); uiControlEnable(uiControl(cbResolution));
uiControlEnable(uiControl(cbAntialias)); //uiControlEnable(uiControl(cbAntialias));
} }
} }
@ -260,12 +260,12 @@ void Open()
} }
uiBoxAppend(in_ctrl, uiControl(cbResolution), 0); uiBoxAppend(in_ctrl, uiControl(cbResolution), 0);
lbl = uiNewLabel(""); //lbl = uiNewLabel("");
uiBoxAppend(in_ctrl, uiControl(lbl), 0); //uiBoxAppend(in_ctrl, uiControl(lbl), 0);
cbAntialias = uiNewCheckbox("Antialiasing"); //cbAntialias = uiNewCheckbox("Antialiasing");
uiCheckboxOnToggled(cbAntialias, OnAntialiasChanged, NULL); //uiCheckboxOnToggled(cbAntialias, OnAntialiasChanged, NULL);
uiBoxAppend(in_ctrl, uiControl(cbAntialias), 0); //uiBoxAppend(in_ctrl, uiControl(cbAntialias), 0);
} }
{ {
@ -299,7 +299,7 @@ void Open()
uiCheckboxSetChecked(cbGLDisplay, Config::ScreenUseGL); uiCheckboxSetChecked(cbGLDisplay, Config::ScreenUseGL);
uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D); uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D);
uiComboboxSetSelected(cbResolution, Config::GL_ScaleFactor-1); uiComboboxSetSelected(cbResolution, Config::GL_ScaleFactor-1);
uiCheckboxSetChecked(cbAntialias, Config::GL_Antialias); //uiCheckboxSetChecked(cbAntialias, Config::GL_Antialias);
uiRadioButtonsSetSelected(rbRenderer, Config::_3DRenderer); uiRadioButtonsSetSelected(rbRenderer, Config::_3DRenderer);
UpdateControls(); UpdateControls();