Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

4 files changed, 147 insertions, 268 deletions

diff --git a/freetrackclient/build-msvc.sh b/freetrackclient/build-msvc.sh
new file mode 100644
index 00000000..4fd303a0
--- /dev/null
+++ b/freetrackclient/build-msvc.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+export PATH="/bin:/usr/bin:$PATH"
+
+case "$(uname -s 2>/dev/null)" in
+*CYG*|*MING*|'') wrap= ;;
+*) wrap=wine ;;
+esac
+
+c_src=".\\freetrackclient.c"
+c_bin="..\\facetracknoir\\clientfiles\\freetrackclient.dll"
+opt_link="-nologo -LTCG -SAFESEH:NO -OPT:REF,ICF"
+opt_cl="
+-nologo -arch:SSE2 -fp:fast -EHc -EH- -GL -GR- -GS- -Gw -LD -MT -O1
+-Ob2 -Og -Oi -Ot -Oy -QIfist -volatile:iso -Ze -Fe\"${c_bin}\"
+"
+
+MSVC="VS140COMNTOOLS"
+
+test -z "$MSVC" && {
+    echo "uh-oh, no MSVC" >&2
+    exit 1
+}
+
+sep="\&"
+
+cd "$(dirname "$0")"
+
+$wrap cmd.exe /C $(echo "
+    del /F /Q $c_bin $sep
+    call %${MSVC}%/vsvars32.bat 2>nul >nul $sep
+    cl $opt_cl $c_src -link $opt_link
+    " | tr '\n' ' ')
diff --git a/freetrackclient/freetrackclient.c b/freetrackclient/freetrackclient.c
new file mode 100644
index 00000000..4bc39d67
--- /dev/null
+++ b/freetrackclient/freetrackclient.c
@@ -0,0 +1,114 @@
+/***********************************************************************************
+ * * FTTypes            FTTypes contains the specific type definitions for the      *
+ * *                    FreeTrack protocol.                                         *
+ * *                    It was loosely translated from FTTypes.pas                  *
+ * *                    which was created by the FreeTrack-team.                    *
+ * *                                                                                *
+ * * Wim Vriend (Developing)                                                        *
+ * * Ron Hendriks (Testing and Research)                                            *
+ * *                                                                                *
+ * * Homepage               <http://facetracknoir.sourceforge.net/home/default.htm> *
+ * *                                                                                *
+ * * This program is distributed in the hope that it will be useful, but            *
+ * * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY     *
+ * * or FITNESS FOR A PARTICULAR PURPOSE.                                           *
+ * *                                                                                *
+ * *                                                                                *
+ * * The FreeTrackClient sources were translated from the original Delphi sources   *
+ * * created by the FreeTrack developers.                                           *
+ */
+
+#ifndef _MSC_VER
+#   warning "expect misnamed symbols"
+#endif
+
+#pragma GCC diagnostic ignored "-Wvariadic-macros"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
+#define NP_AXIS_MAX 16383
+
+#include <stdbool.h>
+#include <string.h>
+#include <windows.h>
+
+#include "../ftnoir_protocol_ft/fttypes.h"
+
+#define FT_EXPORT(t) __declspec(dllexport) t __stdcall
+
+#if 0
+#   include <stdio.h>
+static FILE *debug_stream = fopen("c:\\FreeTrackClient.log", "a");
+#   define dbg_report(...) if (debug_stream) { fprintf(debug_stream, __VA_ARGS__); fflush(debug_stream); }
+#else
+#define dbg_report(...) ((void)0)
+#endif
+
+static HANDLE hFTMemMap = 0;
+static FTHeap* ipc_heap = 0;
+static HANDLE ipc_mutex = 0;
+static const char* dllVersion = "1.0.0.0";
+static const char* dllProvider = "FreeTrack";
+
+static bool impl_create_mapping(void)
+{
+    if (ipc_heap != NULL)
+        return true;
+
+    hFTMemMap = CreateFileMappingA(INVALID_HANDLE_VALUE,
+                                   NULL,
+                                   PAGE_READWRITE,
+                                   0,
+                                   sizeof(FTHeap),
+                                   (LPCSTR) FREETRACK_HEAP);
+
+    if (hFTMemMap == NULL)
+        return (ipc_heap = NULL), false;
+
+    ipc_heap = (FTHeap*) MapViewOfFile(hFTMemMap, FILE_MAP_WRITE, 0, 0, sizeof(FTHeap));
+    ipc_mutex = CreateMutexA(NULL, false, FREETRACK_MUTEX);
+
+    return true;
+}
+
+#pragma comment (linker, "/export:FTGetData")
+FT_EXPORT(bool) FTGetData(FTData* data)
+{
+    if (impl_create_mapping() == false)
+        return false;
+
+    if (ipc_mutex && WaitForSingleObject(ipc_mutex, 16) == WAIT_OBJECT_0) {
+        if (ipc_heap) {
+            if (ipc_heap->data.DataID > (1 << 29))
+                ipc_heap->data.DataID = 0;
+            data->DataID = ipc_heap->data.DataID;
+        }
+        ReleaseMutex(ipc_mutex);
+    }
+    return true;
+}
+
+/*
+// For some mysterious reason, the previously existing function FTReportID has been changed to FTReportName, but with an integer as argument.
+// The Delphi-code from the FreeTrack repo suggest a char * as argument, so it cost me an afternoon to figure it out (and keep ArmA2 from crashing).
+// Thanks guys!
+*/
+#pragma comment (linker, "/export:FTReportName")
+FT_EXPORT(void) FTReportName( int name )
+{
+    dbg_report("FTReportName request (ID = %d).\n", name);
+}
+
+#pragma comment (linker, "/export:FTGetDllVersion")
+FT_EXPORT(const char*) FTGetDllVersion(void)
+{
+    dbg_report("FTGetDllVersion request.\n");
+    return dllVersion;
+}
+
+#pragma comment (linker, "/export:FTProvider")
+FT_EXPORT(const char*) FTProvider(void)
+{
+    dbg_report("FTProvider request.\n");
+    return dllProvider;
+}
+
diff --git a/freetrackclient/freetrackclient.cpp b/freetrackclient/freetrackclient.cpp
deleted file mode 100644
index 395f017d..00000000
--- a/freetrackclient/freetrackclient.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/***********************************************************************************
- * * FTTypes            FTTypes contains the specific type definitions for the      *
- * *                    FreeTrack protocol.                                         *
- * *                    It was loosely translated from FTTypes.pas                  *
- * *                    which was created by the FreeTrack-team.                    *
- * *                                                                                *
- * * Wim Vriend (Developing)                                                        *
- * * Ron Hendriks (Testing and Research)                                            *
- * *                                                                                *
- * * Homepage               <http://facetracknoir.sourceforge.net/home/default.htm> *
- * *                                                                                *
- * * This program is distributed in the hope that it will be useful, but            *
- * * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY     *
- * * or FITNESS FOR A PARTICULAR PURPOSE.                                           *
- * *                                                                                *
- * *                                                                                *
- * * The FreeTrackClient sources were translated from the original Delphi sources   *
- * * created by the FreeTrack developers.                                           *
- */
-#define	NP_AXIS_MAX				16383
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <windows.h>
-//#include <tchar.h>
-
-#include "ftnoir_protocol_ft/fttypes.h"
-
-#define FT_EXPORT(t) extern "C" __declspec(dllexport) t __stdcall
-
-//
-// Functions to create/open the file-mapping
-// and to destroy it again.
-//
-static float scale2AnalogLimits( float x, float min_x, float max_x );
-static float getDegreesFromRads ( float rads );
-FT_EXPORT(bool) FTCreateMapping(void);
-
-#if 0
-static FILE *debug_stream = fopen("c:\\FreeTrackClient.log", "a");
-#define dbg_report(...) if (debug_stream) { fprintf(debug_stream, __VA_ARGS__); fflush(debug_stream); }
-#else
-#define dbg_report(...)
-#endif
-
-//
-// Handles to 'handle' the memory mapping
-//
-static HANDLE hFTMemMap = 0;
-static FTMemMap *pMemData = 0;
-static HANDLE hFTMutex = 0;
-static const char* dllVersion = "1.0.0.0";
-static const char* dllProvider = "FreeTrack";
-
-static unsigned short gameid = 0;
-
-//
-// DllMain gets called, when the DLL is (un)loaded or a process attaches.
-//
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch (fdwReason) {
-		case DLL_PROCESS_ATTACH:
-#ifdef WIN64
-		    dbg_report("\n= WIN64 =========================================================================================\n");
-#else
-		    dbg_report("\n= WIN32 =========================================================================================\n");
-#endif
-			dbg_report("DllMain: (0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-            dbg_report("DllMain: Attach request\n");
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-
-		case DLL_PROCESS_DETACH:
-			dbg_report("DllMain: Detach\n");
-			dbg_report("DllMain: (0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-		    dbg_report("==========================================================================================\n");
-            break;
-    }
-    return TRUE;
-}
-
-/******************************************************************
- *		FTGetData (FreeTrackClient.1)
- */
-
-#pragma comment(linker, "/export:FTGetData@4=FTGetData")
-FT_EXPORT(bool) FTGetData(PFreetrackData data)
-{
-  static int prevDataID = 0;
-  static int dlyTrackingOff = 0;
-
-
-//  dbg_report("NP_GetData called.");
-  if (FTCreateMapping() == false) return false;
-
-  if (hFTMutex && WaitForSingleObject(hFTMutex, 5) == WAIT_OBJECT_0) {
-	if (pMemData) {
-
-		//
-		// When FaceTrackNoIR does not update frames (any more), don't update the data.
-		//
-		if (prevDataID != pMemData->data.DataID) {
-			memcpy(data, &pMemData->data, sizeof(TFreeTrackData));
-			dlyTrackingOff = 0;
-		}
-		else {
-			dlyTrackingOff++;
-			if (dlyTrackingOff > 20) {
-				dlyTrackingOff = 100;
-			}
-		}
-		prevDataID = pMemData->data.DataID;
-		
-		//
-		// Limit the range of DataID
-		//
-		if (pMemData->data.DataID > 1000) {
-			pMemData->data.DataID = 0;
-		}
-		data->DataID = pMemData->data.DataID;
-
-		//
-		// Send the ID to FaceTrackNoIR, so it can display the game-name.
-		// This could be a FreeTrack-specific ID
-		//
-        pMemData->GameID = gameid;
-	}
-	ReleaseMutex(hFTMutex);
-  }
-  return true;
-}
-
-/******************************************************************
- *		FTReportName (FreeTrackClient.2)
- */
-#pragma comment(linker, "/export:FTReportName@4=FTReportName")
-//
-// For some mysterious reason, the previously existing function FTReportID has been changed to FTReportName, but with an integer as argument.
-// The Delphi-code from the FreeTrack repo suggest a char * as argument, so it cost me an afternoon to figure it out (and keep ArmA2 from crashing).
-// Thanks guys!
-//
-FT_EXPORT(void) FTReportName( int name )
-{
-	dbg_report("FTReportName request (ID = %d).\n", name);
-	gameid = name;												// They might have really passed the name here... but they didn't!
-	return;
-}
-
-/******************************************************************
- *		FTGetDllVersion (FreeTrackClient.3)
- */
-#pragma comment(linker, "/export:FTGetDllVersion@0=FTGetDllVersion")
-FT_EXPORT(const char*) FTGetDllVersion(void)
-{
-    dbg_report("FTGetDllVersion request.\n");
-
-	return dllVersion;
-}
-
-/******************************************************************
- *		FTProvider (FreeTrackClient.4)
- */
-#pragma comment(linker, "/export:FTProvider@0=FTProvider")
-FT_EXPORT(const char*) FTProvider(void)
-{
-    dbg_report("FTProvider request.\n");
-
-	return dllProvider;
-}
-
-//
-// Create a memory-mapping to the Freetrack data.
-// It contains the tracking data, a handle to the main-window and the program-name of the Game!
-//
-//
-FT_EXPORT(bool) FTCreateMapping(void)
-{
-	//
-	// Memory-mapping already exists!
-	//
-	if ( pMemData != NULL ) {
-		return true;
-	}
-
-    dbg_report("FTCreateMapping request (pMemData == NULL).\n");
-
-	//
-	// A FileMapping is used to create 'shared memory' between the FTClient and the FTServer.
-	//
-	// Try to create a FileMapping to the Shared Memory. This is done to check if it's already there (what
-	// may mean the face-tracker program is already running).
-	//
-	// If one already exists: close it and open the file-mapping to the existing one.
-	//
-	hFTMemMap = CreateFileMappingA( INVALID_HANDLE_VALUE , 00 , PAGE_READWRITE , 0 , 
-		                           sizeof( FTMemMap ), 
-								   (LPCSTR) FT_MM_DATA );
-
-	if ( ( hFTMemMap != 0 ) && ( GetLastError() == ERROR_ALREADY_EXISTS ) ) {
-		dbg_report("FTCreateMapping: Mapping already exists.\n");
-		CloseHandle( hFTMemMap );
-		hFTMemMap = 0;
-	}
-
-	//
-	// Create a new FileMapping, Read/Write access
-	//
-    hFTMemMap = OpenFileMappingA( FILE_MAP_WRITE , false , (LPCSTR) FT_MM_DATA );
-	if ( ( hFTMemMap != 0 ) ) {
-		dbg_report("FTCreateMapping: Mapping opened.\n");
-        pMemData = (FTMemMap *) MapViewOfFile(hFTMemMap, FILE_MAP_WRITE, 0, 0, sizeof( FTMemMap ) );
-	    hFTMutex = CreateMutexA(NULL, false, FREETRACK_MUTEX);
-	}
-	else {
-		return false;
-	}
-	return true;
-}
-
-//
-// Destory the FileMapping to the shared memory
-//
-FT_EXPORT(void) FTDestroyMapping(void)
-{
-	if ( pMemData != NULL ) {
-		UnmapViewOfFile ( pMemData );
-	}
-	
-	CloseHandle( hFTMutex );
-	CloseHandle( hFTMemMap );
-	pMemData = 0;
-	hFTMemMap = 0;
-}
-
-//
-// 4 convenience
-//
-static float getDegreesFromRads ( float rads ) { 
-	return (rads * 57.295781f); 
-}
-
-//
-// Scale the measured value to the TIR values
-//
-static float scale2AnalogLimits( float x, float min_x, float max_x ) {
-double y;
-double local_x;
-	
-	local_x = x;
-	if (local_x > max_x) {
-		local_x = max_x;
-	}
-	if (local_x < min_x) {
-		local_x = min_x;
-	}
-	y = ( NP_AXIS_MAX * local_x ) / max_x;
-
-	return (float) y;
-}
diff --git a/freetrackclient/freetrackclient.def b/freetrackclient/freetrackclient.def
deleted file mode 100644
index 155648dd..00000000
--- a/freetrackclient/freetrackclient.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY freetrackclient.dll
-EXPORTS
-FTGetData@4 = FTGetData
-FTReportName@4 = FTReportName
-FTGetDllVersion@0 = FTGetDllVersion
-FTProvider@0 = FTProvider