From 7db1d177f944de01f7fb7a78b16a8a3df22e9746 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Fri, 14 Sep 2012 17:13:39 +0000 Subject: Added notifyCenter method for Arduino (and Patrick) git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@138 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FaceTrackNoIR/FTNoIR_Curves.ui | 6 +++--- FaceTrackNoIR/tracker.cpp | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'FaceTrackNoIR') diff --git a/FaceTrackNoIR/FTNoIR_Curves.ui b/FaceTrackNoIR/FTNoIR_Curves.ui index 1f01fb27..19c68cf0 100644 --- a/FaceTrackNoIR/FTNoIR_Curves.ui +++ b/FaceTrackNoIR/FTNoIR_Curves.ui @@ -128,7 +128,7 @@ color: rgb(255, 255, 255); 260 - 300 + 240 @@ -138,10 +138,10 @@ color: rgb(255, 255, 255); - 120 + 180 - 2 + 1 diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index c0470758..b9497fde 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -471,15 +471,23 @@ T6DOF gameoutput_camera(0,0,0,0,0,0); // // If Center is pressed, copy the current values to the offsets. // - if (Tracker::confid && Tracker::do_center) { + if (Tracker::do_center) { + MessageBeep (MB_ICONASTERISK); + pTracker->notifyCenter(); // Send 'center' to the tracker - offset_camera.position.x = getSmoothFromList( &X.rawList ); - offset_camera.position.y = getSmoothFromList( &Y.rawList ); - offset_camera.position.z = getSmoothFromList( &Z.rawList ); - offset_camera.position.pitch = getSmoothFromList( &Pitch.rawList ); - offset_camera.position.yaw = getSmoothFromList( &Yaw.rawList ); - offset_camera.position.roll = getSmoothFromList( &Roll.rawList ); + // + // Only copy valid values + // + if (Tracker::confid) { + + offset_camera.position.x = getSmoothFromList( &X.rawList ); + offset_camera.position.y = getSmoothFromList( &Y.rawList ); + offset_camera.position.z = getSmoothFromList( &Z.rawList ); + offset_camera.position.pitch = getSmoothFromList( &Pitch.rawList ); + offset_camera.position.yaw = getSmoothFromList( &Yaw.rawList ); + offset_camera.position.roll = getSmoothFromList( &Roll.rawList ); + } Tracker::do_center = false; } -- cgit v1.2.3