summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ftnoir_protocol_ft/ftnoir_ftcontrols.ui91
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.cpp2
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.h5
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp1
4 files changed, 28 insertions, 71 deletions
diff --git a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
index 172d0f8d..5356d2e5 100644
--- a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
+++ b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
@@ -12,8 +12,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>520</width>
- <height>449</height>
+ <width>422</width>
+ <height>305</height>
</rect>
</property>
<property name="sizePolicy">
@@ -42,16 +42,16 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QGroupBox" name="groupBox_2">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
- <string>TrackIR.exe</string>
+ <string>TIRViews</string>
</property>
<property name="alignment">
<set>Qt::AlignJustify|Qt::AlignTop</set>
@@ -59,55 +59,27 @@
<property name="flat">
<bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout_3">
+ <layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
- <widget class="QCheckBox" name="chkStartDummy">
+ <widget class="QCheckBox" name="chkTIRViews">
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
- <string>EZCA mode</string>
+ <string>Memory hacks</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Can enable for 180° pitch range (not shown in UI) rather than regular 90°</string>
+ <string>Only for very old and buggy old games such as CFS3.</string>
</property>
- <property name="wordWrap">
- <bool>true</bool>
+ <property name="scaledContents">
+ <bool>false</bool>
</property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Select interface</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignJustify|Qt::AlignTop</set>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QComboBox" name="cbxSelectInterface"/>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Disable one of the protocols if game is confused by presence of both at the same time.</string>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -117,7 +89,7 @@
</layout>
</widget>
</item>
- <item row="3" column="0">
+ <item row="2" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -155,23 +127,23 @@
</layout>
</widget>
</item>
- <item row="4" column="0">
+ <item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBox">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_3">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
- <string>TIRViews</string>
+ <string>Select interface</string>
</property>
<property name="alignment">
<set>Qt::AlignJustify|Qt::AlignTop</set>
@@ -179,27 +151,14 @@
<property name="flat">
<bool>false</bool>
</property>
- <layout class="QFormLayout" name="formLayout_2">
+ <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
- <widget class="QCheckBox" name="chkTIRViews">
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string>Memory hacks</string>
- </property>
- </widget>
+ <widget class="QComboBox" name="cbxSelectInterface"/>
</item>
<item row="0" column="1">
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="label_8">
<property name="text">
- <string>Only for very old and buggy old games such as CFS3.</string>
- </property>
- <property name="scaledContents">
- <bool>false</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ <string>Disable one of the protocols if game is confused by presence of both at the same time.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
index 107735e2..ae23be3c 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
@@ -50,7 +50,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
float yaw = getRadsFromDegrees(headpose[Yaw]);
- float pitch = getRadsFromDegrees(headpose[Pitch]) * (s.useDummyExe ? 2.0 : 1.0);
+ float pitch = getRadsFromDegrees(headpose[Pitch]);
float roll = getRadsFromDegrees(headpose[Roll]);
float tx = headpose[TX] * 10.f;
float ty = headpose[TY] * 10.f;
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index 5b45e41a..5a9e5cdd 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -44,12 +44,11 @@ using namespace options;
struct settings {
pbundle b;
value<int> intUsedInterface;
- value<bool> useTIRViews, useDummyExe;
+ value<bool> useTIRViews;
settings() :
b(bundle("proto-freetrack")),
intUsedInterface(b, "used-interfaces", 0),
- useTIRViews(b, "use-memory-hacks", false),
- useDummyExe(b, "ezca-mode", false)
+ useTIRViews(b, "use-memory-hacks", false)
{}
};
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
index 9db3211c..3e440607 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dialog.cpp
@@ -34,7 +34,6 @@ FTControls::FTControls()
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
connect(ui.bntLocateNPClient, SIGNAL(clicked()), this, SLOT(selectDLL()));
- tie_setting(s.useDummyExe, ui.chkStartDummy);
tie_setting(s.useTIRViews, ui.chkTIRViews);
ui.cbxSelectInterface->addItem("Enable both");
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 15:35:31 +0000