ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #734 from v1993/master 

Fix "Improved polygon splitting" option in GUI
This commit is contained in:
Arisotura 2020-09-03 13:12:38 +02:00 committed by GitHub
parent 1f634ed157 aed7a32243
commit 0ee5bb7a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/qt_sdl/VideoSettingsDialog.cpp
View File

@ -42,6 +42,7 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
oldVSyncInterval = Config::ScreenVSyncInterval; oldVSyncInterval = Config::ScreenVSyncInterval;
oldSoftThreaded = Config::Threaded3D; oldSoftThreaded = Config::Threaded3D;
oldGLScale = Config::GL_ScaleFactor; oldGLScale = Config::GL_ScaleFactor;
oldGLBetterPolygons = Config::GL_BetterPolygons;
grp3DRenderer = new QButtonGroup(this); grp3DRenderer = new QButtonGroup(this);
grp3DRenderer->addButton(ui->rb3DSoftware, 0); grp3DRenderer->addButton(ui->rb3DSoftware, 0);
@ -60,6 +61,8 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
ui->cbxGLResolution->addItem(QString("%1x native (%2x%3)").arg(i).arg(256*i).arg(192*i)); ui->cbxGLResolution->addItem(QString("%1x native (%2x%3)").arg(i).arg(256*i).arg(192*i));
ui->cbxGLResolution->setCurrentIndex(Config::GL_ScaleFactor-1); ui->cbxGLResolution->setCurrentIndex(Config::GL_ScaleFactor-1);
ui->cbBetterPolygons->setChecked(Config::GL_BetterPolygons != 0);
if (!Config::ScreenVSync) if (!Config::ScreenVSync)
ui->sbVSyncInterval->setEnabled(false); ui->sbVSyncInterval->setEnabled(false);
@ -68,12 +71,14 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
ui->cbGLDisplay->setEnabled(true); ui->cbGLDisplay->setEnabled(true);
ui->cbSoftwareThreaded->setEnabled(true); ui->cbSoftwareThreaded->setEnabled(true);
ui->cbxGLResolution->setEnabled(false); ui->cbxGLResolution->setEnabled(false);
ui->cbBetterPolygons->setEnabled(false);
} }
else else
{ {
ui->cbGLDisplay->setEnabled(false); ui->cbGLDisplay->setEnabled(false);
ui->cbSoftwareThreaded->setEnabled(false); ui->cbSoftwareThreaded->setEnabled(false);
ui->cbxGLResolution->setEnabled(true); ui->cbxGLResolution->setEnabled(true);
ui->cbBetterPolygons->setEnabled(true);
} }
} }
@ -99,6 +104,7 @@ void VideoSettingsDialog::on_VideoSettingsDialog_rejected()
Config::ScreenVSyncInterval = oldVSyncInterval; Config::ScreenVSyncInterval = oldVSyncInterval;
Config::Threaded3D = oldSoftThreaded; Config::Threaded3D = oldSoftThreaded;
Config::GL_ScaleFactor = oldGLScale; Config::GL_ScaleFactor = oldGLScale;
Config::GL_BetterPolygons = oldGLBetterPolygons;
bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0); bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);
emit updateVideoSettings(old_gl != new_gl); emit updateVideoSettings(old_gl != new_gl);
@ -117,12 +123,14 @@ void VideoSettingsDialog::onChange3DRenderer(int renderer)
ui->cbGLDisplay->setEnabled(true); ui->cbGLDisplay->setEnabled(true);
ui->cbSoftwareThreaded->setEnabled(true); ui->cbSoftwareThreaded->setEnabled(true);
ui->cbxGLResolution->setEnabled(false); ui->cbxGLResolution->setEnabled(false);
ui->cbBetterPolygons->setEnabled(false);
} }
else else
{ {
ui->cbGLDisplay->setEnabled(false); ui->cbGLDisplay->setEnabled(false);
ui->cbSoftwareThreaded->setEnabled(false); ui->cbSoftwareThreaded->setEnabled(false);
ui->cbxGLResolution->setEnabled(true); ui->cbxGLResolution->setEnabled(true);
ui->cbBetterPolygons->setEnabled(true);
} }
bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0); bool new_gl = (Config::ScreenUseGL != 0) || (Config::_3DRenderer != 0);

1
src/frontend/qt_sdl/VideoSettingsDialog.h
View File

@ -79,6 +79,7 @@ private:
int oldVSyncInterval; int oldVSyncInterval;
int oldSoftThreaded; int oldSoftThreaded;
int oldGLScale; int oldGLScale;
int oldGLBetterPolygons;
}; };
#endif // VIDEOSETTINGSDIALOG_H #endif // VIDEOSETTINGSDIALOG_H