From 2fdbee9e9228a77b0f870a2245cfac33bc41aeba Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 2 Apr 2013 20:53:51 +0200 Subject: Everything works now --- facetracknoir/facetracknoir.cpp | 2 +- facetracknoir/facetracknoir.ui | 3714 ++++++++++++++--------------- ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 12 +- ftnoir_protocol_ft/ftnoir_protocol_ft.h | 6 +- 4 files changed, 1842 insertions(+), 1892 deletions(-) diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 5afdbc6d..ada8fe6d 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -375,7 +375,7 @@ QFrame *FaceTrackNoIR::get_video_widget() { /** read the name of the first video-capturing device at start up **/ /** FaceAPI can only use this first one... **/ void FaceTrackNoIR::GetCameraNameDX() { -#if 0 +#if 1 //// ui.widget->setCameraName("No video-capturing device was found in your system: check if it's connected!"); ui.cameraName->setText("No video-capturing device was found in your system: check if it's connected!"); diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui index 8c3db4a4..6af80978 100644 --- a/facetracknoir/facetracknoir.ui +++ b/facetracknoir/facetracknoir.ui @@ -10,12 +10,12 @@ 0 0 - 925 - 415 + 920 + 441 - + 0 0 @@ -23,13 +23,13 @@ 0 - 415 + 0 16777215 - 415 + 476 @@ -141,1987 +141,1937 @@ QGroupBox { - 925 - 350 + 920 + 420 - - - 0 + + + true - - 0 + + + 253 + 1 + 671 + 419 + - - - - 0 + + + 0 + 0 + + + + + 400 + 419 + + + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 89 + 89 + 89 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 72 + 72 + 72 + + + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 89 + 89 + 89 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 72 + 72 + 72 + + + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 89 + 89 + 89 + + + + + + + 89 + 89 + 89 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 72 + 72 + 72 + + + + + + + + false + + + + + + + + + + + 10 + 220 + 623 + 172 + + + + + 10 - - - - 0 + + 6 + + + + + + 200 + 80 + + + + + 200 + 80 + + + + + + + Game protocol + + + + + 10 + 20 + 180 + 22 + + + + + + + -1 + + + 7 + + + + + true + + + + 10 + 50 + 180 + 23 + + + + Change game protocol settings + + + + + + Settings + + + + + + + + + 200 + 80 + - - 0 + + + 200 + 80 + + + + - - 6 + + Tracker Source(1st = Master) - - + + + + 10 + 20 + 180 + 22 + + + + + + + -1 + + + 5 + + + + + true + + + + 10 + 50 + 180 + 23 + + + + Change tracker settings + + + + + + Settings + + + + + + + + - 250 - 170 + 54 + 38 + + + + + 200 + 16777215 + + + + PointingHandCursor + + + Edit the Keyboard and mouse shortcuts + + + Shortkeys + + + + :/uielements/tools.png:/uielements/tools.png + + + + 24 + 24 - - - - 0 - 0 - 250 - 170 - - - - - 250 - 150 - - - - - 500 - 500 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - 0 - 90 - - - - - 16777215 - 90 - - - - - - 100 - 1 - 145 - 34 - - - - PointingHandCursor - - - Please help us: make gaming fun... - - - Click here to -Support FaceTrackNoIR! - - - - :/UIElements/Donate.png:/UIElements/Donate.png - - - - 18 - 18 - - - - - - - 196 - 34 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 196 - 52 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 196 - 70 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 112 - 34 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 112 - 52 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 112 - 70 - 50 - 21 - - - - false - - - color: rgb(0, 255, 0); - - - QFrame::NoFrame - - - QFrame::Raised - - - 5 - - - QLCDNumber::Flat - - - - - - 104 - 35 - 16 - 16 - - - - color: rgb(0, 255, 0); - - - X - - - - - - 105 - 55 - 16 - 16 - - - - color: rgb(0, 255, 0); - - - Y - - - - - - 105 - 74 - 16 - 16 - - - - color: rgb(0, 255, 0); - - - Z - - - - - - 164 - 74 - 20 - 16 - - - - color: rgb(0, 255, 0); - - - roll - - - - - - 166 - 35 - 20 - 16 - - - - color: rgb(0, 255, 0); - - - yaw - - - - - - 164 - 55 - 25 - 16 - - - - color: rgb(0, 255, 0); - - - pitch - - - - - - - - + + - 0 - 160 + 54 + 38 - 16777215 - 160 + 200 + 16777215 + + PointingHandCursor + + + Edit the Curve settings + + + Qt::LeftToRight + - + background:none; + + + Curves - - - - 10 - 60 - 231 - 80 - - - - Raw Input - - - true - - - - - 150 - 60 - 71 - 21 - - - - QFrame::NoFrame - - - 6 + + + :/uielements/curves.png:/uielements/curves.png + + + + 120 + 24 + + + + + + + + + + + 200 + 80 + + + + + 200 + 80 + + + + Tracker Source (2nd) + + + + true + + + + 10 + 50 + 180 + 23 + + + + Change tracker settings + + + + + + Settings + + + + + + 10 + 20 + 180 + 22 + + + + + + + -1 + + + 5 + + + + + + + + + 200 + 80 + + + + + 16777215 + 80 + + + + GO! + + + + + 10 + 20 + 81 + 23 + + + + Start the Tracker + + + + + + Start + + + + + false + + + + 100 + 20 + 81 + 23 + + + + Stop the Tracker + + + + + + Stop + + + + + + + + + 200 + 70 + + + + + 200 + 80 + + + + + + + Filter + + + + + 10 + 20 + 180 + 22 + + + + + + + -1 + + + 7 + + + + + true + + + + 10 + 50 + 180 + 23 + + + + Change game protocol settings + + + + + + Settings + + + + + + + + + + 20 + 10 + 400 + 25 + + + + + 400 + 25 + + + + + 600 + 30 + + + + color:#ccc; +background:none; + + + Camera Name + + + + + + 10 + 60 + 698 + 122 + + + + + 10 + + + 10 + + + + + + 206 + 120 + + + + + 210 + 120 + + + + Profile + + + + + 10 + 20 + 180 + 22 + + + + + + + -1 + + + 10 + + + + + true + + + + 10 + 80 + 180 + 23 + + + + Save the INI-file under another name + + + + + + Save As ... + + + + + + 10 + 50 + 81 + 23 + + + + Load an INI-file from a folder + + + + + + Load + + + + + true + + + + 110 + 50 + 81 + 23 + + + + Save the current INI-file + + + + + + Save + + + + + + + + + 420 + 120 + + + + + 16777215 + 120 + + + + Global Settings + + + + + 9 + 20 + 171 + 80 + + + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + color:#ccc; +background:none; + + + Smoothing: - - - - 150 - 20 - 71 - 21 - + + + + + color:#ccc; +background:none; - - QFrame::NoFrame + + (samples) - - 6 + + + + + + + 50 + 15 + + + + 1 + + + 50 + + + 5 + + + 10 + + + Qt::Horizontal + + + QSlider::NoTicks - - - - 10 - 20 - 21 - 16 - + + + + + + 35 + 22 + - border:none; -color:white + background:none; - - X + + 1 + + + 50 + + + 10 - - - - 10 - 40 - 21 - 16 - + + + + + + + 190 + 20 + 211 + 81 + + + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + Qt::RightToLeft - border:none; -color:white; + color:#ccc; +background:none; - Y + Roll - - - - 30 - 60 - 61 - 21 - - - - QFrame::NoFrame + + + + + background:none; + + + - - - - 10 - 60 - 21 - 16 - + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + Qt::RightToLeft - color:white; -border:none; + color:#ccc; +background:none; Z - - - - 30 - 40 - 61 - 21 - - - - QFrame::NoFrame + + + + + background:none; + + + - - - - 108 - 58 - 31 - 20 - + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + Qt::RightToLeft - border:none; -color:white; + color:#ccc; +background:none; + + + Pitch + + + + + + + background:none; - roll + - - - - 109 - 38 - 31 - 20 - + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + Qt::RightToLeft - color:white; -border:none; + color:#ccc; +background:none; + + + Y + + + + + + + background:none; - pitch + - - - - 108 - 18 - 31 - 20 - + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + Qt::RightToLeft - border:none; -color:white; + color:#ccc; +background:none; + + + Yaw + + + + + + + background:none; - yaw + - - - - 150 - 40 - 71 - 21 - + + + + + + 25 + 0 + - - QFrame::NoFrame + + + 150 + 16777215 + + + + Qt::RightToLeft + + + color:#ccc; +background:none; - - 6 + + X - - - - 30 - 20 - 61 - 21 - - - - QFrame::NoFrame - - - 5 + + + + + background:none; + + + - - - - - 10 - 10 - 231 - 50 - - - - Status - - - true - - - - - 110 - 10 - 101 - 16 - + + + + + + 0 + 0 + + + + + 30 + 16777215 + - border:none; -color: rgb(0, 255, 0); + color:#ccc; +background:none; - Tracking + Invert - - - - 110 - 30 - 101 - 16 - + + + + + + 0 + 0 + + + + + 30 + 16777215 + - border:none; -color: rgb(0, 255, 0); + color:#ccc; +background:none; - Axis Reverse + Invert - - - - + + + + - - - true - - - - 0 - 0 - + + + Qt::Horizontal - + - 400 - 300 + 40 + 20 - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 89 - 89 - 89 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 72 - 72 - 72 - - - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 89 - 89 - 89 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 72 - 72 - 72 - - - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 89 - 89 - 89 - - - - - - - 89 - 89 - 89 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 72 - 72 - 72 - - - - - - - - false - - - - - - - - - - - - - - 10 - - - 10 - - - - - - 206 - 120 - - - - - 210 - 120 - - - - Profile - - - - - 10 - 20 - 180 - 22 - - - - - - - -1 - - - 10 - - - - - true - - - - 10 - 80 - 180 - 23 - - - - Save the INI-file under another name - - - - - - Save As ... - - - - - - 10 - 50 - 81 - 23 - - - - Load an INI-file from a folder - - - - - - Load - - - - - true - - - - 110 - 50 - 81 - 23 - - - - Save the current INI-file - - - - - - Save - - - - - - - - - 420 - 120 - - - - - 16777215 - 120 - - - - Global Settings - - - - - 9 - 20 - 171 - 80 - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - color:#ccc; -background:none; - - - Smoothing: - - - - - - - color:#ccc; -background:none; - - - (samples) - - - - - - - - 50 - 15 - - - - 1 - - - 50 - - - 5 - - - 10 - - - Qt::Horizontal - - - QSlider::NoTicks - - - - - - - - 35 - 22 - - - - background:none; - - - 1 - - - 50 - - - 10 - - - - - - - - - 190 - 20 - 211 - 81 - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - Roll - - - - - - - background:none; - - - - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - Z - - - - - - - background:none; - - - - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - Pitch - - - - - - - background:none; - - - - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - Y - - - - - - - background:none; - - - - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - Yaw - - - - - - - background:none; - - - - - - - - - - - 25 - 0 - - - - - 150 - 16777215 - - - - Qt::RightToLeft - - - color:#ccc; -background:none; - - - X - - - - - - - background:none; - - - - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - color:#ccc; -background:none; - - - Invert - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - color:#ccc; -background:none; - - - Invert - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 500 - 67 - - - - - 700 - 67 - - - - true - - - background: url("UIElements/bubble_1_small.png") no-repeat; -opacity:100; - - - - 0 - - - 15 - - - 10 - - - 10 - - - 10 - - - - - - - - - - 400 - 25 - - - - - 600 - 30 - - - - color:#ccc; -background:none; - - - Camera Name - - - - - - - - 400 - 20 - - - - - 600 - 30 - - - - color:#ccc; -background:none; - - - Game Name - - - - - - - - - - - - - - - - 10 - - - 6 - - - - - - 200 - 80 - - - - - 200 - 80 - - - - - - - Tracker Source(1st = Master) - - - - - 10 - 20 - 180 - 22 - - - - - - - -1 - - - 5 - - - - - true - - - - 10 - 50 - 180 - 23 - - - - Change tracker settings - - - - - - Settings - - - - - - - - - 200 - 70 - - - - - 200 - 80 - - - - - - - Filter - - - - - 10 - 20 - 180 - 22 - - - - - - - -1 - - - 7 - - - - - true - - - - 10 - 50 - 180 - 23 - - - - Change game protocol settings - - - - - - Settings - - - - - - - - - 200 - 80 - - - - - 200 - 80 - - - - - - - Game protocol - - - - - 10 - 20 - 180 - 22 - - - - - - - -1 - - - 7 - - - - - true - - - - 10 - 50 - 180 - 23 - - - - Change game protocol settings - - - - - - Settings - - - - - - - - - 200 - 80 - - - - - 16777215 - 80 - - - - GO! - - - - - 10 - 20 - 81 - 23 - - - - Start the Tracker - - - - - - Start - - - - - false - - - - 100 - 20 - 81 - 23 - - - - Stop the Tracker - - - - - - Stop - - - - - - - - - 200 - 80 - - - - - 200 - 80 - - - - Tracker Source (2nd) - - - - true - - - - 10 - 50 - 180 - 23 - - - - Change tracker settings - - - - - - Settings - - - - - - 10 - 20 - 180 - 22 - - - - - - - -1 - - - 5 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 52 - 38 - - - - - 200 - 16777215 - - - - PointingHandCursor - - - Edit the Keyboard and mouse shortcuts - - - Shortkeys - - - - :/UIElements/Tools.png:/UIElements/Tools.png - - - - 24 - 24 - - - - - - - - - 52 - 38 - - - - - 200 - 16777215 - - - - PointingHandCursor - - - Edit the Curve settings - - - Qt::LeftToRight - - - background:none; - - - Curves - - - - :/UIElements/Curves.png:/UIElements/Curves.png - - - - 120 - 24 - - - - - - - - - - - - + - - + + + + + + 0 + 93 + 250 + 187 + + + + + 0 + 0 + + + + + 250 + 187 + + + + + 250 + 187 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + + + 0 + 0 + 250 + 187 + + + + + 0 + 0 + + + + + 250 + 187 + + + + + 250 + 187 + + + + + + + + 0 + 280 + 261 + 141 + + + + + 0 + 100 + + + + + 16777215 + 160 + + + + + + + + + 10 + 50 + 231 + 169 + + + + + 0 + 0 + + + + + 0 + 0 + + + + Raw Input + + + true + + + + + 150 + 60 + 71 + 21 + + + + QFrame::NoFrame + + + 6 + + + + + + 150 + 20 + 71 + 21 + + + + QFrame::NoFrame + + + 6 + + + + + + 10 + 20 + 21 + 16 + + + + border:none; +color:white + + + X + + + + + + 10 + 40 + 21 + 16 + + + + border:none; +color:white; + + + Y + + + + + + 30 + 60 + 61 + 21 + + + + QFrame::NoFrame + + + + + + 10 + 60 + 21 + 16 + + + + color:white; +border:none; + + + Z + + + + + + 30 + 40 + 61 + 21 + + + + QFrame::NoFrame + + + + + + 108 + 58 + 31 + 20 + + + + border:none; +color:white; + + + roll + + + + + + 109 + 38 + 31 + 20 + + + + color:white; +border:none; + + + pitch + + + + + + 108 + 18 + 31 + 20 + + + + border:none; +color:white; + + + yaw + + + + + + 150 + 40 + 71 + 21 + + + + QFrame::NoFrame + + + 6 + + + + + + 30 + 20 + 61 + 21 + + + + QFrame::NoFrame + + + 5 + + + + + + + 10 + 0 + 231 + 50 + + + + Status + + + true + + + + + 110 + 10 + 101 + 16 + + + + border:none; +color: rgb(0, 255, 0); + + + Tracking + + + + + + 110 + 30 + 101 + 16 + + + + border:none; +color: rgb(0, 255, 0); + + + Axis Reverse + + + + + + + + 1 + 0 + 250 + 90 + + + + + 250 + 90 + + + + + 16777215 + 90 + + + + + + 100 + 1 + 145 + 34 + + + + PointingHandCursor + + + Please help us: make gaming fun... + + + Click here to +Support FaceTrackNoIR! + + + + :/uielements/donate.png:/uielements/donate.png + + + + 18 + 18 + + + + + + + 196 + 34 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 196 + 52 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 196 + 70 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 112 + 34 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 112 + 52 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 112 + 70 + 50 + 21 + + + + false + + + color: rgb(0, 255, 0); + + + QFrame::NoFrame + + + QFrame::Raised + + + 5 + + + QLCDNumber::Flat + + + + + + 104 + 35 + 16 + 16 + + + + color: rgb(0, 255, 0); + + + X + + + + + + 105 + 55 + 16 + 16 + + + + color: rgb(0, 255, 0); + + + Y + + + + + + 105 + 74 + 16 + 16 + + + + color: rgb(0, 255, 0); + + + Z + + + + + + 164 + 74 + 20 + 16 + + + + color: rgb(0, 255, 0); + + + roll + + + + + + 166 + 35 + 20 + 16 + + + + color: rgb(0, 255, 0); + + + yaw + + + + + + 164 + 55 + 25 + 16 + + + + color: rgb(0, 255, 0); + + + pitch + + + 0 0 - 925 + 920 21 @@ -2336,7 +2286,7 @@ background:none; iconcomboProtocol - + diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index 5616915a..b1c53b8f 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -313,7 +313,7 @@ PDWORD_PTR MsgResult = 0; // Returns 'true' if all seems OK. // // -bool FTNoIR_Protocol::checkServerInstallationOK( HANDLE handle ) +bool FTNoIR_Protocol::checkServerInstallationOK() { QSettings settings("Freetrack", "FreetrackClient"); // Registry settings (in HK_USER) QSettings settingsTIR("NaturalPoint", "NATURALPOINT\\NPClient Location"); // Registry settings (in HK_USER) @@ -392,7 +392,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK( HANDLE handle ) } catch(...) { settings.~QSettings(); } - return FTCreateMapping( handle ); + return FTCreateMapping(); } // @@ -400,7 +400,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK( HANDLE handle ) // It contains the tracking data, a handle to the main-window and the program-name of the Game! // // -bool FTNoIR_Protocol::FTCreateMapping( HANDLE handle ) +bool FTNoIR_Protocol::FTCreateMapping() { bool bFirst = false; @@ -442,8 +442,8 @@ bool bFirst = false; if (bFirst) { memset(pMemData, 0, sizeof(FTMemMap)); // Write zero's, if first... } - pMemData->handle = handle; // The game uses the handle, to send a message that the Program-Name was set! - hMainWindow = handle; + pMemData->handle = 0; // The game uses the handle, to send a message that the Program-Name was set! + hMainWindow = 0; } hFTMutex = CreateMutexA(NULL, false, FREETRACK_MUTEX); } @@ -509,5 +509,5 @@ void FTNoIR_Protocol::getNameFromGame( char *dest ) extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetConstructor() { - return (IProtocol*) new FTNoIR_ProtocolDll; + return (IProtocol*) new FTNoIR_Protocol; } diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index 5b36ab5a..ca6be189 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -54,12 +54,12 @@ public: void Release(); void Initialize(); - bool checkServerInstallationOK( HANDLE handle ); + bool checkServerInstallationOK( ); void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose ); void getNameFromGame( char *dest ); // Take care dest can handle up to 100 chars... private: - bool FTCreateMapping(HANDLE handle); + bool FTCreateMapping(); void FTDestroyMapping(); importTIRViewsStart viewsStart; // Functions inside TIRViews.dll @@ -136,7 +136,7 @@ public: void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack 2.0"); }; void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Enhanced FreeTrack protocol"); }; - void getIcon(QIcon *icon) { *icon = QIcon(":/images/Freetrack.ico"); }; + void getIcon(QIcon *icon) { *icon = QIcon(":/images/freetrack.png"); }; }; -- cgit v1.2.3