mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-03 17:54:06 +00:00
Code Issues Projects Releases Wiki Activity

* AA combo box no longer disables the AA alpha test checkbox.

Browse Source 
* Updated AA alpha test description to be more accurate
This commit is contained in:
Thomas Lowe 2021-11-30 20:07:29 -05:00
parent 95d7bdd0c9
commit f50cbcad81
6 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/launcher/advancedpage.cpp
View File

@ -121,7 +121,6 @@ bool Launcher::AdvancedPage::loadSettings()
loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders"); loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
if (Settings::Manager::getInt("antialiasing", "Video") == 0) { if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked); antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
antialiasAlphaTestCheckBox->setEnabled(false);
} }
loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game"); loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool))); connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
@ -445,12 +444,6 @@ void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
loadCellsForAutocomplete(cellNames); loadCellsForAutocomplete(cellNames);
} }
void Launcher::AdvancedPage::slotAASettingChanged(int aaLevel) {
antialiasAlphaTestCheckBox->setEnabled(aaLevel > 0);
if (aaLevel == 0)
antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
}
void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked) void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
{ {
weaponSheathingCheckBox->setEnabled(checked); weaponSheathingCheckBox->setEnabled(checked);

1
apps/launcher/advancedpage.hpp
View File

@ -24,7 +24,6 @@ namespace Launcher
public slots: public slots:
void slotLoadedCellsChanged(QStringList cellNames); void slotLoadedCellsChanged(QStringList cellNames);
void slotAASettingChanged(int aaLevel);
private slots: private slots:
void on_skipMenuCheckBox_stateChanged(int state); void on_skipMenuCheckBox_stateChanged(int state);

4
apps/launcher/graphicspage.cpp
View File

@ -49,10 +49,6 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
connect(shadowDistanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotShadowDistLimitToggled(bool))); connect(shadowDistanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotShadowDistLimitToggled(bool)));
} }
void Launcher::GraphicsPage::connectAntiAliasingChanged(const QObject* receiver, const char* slot) {
connect(antiAliasingComboBox, SIGNAL(currentIndexChanged(int)), receiver, slot);
}
bool Launcher::GraphicsPage::setupSDL() bool Launcher::GraphicsPage::setupSDL()
{ {
bool sdlConnectSuccessful = initSDL(); bool sdlConnectSuccessful = initSDL();

1
apps/launcher/graphicspage.hpp
View File

@ -20,7 +20,6 @@ namespace Launcher
public: public:
explicit GraphicsPage(QWidget *parent = nullptr); explicit GraphicsPage(QWidget *parent = nullptr);
void connectAntiAliasingChanged(const QObject *receiver, const char *slot);
void saveSettings(); void saveSettings();
bool loadSettings(); bool loadSettings();

1
apps/launcher/maindialog.cpp
View File

@ -146,7 +146,6 @@ void Launcher::MainDialog::createPages()
connect(mDataFilesPage, SIGNAL(signalProfileChanged(int)), mPlayPage, SLOT(setProfilesIndex(int))); connect(mDataFilesPage, SIGNAL(signalProfileChanged(int)), mPlayPage, SLOT(setProfilesIndex(int)));
// Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread // Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread
connect(mDataFilesPage, SIGNAL(signalLoadedCellsChanged(QStringList)), mAdvancedPage, SLOT(slotLoadedCellsChanged(QStringList)), Qt::QueuedConnection); connect(mDataFilesPage, SIGNAL(signalLoadedCellsChanged(QStringList)), mAdvancedPage, SLOT(slotLoadedCellsChanged(QStringList)), Qt::QueuedConnection);
mGraphicsPage->connectAntiAliasingChanged(mAdvancedPage, SLOT(slotAASettingChanged(int)));
} }
Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog() Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()

2
files/ui/advancedpage.ui
View File

@ -457,7 +457,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="antialiasAlphaTestCheckBox"> <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables alpha testing for smoother anti-aliasing (Requires anti-aliasing to be enabled)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance if MSAA is off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use anti-alias alpha testing</string> <string>Use anti-alias alpha testing</string>