From 40a332c956200fc6cb9c32c485bb2867d451b518 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 6 Oct 2015 03:47:43 +0200 Subject: freetrack: new game definitions --- bin/settings/facetracknoir supported games.csv | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/settings/facetracknoir supported games.csv b/bin/settings/facetracknoir supported games.csv index ad6f1393..af645517 100644 --- a/bin/settings/facetracknoir supported games.csv +++ b/bin/settings/facetracknoir supported games.csv @@ -48,6 +48,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID 40;Battlefield 2142;FreeTrack20;V170;;;9602;00281C739AD3817FD43300 41;Battleground Europe : World War II Online;FreeTrack20;V160;;;3301;0029F07957792CAD3DAF00 42;Battleground Europe : WWII Online;FreeTrack20;V160;;;11201;002A985017330A844A1200 +573;Beamng.drive;FreeTrack20;V160;;;4525;023D0291C9C05323AC9500 43;Beckman Institute UIUC;FreeTrack20;V160;;;20012;002BB59DEFA8322A926A00 44;Beyond The Red Line;FreeTrack20;V160;;;13301;002CE7A7FAA27424BA2A00 45;BF2 (Unsupported Demo);FreeTrack20;V160;;;9651;002DC6371D86156AEB6000 @@ -96,6 +97,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID 79;Crysis Mod;FreeTrack20;V160;;;1625;004F90B57839B231A24200 80;Crystal Growth Simulation;FreeTrack20;V160;;;20029;005026F79742FB241A6200 81;Crytek;FreeTrack20;V170;;;2775;0051D5F1EBBAD81C714600 +571;CS GO MOD;FreeTrack20;V160;;;12504;023BCA154A55F9587FC500 562;Cypher City;FreeTrack20;V160;;;4250;023259070AE238A9E78100 83;D2x-XL;FreeTrack20;V160;;;16001;00532E20237BEDABEB8A00 84;Dark Horizons Lore;FreeTrack20;V160;;;7901;005487801A852AA7385200 @@ -148,6 +150,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID 120;Evochron Mercenary;FreeTrack20;V160;V;Scavenger4711 ;14907;00783752FBC7B42B221A00 121;Evochron Renegades;FreeTrack20;V160;;;14905;0079621E7763FB421A1300 122;EZCA;FreeTrack20;V160;V;dennison ;2475;007A6DBB52F7B147510601 +572;EZCamViews;FreeTrack20;V160;;;4475;023CF141A5E222B5ACE000 125;F-22 Total Air War;FreeTrack20;V160;;;1750;007D20C79F475F0621DB00 126;F-35 PTA;FreeTrack20;V160;;;20185;007E26F7977E96C0352100 148;F-Trainer;FreeTrack20;V160;;;20615;0094C6371D8AFB8C3E9900 @@ -282,8 +285,8 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID 225;ManuVAR;FreeTrack20;V160;;;20455;00E153FE1E901CB0448800 226;MaqSIM4;FreeTrack20;V160;;;20026;00E28F54A207D29B611700 227;Mech Tactical Sim;FreeTrack20;V160;;;9501;00E3F3E85B1A8E34A53300 -516;MechWarrior Online;FreeTrack20;V170;;;3026;0BD2E0DCBC723836CD2400 228;Mechwarrior Online;FreeTrack20;V170;;;3025;00E414954226DB5D8CE200 +516;MechWarrior Online;FreeTrack20;V170;;;3026;0BD2E0DCBC723836CD2400 229;Medical Image Visualization;FreeTrack20;V160;;;20295;00E59343488532A5359B00 230;Meggitt Defense Systems;FreeTrack20;V160;;;20045;00E6926ED9122AB22AF300 231;MetaVR;FreeTrack20;V160;;;20545;00E7C5BEE48120A8308800 @@ -551,6 +554,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID 450;Wings of Prey;FreeTrack20;V160;V;V4Friend;1877;01C25909438736A133AC00 451;Wings of War;FreeTrack20;V160;;;7807;01C34B0FC38B36B42FB610 512;Wings: Over Flanders Fields;FreeTrack20;V160;;;2326;02008AE39AAA4624B33C00 +570;Wingsuit Simulator;FreeTrack20;V160;;;4450;023A472FA37FCD7427D900 543;World of Diving;FreeTrack20;V160;;;4025;021F27B7B28D5012E1B300 452;World Racing 2;FreeTrack20;V160;;;7201;01C41AAF68A2BA836AAE00 453;WWII Battle Tanks: T-34 vs. Tiger;FreeTrack20;V160;;;11102;01C5432C29C257F1963100 -- cgit v1.2.3 From 1760c105d0f9bdb629c710e7d612e80eb263f12b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 6 Oct 2015 04:57:17 +0200 Subject: mouse: decruft Fix Qt layouts, add to comboboxen using Qt Designer --- ftnoir_protocol_mouse/ftnoir_mousecontrols.ui | 293 ++++++++++----------- ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp | 1 + ftnoir_protocol_mouse/ftnoir_protocol_mouse.h | 1 - .../ftnoir_protocol_mouse_dialog.cpp | 19 +- 4 files changed, 141 insertions(+), 173 deletions(-) diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui index 258ed06a..b1f4bcf8 100644 --- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui +++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui @@ -9,8 +9,8 @@ 0 0 - 257 - 114 + 280 + 106 @@ -26,170 +26,153 @@ false - - - - - - - - 80 - 16777215 - - - - Select Number - - - QComboBox::InsertAlphabetically - - + + + + + + 0 + 0 + + + + Map mouse X to: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + 80 + 16777215 + + + + Select Number + + + QComboBox::InsertAlphabetically + + + + None + + + + + X + - - - - - 0 - 0 - - - - Map mouse Y to: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - + + + Y + - - - - - 0 - 0 - - - - Map mouse X to: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - + + + Z + - - - - - 80 - 16777215 - - - - Select Number - - - QComboBox::InsertAlphabetically - - + + + Yaw + + + + + Pitch + + + + + Roll + - + - - + + + + + 80 + 16777215 + + + + Select Number + + + QComboBox::InsertAlphabetically + - - - Qt::Horizontal - - - - 40 - 20 - - - + + None + - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - OK - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Cancel - - - - + + X + - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - + + Y + - + + + Z + + + + + Yaw + + + + + Pitch + + + + + Roll + + + + + + + + + 0 + 0 + + + + Map mouse Y to: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp index 5d9f9689..c0a0a868 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp @@ -6,6 +6,7 @@ */ #include "ftnoir_protocol_mouse.h" #include "opentrack/plugin-api.hpp" +#include #ifndef MOUSEEVENTF_MOVE_NOCOALESCE # define MOUSEEVENTF_MOVE_NOCOALESCE 0x2000 diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h index 95b5f72c..595be393 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h @@ -9,7 +9,6 @@ #include "ui_ftnoir_mousecontrols.h" #include -#include #include "opentrack/plugin-api.hpp" #include "opentrack/options.hpp" using namespace options; diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp index 6633ee8c..bd886351 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp @@ -28,24 +28,9 @@ MOUSEControls::MOUSEControls() { ui.setupUi( this ); - ui.cbxSelectMouse_X->addItem("None"); - ui.cbxSelectMouse_X->addItem("X"); - ui.cbxSelectMouse_X->addItem("Y"); - ui.cbxSelectMouse_X->addItem("Z"); - ui.cbxSelectMouse_X->addItem("Yaw"); - ui.cbxSelectMouse_X->addItem("Pitch"); - ui.cbxSelectMouse_X->addItem("Roll"); - ui.cbxSelectMouse_Y->addItem("None"); - ui.cbxSelectMouse_Y->addItem("X"); - ui.cbxSelectMouse_Y->addItem("Y"); - ui.cbxSelectMouse_Y->addItem("Z"); - ui.cbxSelectMouse_Y->addItem("Yaw"); - ui.cbxSelectMouse_Y->addItem("Pitch"); - ui.cbxSelectMouse_Y->addItem("Roll"); - - connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); - connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel())); + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); tie_setting(s.Mouse_X, ui.cbxSelectMouse_X); tie_setting(s.Mouse_Y, ui.cbxSelectMouse_Y); -- cgit v1.2.3 From 1df21461e663304fc6046a86ba5d2c6ea01042b7 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 6 Oct 2015 04:57:35 +0200 Subject: mouse: remove GPL, has since been rewritten --- .../ftnoir_protocol_mouse_dialog.cpp | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp index bd886351..bb5fe3b8 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp @@ -1,27 +1,3 @@ -/******************************************************************************** -* FaceTrackNoIR This program is a private project of some enthusiastic * -* gamers from Holland, who don't like to pay much for * -* head-tracking. * -* * -* Copyright (C) 2012 Wim Vriend (Developing) * -* Ron Hendriks (Researching and Testing) * -* * -* Homepage * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU General Public License as published by the * -* Free Software Foundation; either version 3 of the License, or (at your * -* option) any later version. * -* * -* This program is distributed in the hope that it will be useful, but * -* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * -* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * -* more details. * -* * -* You should have received a copy of the GNU General Public License along * -* with this program; if not, see . * -* * -********************************************************************************/ #include "ftnoir_protocol_mouse.h" #include "opentrack/plugin-api.hpp" -- cgit v1.2.3 From 0f7a4ba62369a42cf6b513ce0fa59d117551f0ed Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 6 Oct 2015 05:04:19 +0200 Subject: ui: sort combobox items according to their name, not filename --- facetracknoir/ui.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 984901f6..0672d24a 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -19,6 +19,13 @@ # include #endif +template +static QList sorted(QList xs) +{ + std::sort(xs.begin(), xs.end(), [&](const t& a, const t& b) { return a->name.toLower() < b->name.toLower(); }); + return xs; +} + MainWindow::MainWindow() : pose_update_timer(this), kbd_quit(QKeySequence("Ctrl+Q"), this), @@ -40,13 +47,13 @@ MainWindow::MainWindow() : modules.filters().push_front(std::make_shared("", dylib::Filter)); - for (auto x : modules.trackers()) + for (auto x : sorted(modules.trackers())) ui.iconcomboTrackerSource->addItem(x->icon, x->name); - for (auto x : modules.protocols()) + for (auto x : sorted(modules.protocols())) ui.iconcomboProtocol->addItem(x->icon, x->name); - for (auto x : modules.filters()) + for (auto x : sorted(modules.filters())) ui.iconcomboFilter->addItem(x->icon, x->name); refresh_config_list(); -- cgit v1.2.3