From de8ca77801f1f7de1e553967f80147ad89345912 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Tue, 25 Jan 2011 20:52:17 +0000 Subject: Fixed beta filter-initialize git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@44 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FaceTrackNoIR.suo | Bin 325632 -> 325632 bytes FaceTrackNoIR/FaceTrackNoIR.cpp | 3 ++- FaceTrackNoIR/FaceTrackNoIR.qrc | 2 ++ FaceTrackNoIR/FaceTrackNoIR.ui | 30 +++++++++++++++--------------- FaceTrackNoIR/tracker.cpp | 14 +++++++------- bin/FaceTrackNoIR.exe | Bin 737280 -> 737280 bytes bin/Settings/Wings of Prey.ini | 7 +++++-- bin/images/Settings16.png | Bin 0 -> 711 bytes bin/images/SettingsOpen16.png | Bin 0 -> 686 bytes 9 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 bin/images/Settings16.png create mode 100644 bin/images/SettingsOpen16.png diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo index 3713f390..2969c4b5 100644 Binary files a/FaceTrackNoIR.suo and b/FaceTrackNoIR.suo differ diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp index cec69d44..8c678100 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.cpp +++ b/FaceTrackNoIR/FaceTrackNoIR.cpp @@ -405,8 +405,9 @@ void FaceTrackNoIR::loadSettings() { disconnect(ui.iconcomboProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(profileSelected(int))); ui.iconcomboProfile->clear(); for ( int i = 0; i < iniFileList.size(); i++) { - ui.iconcomboProfile->addItem(iniFileList.at(i)); + ui.iconcomboProfile->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/Settings16.png"), iniFileList.at(i)); if (iniFileList.at(i) == pathInfo.fileName()) { + ui.iconcomboProfile->setItemIcon(i, QIcon(QCoreApplication::applicationDirPath() + "/images/SettingsOpen16.png")); ui.iconcomboProfile->setCurrentIndex( i ); } } diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc index 1093f7ec..17aa1be6 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.qrc +++ b/FaceTrackNoIR/FaceTrackNoIR.qrc @@ -1,5 +1,7 @@ + images/Settings16.png + images/SettingsOpen16.png UIElements/Donate.png UIElements/Curves.png images/rotation_DOFs.png diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui index 22e5bcf4..e6ebde75 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.ui +++ b/FaceTrackNoIR/FaceTrackNoIR.ui @@ -813,7 +813,7 @@ border:none; 10 20 - 161 + 180 22 @@ -835,12 +835,12 @@ border:none; 10 80 - 161 + 180 23 - Change tracker settings + Save the INI-file under another name @@ -854,12 +854,12 @@ border:none; 10 50 - 75 + 81 23 - Start the Tracker + Load an INI-file from a folder @@ -874,14 +874,14 @@ border:none; - 96 + 110 50 - 75 + 81 23 - Stop the Tracker + Save the current INI-file @@ -911,7 +911,7 @@ border:none; 10 20 - 161 + 180 22 @@ -933,7 +933,7 @@ border:none; 10 80 - 161 + 180 23 @@ -952,7 +952,7 @@ border:none; 10 50 - 75 + 81 23 @@ -972,9 +972,9 @@ border:none; - 96 + 109 50 - 75 + 81 23 @@ -1009,7 +1009,7 @@ border:none; 10 20 - 151 + 180 22 @@ -1031,7 +1031,7 @@ border:none; 10 80 - 151 + 180 23 diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index c054873d..bc7b45f8 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -335,13 +335,6 @@ void Tracker::run() { smEngineHeadPoseData temp_head_pose; // headpose from faceAPI # endif - new_camera_position.x = 0.0f; - new_camera_position.y = 0.0f; - new_camera_position.z = 0.0f; - new_camera_position.yaw = 0.0f; - new_camera_position.pitch = 0.0f; - new_camera_position.roll = 0.0f; - // // Test some Filter-stuff // @@ -432,6 +425,13 @@ void Tracker::run() { Z.rawList.clear(); Z.prevPos = 0.0f; + current_camera_position.x = 0.0f; + current_camera_position.y = 0.0f; + current_camera_position.z = 0.0f; + current_camera_position.yaw = 0.0f; + current_camera_position.pitch = 0.0f; + current_camera_position.roll = 0.0f; + _engine->start(); } else { diff --git a/bin/FaceTrackNoIR.exe b/bin/FaceTrackNoIR.exe index 618cc1fb..dd98c3ca 100644 Binary files a/bin/FaceTrackNoIR.exe and b/bin/FaceTrackNoIR.exe differ diff --git a/bin/Settings/Wings of Prey.ini b/bin/Settings/Wings of Prey.ini index c0e29816..44459460 100644 --- a/bin/Settings/Wings of Prey.ini +++ b/bin/Settings/Wings of Prey.ini @@ -20,6 +20,9 @@ redRoll=60 redX=50 redY=50 redZ=50 +minSmooth=10 +powCurve=2 +maxSmooth=50 [GameProtocol] Selection=4 @@ -45,7 +48,7 @@ Inhibit_Y=false Inhibit_Z=false [Curves] -Yaw_point1=@Variant(\0\0\0\x1a@\x12\0\0\0\0\0\0@\x12\0\0\0\0\0\0) +Yaw_point1=@Variant(\0\0\0\x1a@\x14\0\0\0\0\0\0@\x14\0\0\0\0\0\0) Yaw_point2=@Variant(\0\0\0\x1a@_\xc0\0\0\0\0\0@ \0\0\0\0\0\0) Yaw_point3=@Variant(\0\0\0\x1a@c`\0\0\0\0\0@?\0\0\0\0\0\0) Yaw_point4=@Variant(\0\0\0\x1a@f\x80\0\0\0\0\0@I\0\0\0\0\0\0) @@ -53,7 +56,7 @@ Pitch_point1=@Variant(\0\0\0\x1a@\b\0\0\0\0\0\0@\b\0\0\0\0\0\0) Pitch_point2=@Variant(\0\0\0\x1a@W@\0\0\0\0\0@ \0\0\0\0\0\0) Pitch_point3=@Variant(\0\0\0\x1a@\\\xc0\0\0\0\0\0@9\0\0\0\0\0\0) Pitch_point4=@Variant(\0\0\0\x1a@f\x80\0\0\0\0\0@I\0\0\0\0\0\0) -Roll_point1=@Variant(\0\0\0\x1a@\f\0\0\0\0\0\0@\f\0\0\0\0\0\0) +Roll_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x10\0\0\0\0\0\0) Roll_point2=@Variant(\0\0\0\x1a@S\0\0\0\0\0\0@3\0\0\0\0\0\0) Roll_point3=@Variant(\0\0\0\x1a@a\xa0\0\0\0\0\0@C\0\0\0\0\0\0) Roll_point4=@Variant(\0\0\0\x1a@d@\0\0\0\0\0@I\0\0\0\0\0\0) diff --git a/bin/images/Settings16.png b/bin/images/Settings16.png new file mode 100644 index 00000000..3b31623b Binary files /dev/null and b/bin/images/Settings16.png differ diff --git a/bin/images/SettingsOpen16.png b/bin/images/SettingsOpen16.png new file mode 100644 index 00000000..5bf65f0d Binary files /dev/null and b/bin/images/SettingsOpen16.png differ -- cgit v1.2.3