redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-22 12:47:44 +00:00
Code Activity

Add setting to enable DXVK hud

Browse source
This commit is contained in:
redstrate 2021-11-02 20:04:53 -04:00
parent 7456f160e4
commit c807b8ddcd
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/settingswindow.cpp
View file

@ -31,19 +31,31 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
this->window.useDX9 = directXCombo->currentIndex() == 1;
});
auto infoLabel = new QLabel("This is a list of possible enhancements you can make to your Wine gaming experience.\n"
"This is all stuff you can do outside of the launcher, but we can take care of it for you.");
infoLabel->setWordWrap(true);
#if defined(Q_OS_MAC)
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
auto wineBox = new QGroupBox("Wine Options");
auto wineBoxLayout = new QFormLayout();
wineBox->setLayout(wineBoxLayout);
layout->addRow(wineBox);
auto infoLabel = new QLabel("This is a list of possible enhancements you can make to your Wine gaming experience.\n"
"This is all stuff you can do outside of the launcher, but we can take care of it for you.");
infoLabel->setWordWrap(true);
wineBoxLayout->addWidget(infoLabel);
auto enableDXVKhud = new QCheckBox("Enable DXVK HUD");
enableDXVKhud->setChecked(window.enableDXVKhud);
wineBoxLayout->addWidget(enableDXVKhud);
connect(enableDXVKhud, &QCheckBox::stateChanged, [this](int state) {
this->window.enableDXVKhud = state;
this->window.settings.setValue("enableDXVKhud", static_cast<bool>(state));
});
#endif
#if defined(Q_OS_MAC)
auto useSystemWine = new QCheckBox("Use System Wine");
useSystemWine->setChecked(window.settings.value("useSystemWine", false).toBool());
useSystemWine->setChecked(window.useSystemWine);
wineBoxLayout->addWidget(useSystemWine);
connect(useSystemWine, &QCheckBox::stateChanged, [this](int state) {
@ -61,14 +73,8 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
#endif
#if defined(Q_OS_LINUX)
auto wineBox = new QGroupBox("Wine Options");
auto wineBoxLayout = new QFormLayout();
wineBox->setLayout(wineBoxLayout);
wineBoxLayout->addWidget(infoLabel);
auto useEsync = new QCheckBox("Use Esync");
useEsync->setChecked(window.settings.value("useEsync", false).toBool());
useEsync->setChecked(window.useEsync);
wineBoxLayout->addWidget(useEsync);
auto esyncLabel = new QLabel("Improves general game performance, but requires a Wine built with the Esync patches.\n"
@ -82,8 +88,8 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
});
auto useGamescope = new QCheckBox("Use Gamescope");
useGamescope->setChecked(window.settings.value("useGamescope", false).toBool());
wineBoxLayout->addWidget( useGamescope);
useGamescope->setChecked(window.useGamescope);
wineBoxLayout->addWidget(useGamescope);
auto gamescopeLabel = new QLabel("Use the SteamOS compositor that uses Wayland.\n"
"If you are experiencing input issues on XWayland, try this option if you have it installed.");
@ -96,7 +102,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
});
auto useGamemode = new QCheckBox("Use Gamemode");
useGamemode->setChecked(window.settings.value("useGamemode", false).toBool());
useGamemode->setChecked(window.useGamemode);
wineBoxLayout->addWidget(useGamemode);
auto gamemodeLabel = new QLabel("Use Feral Interactive's GameMode, which applies a couple of performance enhancements.\n"
@ -108,8 +114,6 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
this->window.useGamemode = state;
this->window.settings.setValue("useGamemode", static_cast<bool>(state));
});
layout->addRow(wineBox);
#endif
auto currentGameDirectory = new QLabel(window.gamePath);

10
src/xivlauncher.cpp
View file

@ -82,6 +82,13 @@ void LauncherWindow::launchExecutable(const QStringList args) {
} else {
arguments.push_back("/Applications/FINAL FANTASY XIV ONLINE.app/Contents/SharedSupport/finalfantasyxiv/FINAL FANTASY XIV ONLINE/wine");
}
QStringList env = QProcess::systemEnvironment();
if(enableDXVKhud)
env << "DXVK_HUD=full";
process->setEnvironment(env);
#endif
#if defined(Q_OS_LINUX)
@ -143,6 +150,7 @@ void LauncherWindow::readInitialInformation() {
useGamemode = settings.value("useGamemode", false).toBool();
useGamescope = settings.value("useGamescope", false).toBool();
useSystemWine = settings.value("useSystemWine", false).toBool();
enableDXVKhud = settings.value("enableDXVKhud", false).toBool();
}
LauncherWindow::LauncherWindow(QWidget* parent) :
@ -274,6 +282,8 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
readInitialInformation();
launchExecutable({gamePath + "/game/ffxiv_dx11.exe", "DEV.TestSID=xxxx"});
connect(loginButton, &QPushButton::released, [=] {
auto info = LoginInformation{usernameEdit->text(), passwordEdit->text(), otpEdit->text()};

1
src/xivlauncher.h
View file

@ -38,6 +38,7 @@ public:
bool useEsync, useGamescope, useGamemode;
bool useDX9 = false;
bool useSystemWine = false;
bool enableDXVKhud = false;
void launchGame(const LoginAuth auth);
void launchExecutable(const QStringList args);