aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2017-05-25 22:50:36 +0200
committerStapleButter <thetotalworm@gmail.com>2017-05-25 22:50:36 +0200
commit9d2b36127db23fba39cd83118d33ca68d8801f9a (patch)
tree4a862c44fcf681a35445069e145634b6655eb2d6
parent0c31a7ab01f0810c2d1ac2b285c93d406e48ae0b (diff)
add threaded 3D option to the interface and config file. not functional yet.
-rw-r--r--src/Config.cpp4
-rw-r--r--src/Config.h2
-rw-r--r--src/wx/EmuConfig.cpp5
-rw-r--r--src/wx/EmuConfig.h1
4 files changed, 12 insertions, 0 deletions
diff --git a/src/Config.cpp b/src/Config.cpp
index 677af96..5d7661d 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -33,6 +33,8 @@ int WindowHeight;
int DirectBoot;
+int Threaded3D;
+
typedef struct
{
char Name[16];
@@ -77,6 +79,8 @@ ConfigEntry ConfigFile[] =
{"DirectBoot", 0, &DirectBoot, 1, NULL, 0},
+ {"Threaded3D", 0, &Threaded3D, 1, NULL, 0},
+
{"", -1, NULL, 0, NULL, 0}
};
diff --git a/src/Config.h b/src/Config.h
index 0672fcc..af32130 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,6 +35,8 @@ extern int WindowHeight;
extern int DirectBoot;
+extern int Threaded3D;
+
}
#endif // CONFIG_H
diff --git a/src/wx/EmuConfig.cpp b/src/wx/EmuConfig.cpp
index 90c5e4b..bace238 100644
--- a/src/wx/EmuConfig.cpp
+++ b/src/wx/EmuConfig.cpp
@@ -36,6 +36,10 @@ EmuConfigDialog::EmuConfigDialog(wxWindow* parent)
vboxmain->Add(cbDirectBoot, 0, wxALL&(~wxBOTTOM), 15);
cbDirectBoot->SetValue(Config::DirectBoot != 0);
+ cbThreaded3D = new wxCheckBox(this, wxID_ANY, "Threaded 3D renderer");
+ vboxmain->Add(cbThreaded3D, 0, wxALL&(~wxBOTTOM), 15);
+ cbThreaded3D->SetValue(Config::Threaded3D != 0);
+
{
wxPanel* p = new wxPanel(this);
wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -62,6 +66,7 @@ EmuConfigDialog::~EmuConfigDialog()
void EmuConfigDialog::OnOk(wxCommandEvent& event)
{
Config::DirectBoot = cbDirectBoot->GetValue() ? 1:0;
+ Config::Threaded3D = cbThreaded3D->GetValue() ? 1:0;
Config::Save();
Close();
diff --git a/src/wx/EmuConfig.h b/src/wx/EmuConfig.h
index 744239a..d1f22a1 100644
--- a/src/wx/EmuConfig.h
+++ b/src/wx/EmuConfig.h
@@ -37,6 +37,7 @@ private:
void OnCancel(wxCommandEvent& event);
wxCheckBox* cbDirectBoot;
+ wxCheckBox* cbThreaded3D;
};
#endif // WX_EMUCONFIG_H