Error tolerance was wrong. Now scale properly provided that FOV is correct. Adjust parameters for correct amount of features. Add my config for Falcon BMS/Logitech C525 vertical FOV.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@224 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

3 files changed, 170 insertions, 7 deletions

diff --git a/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp b/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp
index e440bd10..cf67c732 100644
--- a/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp
+++ b/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp
@@ -24,16 +24,16 @@ static void load_settings(ht_config_t* config, Tracker* tracker)
 	config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21;
 	config->max_keypoints = 250;
 	config->keypoint_quality = 12;
-	config->keypoint_distance = 2.1f;
-	config->keypoint_3distance = 5;
+	config->keypoint_distance = 2.3f;
+	config->keypoint_3distance = 6;
 	config->force_width = 640;
 	config->force_height = 480;
 	config->force_fps = iniFile.value("fps", 0).toInt();
 	config->camera_index = iniFile.value("camera-index", -1).toInt();
 	config->ransac_num_iters = 100;
-	config->ransac_max_reprojection_error = 2.8f;
-	config->ransac_max_inlier_error = 2.8f;
-	config->ransac_max_mean_error = 2.3f;
+	config->ransac_max_reprojection_error = 3.5f;
+	config->ransac_max_inlier_error = 3.5f;
+	config->ransac_max_mean_error = 2.6f;
 	config->ransac_abs_max_mean_error = 3.5f;
 	config->debug = 0;
 	config->ransac_min_features = 0.9f;
@@ -196,7 +196,7 @@ void VideoWidget::paintEvent(QPaintEvent *e)
 	{
 		QImage image((uchar*) data, videoFrame.width, videoFrame.height, QImage::Format_RGB888);
 		QPainter painter(this);
-		painter.drawPixmap(e->rect(), QPixmap::fromImage(image.rgbSwapped()).scaled(WIDGET_WIDTH, WIDGET_HEIGHT, Qt::AspectRatioMode::KeepAspectRatioByExpanding), e->rect());
+		painter.drawPixmap(e->rect(), QPixmap::fromImage(image.rgbSwapped()).scaled(WIDGET_WIDTH, WIDGET_HEIGHT, Qt::KeepAspectRatioByExpanding), e->rect());
 		delete[] data;
 	}
 }
@@ -290,7 +290,7 @@ void TrackerControls::loadSettings()
 	QSettings iniFile( currentFile, QSettings::IniFormat );
 	iniFile.beginGroup( "HT-Tracker" );
 	ui.cameraIndex->setValue(iniFile.value("camera-index", -1).toInt());
-	ui.cameraFOV->setValue(iniFile.value("fov", 69).toInt());
+	ui.cameraFOV->setValue(iniFile.value("fov", 69).toFloat());
 	int fps;
 	switch (iniFile.value("fps", 0).toInt())
 	{
diff --git a/bin/Settings/Falcon BMS.ini b/bin/Settings/Falcon BMS.ini
new file mode 100644
index 00000000..82e7a006
--- /dev/null
+++ b/bin/Settings/Falcon BMS.ini
@@ -0,0 +1,163 @@
+[Tracking]
+Smooth=1
+invertYaw=false
+invertPitch=true
+invertRoll=false
+invertX=false
+invertY=true
+invertZ=false
+useEWMA=true
+redYaw=60
+redPitch=60
+redRoll=60
+redX=71
+redY=70
+redZ=70
+
+[GameProtocol]
+Selection=1
+DLL=FTNoIR_Protocol_FTIR.dll
+
+[KB_Shortcuts]
+Keycode_Center=199
+Shift_Center=false
+Ctrl_Center=false
+Alt_Center=false
+Keycode_StartStop=207
+Shift_StartStop=false
+Ctrl_StartStop=false
+Alt_StartStop=false
+
+[PPJoy]
+Selection=1
+
+[FSUIPC]
+LocationOfDLL=C:/Program Files/Microsoft Games/Flight Simulator 9/Modules/FSUIPC.dll
+
+[TrackerSource]
+Selection=0
+DLL=FTNoIR_Tracker_HT.dll
+2ndDLL=None
+
+[Filter]
+DLL=FTNoIR_Filter_Accela.dll
+
+[Curves-Yaw]
+point-count=1
+point-0-x=17.75
+point-0-y=155
+
+[Curves-PitchUp]
+point-count=1
+point-0-x=18.75
+point-0-y=86
+
+[Curves-PitchDown]
+point-count=1
+point-0-x=19.75
+point-0-y=71
+
+[Curves-Roll]
+point-count=1
+point-0-x=45.25
+point-0-y=85
+
+[Curves-X]
+point-count=1
+point-0-x=12
+point-0-y=180
+point-1-x=49
+point-1-y=177
+
+[Curves-Y]
+point-count=1
+point-0-x=30
+point-0-y=180
+point-1-x=50
+point-1-y=180
+
+[Curves-Z]
+point-count=1
+point-0-x=7.25
+point-0-y=54
+point-1-x=50
+point-1-y=180
+
+[Curves-Accela-Scaling-Rotation]
+point-count=7
+point-0-x=0
+point-0-y=0
+point-1-x=0.659685863874346
+point-1-y=0.306666666666667
+point-2-x=0.863874345549738
+point-2-y=0.546666666666667
+point-3-x=0.994764397905759
+point-3-y=0.84
+point-4-x=1.08900523560209
+point-4-y=1.42666666666667
+point-5-x=1.1413612565445
+point-5-y=2.01333333333333
+point-6-x=1.23560209424084
+point-6-y=4.22666666666667
+point-7-x=2.58638743455497
+point-7-y=3.97333333333333
+point-8-x=2.65968586387435
+point-8-y=4.66666666666667
+point-9-x=2.6020942408377
+point-9-y=6
+point-10-x=2.71727748691099
+point-10-y=4.49333333333333
+point-11-x=2.86387434554974
+point-11-y=5.12
+point-12-x=3
+point-12-y=6
+
+[Curves-Accela-Scaling-Translation]
+point-count=5
+point-0-x=0
+point-0-y=0
+point-1-x=0.356020942408377
+point-1-y=0.266666666666667
+point-2-x=0.56020942408377
+point-2-y=1.04
+point-3-x=0.680628272251309
+point-3-y=1.90666666666667
+point-4-x=0.727748691099476
+point-4-y=2.72
+point-5-x=1.07329842931937
+point-5-y=2.90666666666667
+point-6-x=1.14659685863874
+point-6-y=3.78666666666667
+point-7-x=1.31937172774869
+point-7-y=4.29333333333333
+point-8-x=1.38219895287958
+point-8-y=4.90666666666667
+point-9-x=1.43455497382199
+point-9-y=5.65333333333333
+
+[SMTracker]
+FilterLevel=0
+EnableRoll=true
+EnablePitch=true
+EnableYaw=true
+EnableX=true
+EnableY=true
+EnableZ=true
+
+[FTIR]
+useTIRViews=false
+useDummyExe=false
+
+[HT-Tracker]
+fov=57.6
+fps=0
+camera-index=-1
+enable-rx=2
+enable-ry=2
+enable-rz=2
+enable-tx=2
+enable-ty=2
+enable-tz=2
+
+[Accela]
+Reduction=100
diff --git a/bin/tracker-ht/libheadtracker.dll b/bin/tracker-ht/libheadtracker.dll
index c1ebb8c7..928f7312 100644
--- a/bin/tracker-ht/libheadtracker.dll
+++ b/bin/tracker-ht/libheadtracker.dll