Various fixes from code review.

7 files changed, 36 insertions, 36 deletions

diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index 9a37f2d8..fca1e495 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -1,29 +1,32 @@
+# Kinect SDK is Windows only
+if (WIN32)
+	# Setup cache variable to Kinect SDK path
+	if(DEFINED ENV{KINECTSDK20_DIR})
+		set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH $ENV{KINECTSDK20_DIR})
+	else()
+		set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH "")
+	endif()
 
-# Setup cache variable to Kinect SDK path
-if(DEFINED ENV{KINECTSDK20_DIR})
-	set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH $ENV{KINECTSDK20_DIR})
-else()
-	set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH "")
-endif()
+	# If we have a valid SDK path, try build that tracker
+	if(EXISTS ${KINECTSDK20_DIR})
+		# Register our module
+		otr_module(tracker-kinect-face)
 
-# If we have a valid SDK path, try build that tracker
-if(EXISTS ${KINECTSDK20_DIR})
-	# Register our module
-    otr_module(tracker-kinect-face)
-
-	# Add include path to Kinect SDK 
-	target_include_directories(opentrack-tracker-kinect-face SYSTEM PUBLIC ${KINECTSDK20_DIR}/inc)
+		# Add include path to Kinect SDK 
+		target_include_directories(opentrack-tracker-kinect-face SYSTEM PUBLIC ${KINECTSDK20_DIR}/inc)
 	
-	# Check processor architecture 
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-		# 32 bits        
-		set (kinect-arch-dir "x86")
-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		# 64 bits
-		set (kinect-arch-dir "x64")		
-    endif()
+		# Check processor architecture 
+		if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+			# 32 bits        
+			set (kinect-arch-dir "x86")
+		elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+			# 64 bits
+			set (kinect-arch-dir "x64")		
+		endif()
 	
-	# Link against Kinect SDK libraries
-	target_link_libraries(opentrack-tracker-kinect-face ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.lib ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.face.lib)
+		# Link against Kinect SDK libraries
+		target_link_libraries(opentrack-tracker-kinect-face ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.lib ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.face.lib)
+
+	endif()
 
-endif()
+endif()
\ No newline at end of file
diff --git a/tracker-kinect-face/lang/nl_NL.ts b/tracker-kinect-face/lang/nl_NL.ts
index dec7a177..f4fe07d8 100644
--- a/tracker-kinect-face/lang/nl_NL.ts
+++ b/tracker-kinect-face/lang/nl_NL.ts
@@ -4,7 +4,7 @@
 <context>
     <name>test_metadata</name>
     <message>
-        <source>Kinect Face - v0.1</source>
+        <source>Kinect Face 0.1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/tracker-kinect-face/lang/ru_RU.ts b/tracker-kinect-face/lang/ru_RU.ts
index 1634c0c2..d4108ed3 100644
--- a/tracker-kinect-face/lang/ru_RU.ts
+++ b/tracker-kinect-face/lang/ru_RU.ts
@@ -4,7 +4,7 @@
 <context>
     <name>test_metadata</name>
     <message>
-        <source>Kinect Face - v0.1</source>
+        <source>Kinect Face 0.1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/tracker-kinect-face/lang/stub.ts b/tracker-kinect-face/lang/stub.ts
index bb36fb1e..f82903a3 100644
--- a/tracker-kinect-face/lang/stub.ts
+++ b/tracker-kinect-face/lang/stub.ts
@@ -4,7 +4,7 @@
 <context>
     <name>test_metadata</name>
     <message>
-        <source>Kinect Face - v0.1</source>
+        <source>Kinect Face 0.1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/tracker-kinect-face/lang/zh_CN.ts b/tracker-kinect-face/lang/zh_CN.ts
index bb36fb1e..f82903a3 100644
--- a/tracker-kinect-face/lang/zh_CN.ts
+++ b/tracker-kinect-face/lang/zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>test_metadata</name>
     <message>
-        <source>Kinect Face - v0.1</source>
+        <source>Kinect Face 0.1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/tracker-kinect-face/test.h b/tracker-kinect-face/test.h
index 1af0409b..0f8c170b 100644
--- a/tracker-kinect-face/test.h
+++ b/tracker-kinect-face/test.h
@@ -22,7 +22,7 @@ class test_metadata : public Metadata
 {
     Q_OBJECT
 
-    QString name() { return tr("Kinect Face - v0.1"); }
+    QString name() { return tr("Kinect Face 0.1"); }
     QIcon icon() { return QIcon(":/images/kinect.png"); }
 };
 
diff --git a/tracker-kinect-face/tracker.cpp b/tracker-kinect-face/tracker.cpp
index 407557f0..c5517f89 100644
--- a/tracker-kinect-face/tracker.cpp
+++ b/tracker-kinect-face/tracker.cpp
@@ -38,7 +38,7 @@ bool IsNullVetor(const Vector4& aVector)
 		return false;
 	}
 
-	if (aVector.y != 0)
+	if (aVector.x != 0)
 	{
 		return false;
 	}
@@ -74,7 +74,6 @@ bool IsNullPoint(const CameraSpacePoint& aPoint)
 		return false;
 	}
 
-
 	return true;
 }
 
@@ -150,9 +149,9 @@ module_status KinectFaceTracker::start_tracker(QFrame* aFrame)
 
 bool KinectFaceTracker::center()
 {
+	// Mark our center
 	iFacePositionCenter = iFacePosition;
 	iFaceRotationCenter = iFaceRotation;
-	//TODO: Rotation center too
 	return true;
 }
 
@@ -181,11 +180,9 @@ void KinectFaceTracker::data(double *data)
 	data[2] = (iLastFacePosition.Z - iFacePositionCenter.Z) * 100;
 
 	// Yaw, Picth, Roll
-	data[3] = 0-(iLastFaceRotation.X - iFaceRotationCenter.X); // Invert to be compatible with ED out-of-the-box
+	data[3] = -(iLastFaceRotation.X - iFaceRotationCenter.X); // Invert to be compatible with ED out-of-the-box
 	data[4] = (iLastFaceRotation.Y - iFaceRotationCenter.Y);
 	data[5] = (iLastFaceRotation.Z - iFaceRotationCenter.Z);
-
-
 }
 
 
@@ -463,7 +460,7 @@ void KinectFaceTracker::ProcessFaces()
 		{
 			if (bFaceTracked)
 			{
-				OutputDebugStringA("Tracking face!\n");
+				//OutputDebugStringA("Tracking face!\n");
 
 				//IFaceFrameResult* pFaceFrameResult = nullptr;
 				IFaceAlignment* pFaceAlignment = nullptr;