diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2012-12-08 10:01:20 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2012-12-08 10:01:20 +0000 |
| commit | 9fdac8789acda4989a094a8ed8c9a19cdc29f7f6 (patch) | |
| tree | 312ba59534193883e07f87bce3ab856caf1f679e /FaceTrackNoIR/tracker.cpp | |
| parent | acdb0aaf27e2ca623a9e32ea7efcc484aecde498 (diff) | |
Modified main form a bit
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@197 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FaceTrackNoIR/tracker.cpp')
| -rw-r--r-- | FaceTrackNoIR/tracker.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index c8f297a0..f24ace79 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -624,13 +624,15 @@ bool bTracker2Confid = false; bTracker2Confid = pSecondTracker->GiveHeadPoseData(&newpose);
}
else {
- bTracker2Confid = true;
+ bTracker2Confid = false;
+ bInitialCenter2 = false;
}
if (pTracker) {
bTracker1Confid = pTracker->GiveHeadPoseData(&newpose);
}
else {
- bTracker1Confid = true;
+ bTracker1Confid = false;
+ bInitialCenter1 = false;
}
Tracker::confid = (bTracker1Confid || bTracker2Confid);
@@ -951,14 +953,14 @@ int sensX, sensY, sensZ; // Center key
CenterMouseKey = iniFile.value ( "MouseKey_Center", 0 ).toInt();
- CenterKey.keycode = iniFile.value ( "Keycode_Center", 0 ).toInt();
+ CenterKey.keycode = iniFile.value ( "Keycode_Center", DIK_HOME ).toInt();
CenterKey.shift = iniFile.value ( "Shift_Center", 0 ).toBool();
CenterKey.ctrl = iniFile.value ( "Ctrl_Center", 0 ).toBool();
CenterKey.alt = iniFile.value ( "Alt_Center", 0 ).toBool();
// StartStop key
StartStopMouseKey = iniFile.value ( "MouseKey_StartStop", 0 ).toInt();
- StartStopKey.keycode = iniFile.value ( "Keycode_StartStop", 0 ).toInt();
+ StartStopKey.keycode = iniFile.value ( "Keycode_StartStop", DIK_END ).toInt();
StartStopKey.shift = iniFile.value ( "Shift_StartStop", 0 ).toBool();
StartStopKey.ctrl = iniFile.value ( "Ctrl_StartStop", 0 ).toBool();
StartStopKey.alt = iniFile.value ( "Alt_StartStop", 0 ).toBool();
|