From 8aa64afab7f3fd153d7a881e27442a78d57ec103 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Sun, 16 Dec 2012 11:33:23 +0000 Subject: Fixed some error(s) after testing INNO installer git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@198 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Protocol_SC/FTNoIR_Protocol_SC.cpp | 4 +- FaceTrackNoIR/FaceTrackNoIR.qrc | 14 --- FaceTrackNoIR/FaceTrackNoIR.ui | 4 +- FaceTrackNoIR/tracker.cpp | 3 + bin/Settings/AICIHT.ini | 96 +++++++++++++++++ bin/Settings/SimConnect.ini | 169 ++++++++++++------------------ bin/Settings/default.ini | 36 ++++++- 7 files changed, 205 insertions(+), 121 deletions(-) delete mode 100644 FaceTrackNoIR/FaceTrackNoIR.qrc create mode 100644 bin/Settings/AICIHT.ini diff --git a/FTNoIR_Protocol_SC/FTNoIR_Protocol_SC.cpp b/FTNoIR_Protocol_SC/FTNoIR_Protocol_SC.cpp index a612d731..ed8a79ab 100644 --- a/FTNoIR_Protocol_SC/FTNoIR_Protocol_SC.cpp +++ b/FTNoIR_Protocol_SC/FTNoIR_Protocol_SC.cpp @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License along * * with this program; if not, see . * * * -* FTNoIR_Protocol FTNoIR_Protocol is the Class, that communicates headpose-data * +* FTNoIR_Protocol: the Class, that communicates headpose-data * * to games, using the SimConnect.dll. * * SimConnect.dll is a so called 'side-by-side' assembly, so it * * must be treated as such... * @@ -179,7 +179,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK( HANDLE handle ) QString manifest(QCoreApplication::applicationDirPath()); // manifest += "\\FaceTrackNoIR.exe"; - manifest += "\\FTNoIR_Protocol.dll"; + manifest += "\\FTNoIR_Protocol_SC.dll"; const wchar_t * encodedName = reinterpret_cast(manifest.utf16()); act.lpSource = encodedName; diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc deleted file mode 100644 index 60e4da7b..00000000 --- a/FaceTrackNoIR/FaceTrackNoIR.qrc +++ /dev/null @@ -1,14 +0,0 @@ - - - UIElements/Tools.png - images/Settings16.png - images/SettingsOpen16.png - UIElements/Donate.png - UIElements/Curves.png - images/rotation_DOFs.png - images/translation_DOFs.png - images/330px-6DOF_en.png - images/FaceTrackNoIR.ico - UIElements/aboutFaceTrackNoIR.png - - diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui index 9b32fc89..2a478809 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.ui +++ b/FaceTrackNoIR/FaceTrackNoIR.ui @@ -2081,8 +2081,8 @@ background:none; Edit the Keyboard and mouse shortcuts - Short -cuts + Short- +keys diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index f24ace79..251f2274 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -23,6 +23,7 @@ *********************************************************************************/ /* Modifications (last one on top): + 20121215 - WVR: Fixed crash after message: protocol not installed correctly... by terminating the thread. 20120921 - WVR: Fixed centering when no filter is selected. 20120917 - WVR: Added Mouse-buttons to ShortKeys. 20120827 - WVR: Signal tracking = false to Curve-widget(s) when quitting run(). Also when Alternative Pitch curve is used. @@ -320,6 +321,8 @@ void Tracker::setup() { DLL_Ok = pProtocol->checkServerInstallationOK( mainApp->winId() ); if (!DLL_Ok) { + // Trigger thread to stop + ::SetEvent(m_StopThread); QMessageBox::information(mainApp, "FaceTrackNoIR error", "Protocol is not (correctly) installed!"); } } diff --git a/bin/Settings/AICIHT.ini b/bin/Settings/AICIHT.ini new file mode 100644 index 00000000..b3b58e72 --- /dev/null +++ b/bin/Settings/AICIHT.ini @@ -0,0 +1,96 @@ +[Curves-Accela-Scaling-Rotation] +point-count=12 +point-0-x=0 +point-0-y=0 +point-1-x=0.308900523560209 +point-1-y=0.0666666666666667 +point-2-x=0.565445026178011 +point-2-y=0.226666666666667 +point-3-x=0.769633507853403 +point-3-y=0.506666666666667 +point-4-x=0.994764397905759 +point-4-y=1 +point-5-x=1.23560209424084 +point-5-y=1.61333333333333 +point-6-x=1.47643979057592 +point-6-y=2.37333333333333 +point-7-x=1.66492146596859 +point-7-y=3.12 +point-8-x=1.80628272251309 +point-8-y=3.92 +point-9-x=1.91623036649215 +point-9-y=4.70666666666667 +point-10-x=2.00523560209424 +point-10-y=5.44 +point-11-x=2.07329842931937 +point-11-y=6 + +[Curves-Accela-Scaling-Translation] +point-count=10 +point-0-x=0 +point-0-y=0 +point-1-x=0.282722513089005 +point-1-y=0.08 +point-2-x=0.492146596858639 +point-2-y=0.306666666666667 +point-3-x=0.764397905759162 +point-3-y=0.84 +point-4-x=1.00523560209424 +point-4-y=1.62666666666667 +point-5-x=1.17277486910995 +point-5-y=2.78666666666667 +point-6-x=1.25130890052356 +point-6-y=3.6 +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 + +[FTIR] +useTIRViews=false +useDummyExe=true + +[Tracking] +Smooth=1 +invertYaw=false +invertPitch=false +invertRoll=false +invertX=false +invertY=false +invertZ=false +useEWMA=true + +[GameProtocol] +DLL=FTNoIR_Protocol_FTIR.dll + +[TrackerSource] +DLL=FTNoIR_Tracker_AIC_IHT.dll +2ndDLL=None + +[Filter] +DLL=FTNoIR_Filter_Accela.dll + +[ArduinoTracker] +PortNumber=3 +AutoDetect=true +LogData=false +RollAxis=0 +PitchAxis=1 +YawAxis=2 +XAxis=3 +YAxis=4 +ZAxis=5 +InvertRoll=false +InvertPitch=false +InvertYaw=false +InvertX=false +InvertY=false +InvertZ=false +EnableRoll=true +EnablePitch=true +EnableYaw=true +EnableX=false +EnableY=false +EnableZ=false diff --git a/bin/Settings/SimConnect.ini b/bin/Settings/SimConnect.ini index 6b2b3e79..87466e2a 100644 --- a/bin/Settings/SimConnect.ini +++ b/bin/Settings/SimConnect.ini @@ -7,49 +7,18 @@ invertX=false invertY=false invertZ=false useEWMA=true -redYaw=95 -redPitch=90 -redRoll=90 -redX=90 -redY=90 -redZ=90 -minSmooth=20 -powCurve=12 -maxSmooth=70 [GameProtocol] -Selection=7 DLL=FTNoIR_Protocol_SC.dll +Selection=1 [TrackerSource] -Selection=2 DLL=FTNoIR_Tracker_SM.dll +2ndDLL=None +Selection=0 -[Curves] -Yaw_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x10\0\0\0\0\0\0) -Yaw_point2="@Variant(\0\0\0\x1a@Y\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@G\0\0\0\0\0\0) -Yaw_point4=@Variant(\0\0\0\x1a@e\xc0\0\0\0\0\0@I\0\0\0\0\0\0) -Pitch_point1=@Variant(\0\0\0\x1a@\x18\0\0\0\0\0\0@\x18\0\0\0\0\0\0) -Pitch_point2=@Variant(\0\0\0\x1a@1\0\0\0\0\0\0@1\0\0\0\0\0\0) -Pitch_point3=@Variant(\0\0\0\x1a@@\x80\0\0\0\0\0@@\x80\0\0\0\0\0) -Pitch_point4=@Variant(\0\0\0\x1a@f\0\0\0\0\0\0@I\0\0\0\0\0\0) -Roll_point1=@Variant(\0\0\0\x1a@\x14\0\0\0\0\0\0@\x14\0\0\0\0\0\0) -Roll_point2=@Variant(\0\0\0\x1a@1\0\0\0\0\0\0@1\0\0\0\0\0\0) -Roll_point3=@Variant(\0\0\0\x1a@@\x80\0\0\0\0\0@@\x80\0\0\0\0\0) -Roll_point4=@Variant(\0\0\0\x1a@f \0\0\0\0\0@I\0\0\0\0\0\0) -X_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0?\xf0\0\0\0\0\0\0) -X_point2=@Variant(\0\0\0\x1a@K\x80\0\0\0\0\0@6\0\0\0\0\0\0) -X_point3=@Variant(\0\0\0\x1a@T@\0\0\0\0\0@A\x80\0\0\0\0\0) -X_point4=@Variant(\0\0\0\x1a@[@\0\0\0\0\0@I\0\0\0\0\0\0) -Y_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0?\xf0\0\0\0\0\0\0) -Y_point2=@Variant(\0\0\0\x1a@M\x80\0\0\0\0\0@3\0\0\0\0\0\0) -Y_point3=@Variant(\0\0\0\x1a@X\xc0\0\0\0\0\0@C\0\0\0\0\0\0) -Y_point4=@Variant(\0\0\0\x1a@[\x80\0\0\0\0\0@I\0\0\0\0\0\0) -Z_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0?\xf0\0\0\0\0\0\0) -Z_point2=@Variant(\0\0\0\x1a@K\0\0\0\0\0\0@3\0\0\0\0\0\0) -Z_point3=@Variant(\0\0\0\x1a@T\x80\0\0\0\0\0@C\0\0\0\0\0\0) -Z_point4=@Variant(\0\0\0\x1a@\\\x80\0\0\0\0\0@I\0\0\0\0\0\0) +[Filter] +DLL=FTNoIR_Filter_Accela.dll [KB_Shortcuts] Keycode_Center=199 @@ -80,96 +49,96 @@ Ctrl_GameZero=false Alt_GameZero=false MouseKey_StartStop=0 MouseKey_Inhibit=0 -Enable_ReverseAxis=false -RA_Yaw=40 -RA_ZPos=-20 -RA_ToZPos=50 - -[FTN] -LocalPCOnly=true -IP-1=127 -IP-2=0 -IP-3=0 -IP-4=1 -PortNumber=5550 - -[FG] -LocalPCOnly=true -IP-1=127 -IP-2=0 -IP-3=0 -IP-4=1 -PortNumber=5550 - -[Curves-Accela-Scaling-Rotation] -point-count=4 -point-0-x=0.916230366492147 -point-0-y=2.73913043478261 -point-1-x=2.13089005235602 -point-1-y=3.26086956521739 -point-2-x=3.54450261780105 -point-2-y=4.21739130434783 -point-3-x=4 -point-3-y=5.17391304347826 - -[Curves-Accela-Scaling-Translation] -point-count=2 -point-0-x=1.7434554973822 -point-0-y=3.73913043478261 -point-1-x=4 -point-1-y=8 - -[Filter] -DLL=FTNoIR_Filter_EWMA2.dll -Selection=FTNoIR_Filter_Accela.dll [Curves-Yaw] point-count=2 -point-0-x=19.25 -point-0-y=122 +point-0-x=25 +point-0-y=90 point-1-x=50 point-1-y=180 [Curves-PitchUp] -point-count=2 +point-count=1 point-0-x=25 point-0-y=90 point-1-x=50 point-1-y=180 [Curves-PitchDown] -point-count=3 -point-0-x=10 -point-0-y=18 -point-1-x=50 -point-1-y=28 -point-2-x=50 -point-2-y=180 - -[Curves-Roll] point-count=2 point-0-x=25 -point-0-y=90 +point-0-y=45 +point-1-x=43.5 +point-1-y=70.5 + +[Curves-Roll] +point-count=1 +point-0-x=17 +point-0-y=41 point-1-x=50 point-1-y=180 [Curves-X] -point-count=2 +point-count=1 point-0-x=25 point-0-y=90 -point-1-x=50 -point-1-y=180 [Curves-Y] -point-count=2 +point-count=1 point-0-x=25 point-0-y=90 -point-1-x=50 -point-1-y=180 [Curves-Z] -point-count=2 +point-count=1 point-0-x=25 point-0-y=90 -point-1-x=50 -point-1-y=180 + +[Curves-Accela-Scaling-Rotation] +point-count=12 +point-0-x=0 +point-0-y=0 +point-1-x=0.308900523560209 +point-1-y=0.0666666666666667 +point-2-x=0.565445026178011 +point-2-y=0.226666666666667 +point-3-x=0.769633507853403 +point-3-y=0.506666666666667 +point-4-x=0.994764397905759 +point-4-y=1 +point-5-x=1.23560209424084 +point-5-y=1.61333333333333 +point-6-x=1.47643979057592 +point-6-y=2.37333333333333 +point-7-x=1.66492146596859 +point-7-y=3.12 +point-8-x=1.80628272251309 +point-8-y=3.92 +point-9-x=1.91623036649215 +point-9-y=4.70666666666667 +point-10-x=2.00523560209424 +point-10-y=5.44 +point-11-x=2.07329842931937 +point-11-y=6 + +[Curves-Accela-Scaling-Translation] +point-count=10 +point-0-x=0 +point-0-y=0 +point-1-x=0.282722513089005 +point-1-y=0.08 +point-2-x=0.492146596858639 +point-2-y=0.306666666666667 +point-3-x=0.764397905759162 +point-3-y=0.84 +point-4-x=1.00523560209424 +point-4-y=1.62666666666667 +point-5-x=1.17277486910995 +point-5-y=2.78666666666667 +point-6-x=1.25130890052356 +point-6-y=3.6 +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 diff --git a/bin/Settings/default.ini b/bin/Settings/default.ini index f6b54380..df2452b6 100644 --- a/bin/Settings/default.ini +++ b/bin/Settings/default.ini @@ -1,5 +1,5 @@ [Tracking] -Smooth=5 +Smooth=1 invertYaw=false invertPitch=false invertRoll=false @@ -15,7 +15,8 @@ redY=70 redZ=70 [GameProtocol] -Selection=6 +Selection=7 +DLL=FTNoIR_Protocol_SC.dll [KB_Shortcuts] Keycode_Center=199 @@ -26,6 +27,30 @@ Keycode_StartStop=207 Shift_StartStop=false Ctrl_StartStop=false Alt_StartStop=false +MouseKey_Center=0 +MouseKey_GameZero=0 +Keycode_GameZero=0 +Shift_GameZero=false +Ctrl_GameZero=false +Alt_GameZero=false +MouseKey_StartStop=0 +SetZero=true +SetEngineStop=true +MouseKey_Inhibit=0 +Keycode_Inhibit=0 +Shift_Inhibit=false +Ctrl_Inhibit=false +Alt_Inhibit=false +Inhibit_Pitch=false +Inhibit_Yaw=false +Inhibit_Roll=false +Inhibit_X=false +Inhibit_Y=false +Inhibit_Z=false +Enable_ReverseAxis=false +RA_Yaw=40 +RA_ZPos=-20 +RA_ToZPos=50 [Curves] Yaw_point1=@Variant(\0\0\0\x1a@\0\0\0\0\0\0\0@\x10\0\0\0\0\0\0) @@ -60,4 +85,9 @@ Selection=1 LocationOfDLL=C:/Program Files/Microsoft Games/Flight Simulator 9/Modules/FSUIPC.dll [TrackerSource] -Selection=0 +Selection=2 +DLL=FTNoIR_Tracker_SM.dll +2ndDLL=None + +[Filter] +DLL=FTNoIR_Filter_Accela.dll -- cgit v1.2.3