Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Parameters & Removing Mods no longer in ArmA 3 Dir #8

Merged
merged 3 commits into from
Jun 9, 2017
Merged

New Parameters & Removing Mods no longer in ArmA 3 Dir #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c71b9a
Add More Parameters (hugepages, noCB, ShowScriptErrors)
Jun 9, 2017
b43e4c3
forgot to astyle format
Jun 9, 2017
6e1c265
Removing Custom Mods no longer in ArmA3 Dir
Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 91 additions & 7 deletions MainForm.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,62 @@
<property name="position">9</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbDisableMulticore">
<property name="label" translatable="yes">Disable Multicore Rendering</property>
<property name="name">cbDisableMulticore</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">10</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">11</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbHugePages">
<property name="label" translatable="yes">Enable Huge Pages</property>
<property name="name">cbHugePages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">12</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">13</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbFilePatching">
<property name="label" translatable="yes">Enable File-Patching</property>
Expand All @@ -739,7 +795,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">10</property>
<property name="position">14</property>
</packing>
</child>
<child>
Expand All @@ -751,7 +807,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">11</property>
<property name="position">15</property>
</packing>
</child>
<child>
Expand All @@ -767,7 +823,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">12</property>
<property name="position">16</property>
</packing>
</child>
<child>
Expand All @@ -779,7 +835,35 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">13</property>
<property name="position">17</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbShowScriptErrors">
<property name="label" translatable="yes">Show Script Errors</property>
<property name="name">cbShowScriptErrors</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">18</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">19</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -821,7 +905,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">14</property>
<property name="position">20</property>
</packing>
</child>
<child>
Expand All @@ -833,7 +917,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
<property name="position">15</property>
<property name="position">21</property>
</packing>
</child>
<child>
Expand All @@ -848,7 +932,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">16</property>
<property name="position">22</property>
</packing>
</child>
</object>
Expand Down
97 changes: 76 additions & 21 deletions MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ MainWindow::MainWindow(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>
builder->get_widget("cbExThreadsGeometryLoading", cbExThreadsGeometryLoading);

builder->get_widget("cbEnableHT", cbEnableHT);
builder->get_widget("cbDisableMulticore", cbDisableMulticore);
builder->get_widget("cbHugePages", cbHugePages);

builder->get_widget("cbFilePatching", cbFilePatching);
builder->get_widget("cbNoLogs", cbNoLogs);
builder->get_widget("cbShowScriptErrors", cbShowScriptErrors);

builder->get_widget("cbWorld", cbWorld);
builder->get_widget("tbWorld", tbWorld);
Expand Down Expand Up @@ -106,8 +110,12 @@ MainWindow::MainWindow(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>
cbExThreadsGeometryLoading->set_active(Settings::ExThreadsGeometryLoading);

cbEnableHT->set_active(Settings::EnableHT);
cbDisableMulticore->set_active(Settings::DisableMulticore);
cbHugePages->set_active(Settings::HugePages);

cbFilePatching->set_active(Settings::FilePatching);
cbNoLogs->set_active(Settings::NoLogs);
cbShowScriptErrors->set_active(Settings::ShowScriptErrors);

cbWorld->set_active(Settings::World);
tbWorld->set_text(Settings::WorldValue);
Expand Down Expand Up @@ -149,8 +157,12 @@ MainWindow::MainWindow(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>
cbExThreadsGeometryLoading->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbExThreadsGeometryLoading_Toggled));

cbEnableHT->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbEnableHT_Toggled));
cbDisableMulticore->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbDisableMulticore_Toggled));
cbHugePages->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbHugePages_Toggled));

cbFilePatching->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbFilePatching_Toggled));
cbNoLogs->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbNoLogs_Toggled));
cbShowScriptErrors->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbShowScriptErrors_Toggled));

cbWorld->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::cbWorld_Toggled));
tbWorld->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::tbWorld_Changed));
Expand Down Expand Up @@ -188,8 +200,11 @@ MainWindow::MainWindow(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>
cbExThreadsTextureLoading_Toggled();
cbExThreadsGeometryLoading_Toggled();
cbEnableHT_Toggled();
cbDisableMulticore_Toggled();
cbHugePages_Toggled();
cbFilePatching_Toggled();
cbNoLogs_Toggled();
cbShowScriptErrors_Toggled();
cbWorld_Toggled();
tbWorld_Changed();
cbNoPause_Toggled();
Expand Down Expand Up @@ -543,6 +558,18 @@ void MainWindow::cbEnableHT_Toggled()
if (!ignore) Settings::EnableHT = cbEnableHT->get_active();
}

void MainWindow::cbDisableMulticore_Toggled()
{
LOG(0, "cbDisableMulticore_Toggled: " + Utils::ToString(cbDisableMulticore->get_active()));
if (!ignore) Settings::DisableMulticore = cbDisableMulticore->get_active();
}

void MainWindow::cbHugePages_Toggled()
{
LOG(0, "cbHugePages_Toggled: " + Utils::ToString(cbHugePages->get_active()));
if (!ignore) Settings::HugePages = cbHugePages->get_active();
}

void MainWindow::cbFilePatching_Toggled()
{
LOG(0, "cbFilePatching_Toggled: " + Utils::ToString(cbFilePatching->get_active()));
Expand All @@ -555,6 +582,12 @@ void MainWindow::cbNoLogs_Toggled()
if (!ignore) Settings::NoLogs = cbNoLogs->get_active();
}

void MainWindow::cbShowScriptErrors_Toggled()
{
LOG(0, "cbShowScriptErrors_Toggled: " + Utils::ToString(cbShowScriptErrors->get_active()));
if (!ignore) Settings::ShowScriptErrors = cbShowScriptErrors->get_active();
}

void MainWindow::cbWorld_Toggled()
{
LOG(0, "cbWorld_Toggled: " + Utils::ToString(cbWorld->get_active()));
Expand Down Expand Up @@ -668,36 +701,40 @@ void MainWindow::btnPlay_Clicked()
Filesystem::WriteAllText(Filesystem::HomeDirectory + Filesystem::ArmaConfigFile, newArmaCfg);
LOG(0, "Arma3.cfg:\n--------------------\n" + newArmaCfg + "\n--------------------");

parameters += Settings::SkipIntro ? "-skipIntro " : "";
parameters += Settings::Nosplash ? "-nosplash " : "";
parameters += Settings::Window ? "-window " : "";
parameters += Settings::Name ? "-name=" + Settings::NameValue + " " : "";
parameters += Settings::SkipIntro ? "-skipIntro " : "";
parameters += Settings::Nosplash ? "-nosplash " : "";
parameters += Settings::Window ? "-window " : "";
parameters += Settings::Name ? "-name=" + Settings::NameValue + " " : "";

parameters += Settings::ParameterFile ? "-par=" + Settings::ParameterFileValue + " " : "";
parameters += Settings::ParameterFile ? "-par=" + Settings::ParameterFileValue + " " : "";

parameters += Settings::CheckSignatures ? "-checkSignatures " : "";
parameters += Settings::CheckSignatures ? "-checkSignatures " : "";

parameters += Settings::CpuCount ? "-cpuCount=" + std::to_string(Settings::CpuCountValue) + " " : "";
parameters += Settings::CpuCount ? "-cpuCount=" + std::to_string(Settings::CpuCountValue) + " " : "";

int exThreadsValue = Settings::ExThreadsFileOperations
+ Settings::ExThreadsTextureLoading * 2
+ Settings::ExThreadsGeometryLoading * 4;

parameters += Settings::ExThreads ? "-exThreads=" + std::to_string(exThreadsValue) + " " : "";
parameters += Settings::ExThreads ? "-exThreads=" + std::to_string(exThreadsValue) + " " : "";

parameters += Settings::EnableHT ? "-enableHT " : "";
parameters += Settings::DisableMulticore ? "-noCB " : "";
parameters += Settings::HugePages ? "-hugepages " : "";

parameters += Settings::EnableHT ? "-enableHT " : "";
parameters += Settings::FilePatching ? "-filePatching " : "";
parameters += Settings::NoLogs ? "-noLogs " : "";
parameters += Settings::FilePatching ? "-filePatching " : "";
parameters += Settings::NoLogs ? "-noLogs " : "";
parameters += Settings::ShowScriptErrors ? "-showScriptErrors " : "";

parameters += Settings::World ? "-world=" + Settings::WorldValue + " " : "";
parameters += Settings::World ? "-world=" + Settings::WorldValue + " " : "";

parameters += Settings::NoPause ? "-noPause " : "";
parameters += Settings::NoPause ? "-noPause " : "";

parameters += Settings::Connect ? "-connect=" + Settings::ConnectValue + " " : "";
parameters += Settings::Port ? "-port=" + Settings::PortValue + " " : "";
parameters += Settings::Password ? "-password=" + Settings::PasswordValue + " " : "";
parameters += Settings::Connect ? "-connect=" + Settings::ConnectValue + " " : "";
parameters += Settings::Port ? "-port=" + Settings::PortValue + " " : "";
parameters += Settings::Password ? "-password=" + Settings::PasswordValue + " " : "";

parameters += Settings::Host ? "-host" : "";
parameters += Settings::Host ? "-host" : "";

LOG(0, "Arma 3 launch command:\n" + Settings::ArmaPath + "/arma " + parameters);

Expand Down Expand Up @@ -768,14 +805,32 @@ void MainWindow::Init()
std::vector<Mod> ArmaDirMods = Filesystem::FindMods(Settings::ArmaPath);
for (Mod m : ArmaDirMods)
{
bool alreadyExists = false;
for (Mod n : CustomMods)
{
if (n.Path == m.Path)
goto alreadyExists;
alreadyExists = true;
}
CustomMods.push_back(m);
alreadyExists:
continue;
if (!alreadyExists)
CustomMods.push_back(m);
}

// Removes CustomMods that are not located inside the ArmaDir anymore.
for (std::vector<Mod>::iterator it = CustomMods.begin(); it != CustomMods.end();)
{
bool found = false;
for (Mod m : ArmaDirMods)
{
if (it->Path == m.Path)
{
found = true;
break;
}
}
if (!found)
it = CustomMods.erase(it);
else
it++;
}

FullModList.clear();
Expand Down
8 changes: 8 additions & 0 deletions MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ class MainWindow : public Gtk::Window
Gtk::CheckButton *cbExThreadsGeometryLoading;

Gtk::CheckButton *cbEnableHT;
Gtk::CheckButton *cbDisableMulticore;
Gtk::CheckButton *cbHugePages;

Gtk::CheckButton *cbFilePatching;
Gtk::CheckButton *cbNoLogs;
Gtk::CheckButton *cbShowScriptErrors;

Gtk::CheckButton *cbWorld;
Gtk::Entry *tbWorld;
Expand Down Expand Up @@ -156,8 +160,12 @@ class MainWindow : public Gtk::Window
void cbExThreadsGeometryLoading_Toggled();

void cbEnableHT_Toggled();
void cbDisableMulticore_Toggled();
void cbHugePages_Toggled();

void cbFilePatching_Toggled();
void cbNoLogs_Toggled();
void cbShowScriptErrors_Toggled();

void cbWorld_Toggled();
void tbWorld_Changed();
Expand Down
Loading