diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2013-01-20 13:56:19 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2013-01-20 13:56:19 +0000 |
| commit | 14fab55184e7f63a9e2923dba10360f0c8157698 (patch) | |
| tree | dda992c731e2a2c7c07e0b7cd919cacad32c8650 /FTNoIR_Tracker_HT | |
| parent | 43d26a5795153263edec18d5839b726617842eda (diff) | |
Made some changes after testing HT. Mail follows, Stanislaw
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@222 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FTNoIR_Tracker_HT')
| -rw-r--r-- | FTNoIR_Tracker_HT/FTNoIR_Tracker_HT.vcproj | 749 | ||||
| -rw-r--r-- | FTNoIR_Tracker_HT/Tracker.qrc | 5 | ||||
| -rw-r--r-- | FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp | 34 | ||||
| -rw-r--r-- | FTNoIR_Tracker_HT/images/HT.ico | bin | 0 -> 15086 bytes |
4 files changed, 420 insertions, 368 deletions
diff --git a/FTNoIR_Tracker_HT/FTNoIR_Tracker_HT.vcproj b/FTNoIR_Tracker_HT/FTNoIR_Tracker_HT.vcproj index 56745f3a..af0e07c0 100644 --- a/FTNoIR_Tracker_HT/FTNoIR_Tracker_HT.vcproj +++ b/FTNoIR_Tracker_HT/FTNoIR_Tracker_HT.vcproj @@ -1,351 +1,398 @@ -<?xml version="1.0" encoding="windows-1250"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="FTNoIR_Tracker_HT" - ProjectGUID="{61F2B142-F7DD-4070-8A68-53AD63A5D528}" - RootNamespace="FTNoIR_Tracker_HT" - Keyword="Qt4VSv1.0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(QTDIR)include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";".\.GeneratedFiles"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTNOIR_TRACKER_HT_EXPORTS;QT_CORE_LIB;QT_GUI_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="QtCored4.lib QtGuid4.lib" - LinkIncremental="2" - AdditionalLibraryDirectories="$(QTDIR)lib" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)\bin" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";".\.GeneratedFiles"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTNOIR_TRACKER_HT_EXPORTS;QT_CORE_LIB;QT_GUI_LIB;FTNOIR_TRACKER_BASE_LIB" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="QtCore4.lib QtGui4.lib" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(SolutionDir)\dinput";"$(QTDIR)\lib"" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="1" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\ftnoir_tracker_ht.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\ftnoir_tracker_ht.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Moc'ing ftnoir_tracker_ht.h..." - CommandLine=""$(QTDIR)\bin\moc.exe" "$(InputPath)" -o ".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp" -DWIN32 -D_DEBUG -D_WINDOWS -D_USRDLL -DFTNOIR_TRACKER_HT_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -D_WINDLL -D_UNICODE -DUNICODE "-I$(QTDIR)include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I.\.GeneratedFiles" "-fStdAfx.h" "-f../ftnoir_tracker_ht.h"
" - AdditionalDependencies=""$(QTDIR)\bin\moc.exe";$(InputPath)" - Outputs="".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp"" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Moc'ing ftnoir_tracker_ht.h..." - CommandLine=""$(QTDIR)\bin\moc.exe" "$(InputPath)" -o ".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp" -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DFTNOIR_TRACKER_HT_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DFTNOIR_TRACKER_BASE_LIB -D_WINDLL -D_UNICODE -DUNICODE "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I.\.GeneratedFiles"
" - AdditionalDependencies=""$(QTDIR)\bin\moc.exe";$(InputPath)" - Outputs="".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp"" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\ftnoir_tracker_ht_dll.h" - > - </File> - <File - RelativePath=".\headtracker-ftnoir.h" - > - </File> - <File - RelativePath=".\ht-api.h" - > - </File> - <File - RelativePath=".\stdafx.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - <Filter - Name="Generated Files" - Filter="moc;h;cpp" - UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" - > - <File - RelativePath=".\.generatedfiles\ui_TrackerControls.h" - > - </File> - <Filter - Name="Debug" - Filter="cpp;moc" - SourceControlFiles="false" - > - <File - RelativePath=".\.GeneratedFilesDebug\moc_ftnoir_tracker_ht.cpp" - > - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Release" - Filter="cpp;moc" - SourceControlFiles="false" - > - <File - RelativePath=".\.GeneratedFilesRelease\moc_ftnoir_tracker_ht.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - </Filter> - <Filter - Name="Form Files" - Filter="ui" - UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}" - > - <File - RelativePath=".\TrackerControls.ui" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Uic'ing $(InputFileName)..." - CommandLine=""$(QTDIR)\bin\uic.exe" -o ".\.GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
" - AdditionalDependencies="$(QTDIR)\bin\uic.exe" - Outputs="".\.GeneratedFiles\ui_$(InputName).h"" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Uic'ing $(InputFileName)..." - CommandLine=""$(QTDIR)\bin\uic.exe" -o ".\.GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
" - AdditionalDependencies="$(QTDIR)\bin\uic.exe" - Outputs="".\.GeneratedFiles\ui_$(InputName).h"" - /> - </FileConfiguration> - </File> - </Filter> - </Files> - <Globals> - <Global - Name="lupdateOnBuild" - Value="1" - /> - <Global - Name="MocDir" - Value=".GeneratedFiles$(ConfigurationName)" - /> - <Global - Name="MocOptions" - Value="" - /> - <Global - Name="QtVersion Win32" - Value="qt-everywhere-opensource-src-4.6.2" - /> - <Global - Name="RccDir" - Value=".GeneratedFiles" - /> - <Global - Name="UicDir" - Value=".GeneratedFiles" - /> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="FTNoIR_Tracker_HT"
+ ProjectGUID="{61F2B142-F7DD-4070-8A68-53AD63A5D528}"
+ RootNamespace="FTNoIR_Tracker_HT"
+ Keyword="Qt4VSv1.0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(QTDIR)include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";".\.GeneratedFiles""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTNOIR_TRACKER_HT_EXPORTS;QT_CORE_LIB;QT_GUI_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="$(QTDIR)lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";".\.GeneratedFiles""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTNOIR_TRACKER_HT_EXPORTS;QT_CORE_LIB;QT_GUI_LIB;FTNOIR_TRACKER_BASE_LIB"
+ RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(SolutionDir)\dinput";"$(QTDIR)\lib""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="1"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\ftnoir_tracker_ht.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\ftnoir_tracker_ht.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Moc'ing ftnoir_tracker_ht.h..."
+ CommandLine=""$(QTDIR)\bin\moc.exe" "$(InputPath)" -o ".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp" -DWIN32 -D_DEBUG -D_WINDOWS -D_USRDLL -DFTNOIR_TRACKER_HT_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -D_WINDLL -D_UNICODE -DUNICODE "-I$(QTDIR)include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I.\.GeneratedFiles" "-fStdAfx.h" "-f../ftnoir_tracker_ht.h"
"
+ AdditionalDependencies=""$(QTDIR)\bin\moc.exe";$(InputPath)"
+ Outputs="".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Moc'ing ftnoir_tracker_ht.h..."
+ CommandLine=""$(QTDIR)\bin\moc.exe" "$(InputPath)" -o ".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp" -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DFTNOIR_TRACKER_HT_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DFTNOIR_TRACKER_BASE_LIB -D_WINDLL -D_UNICODE -DUNICODE "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I.\.GeneratedFiles"
"
+ AdditionalDependencies=""$(QTDIR)\bin\moc.exe";$(InputPath)"
+ Outputs="".\.GeneratedFiles$(ConfigurationName)\moc_$(InputName).cpp""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\ftnoir_tracker_ht_dll.h"
+ >
+ </File>
+ <File
+ RelativePath=".\headtracker-ftnoir.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ht-api.h"
+ >
+ </File>
+ <File
+ RelativePath=".\stdafx.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="qrc;*"
+ UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}"
+ ParseFiles="false"
+ >
+ <File
+ RelativePath=".\Tracker.qrc"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Rcc'ing $(InputFileName)..."
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o .\.GeneratedFiles\qrc_$(InputName).cpp
"
+ AdditionalDependencies="$(InputPath);.\images\SeeingMachines.ico"
+ Outputs=".\.GeneratedFiles\qrc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Rcc'ing $(InputFileName)..."
+ CommandLine=""$(QTDIR)\bin\rcc.exe" -name "$(InputName)" -no-compress "$(InputPath)" -o .\.GeneratedFiles\qrc_$(InputName).cpp
"
+ AdditionalDependencies="$(InputPath);.\images\SeeingMachines.ico"
+ Outputs=".\.GeneratedFiles\qrc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Generated Files"
+ Filter="moc;h;cpp"
+ UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
+ >
+ <File
+ RelativePath=".\.generatedfiles\qrc_Tracker.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\.generatedfiles\ui_TrackerControls.h"
+ >
+ </File>
+ <Filter
+ Name="Debug"
+ Filter="cpp;moc"
+ SourceControlFiles="false"
+ >
+ <File
+ RelativePath=".\.GeneratedFilesDebug\moc_ftnoir_tracker_ht.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Release"
+ Filter="cpp;moc"
+ SourceControlFiles="false"
+ >
+ <File
+ RelativePath=".\.GeneratedFilesRelease\moc_ftnoir_tracker_ht.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Form Files"
+ Filter="ui"
+ UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}"
+ >
+ <File
+ RelativePath=".\TrackerControls.ui"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Uic'ing $(InputFileName)..."
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o ".\.GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
+ AdditionalDependencies="$(QTDIR)\bin\uic.exe"
+ Outputs="".\.GeneratedFiles\ui_$(InputName).h""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Uic'ing $(InputFileName)..."
+ CommandLine=""$(QTDIR)\bin\uic.exe" -o ".\.GeneratedFiles\ui_$(InputName).h" "$(InputPath)"
"
+ AdditionalDependencies="$(QTDIR)\bin\uic.exe"
+ Outputs="".\.GeneratedFiles\ui_$(InputName).h""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ <Global
+ Name="lupdateOnBuild"
+ Value="1"
+ />
+ <Global
+ Name="MocDir"
+ Value=".GeneratedFiles$(ConfigurationName)"
+ />
+ <Global
+ Name="MocOptions"
+ Value=""
+ />
+ <Global
+ Name="QtVersion Win32"
+ Value="$(DefaultQtVersion)"
+ />
+ <Global
+ Name="RccDir"
+ Value=".GeneratedFiles"
+ />
+ <Global
+ Name="UicDir"
+ Value=".GeneratedFiles"
+ />
+ </Globals>
+</VisualStudioProject>
diff --git a/FTNoIR_Tracker_HT/Tracker.qrc b/FTNoIR_Tracker_HT/Tracker.qrc new file mode 100644 index 00000000..9627f700 --- /dev/null +++ b/FTNoIR_Tracker_HT/Tracker.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>images/HT.ico</file> + </qresource> +</RCC> diff --git a/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp b/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp index ad530a0b..e440bd10 100644 --- a/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp +++ b/FTNoIR_Tracker_HT/ftnoir_tracker_ht.cpp @@ -24,19 +24,19 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21; config->max_keypoints = 250; config->keypoint_quality = 12; - config->keypoint_distance = 2.1; + config->keypoint_distance = 2.1f; config->keypoint_3distance = 5; config->force_width = 640; config->force_height = 480; config->force_fps = iniFile.value("fps", 0).toInt(); config->camera_index = iniFile.value("camera-index", -1).toInt(); config->ransac_num_iters = 100; - config->ransac_max_reprojection_error = 2.8; - config->ransac_max_inlier_error = 2.8; - config->ransac_max_mean_error = 2.3; - config->ransac_abs_max_mean_error = 3.5; + config->ransac_max_reprojection_error = 2.8f; + config->ransac_max_inlier_error = 2.8f; + config->ransac_max_mean_error = 2.3f; + config->ransac_abs_max_mean_error = 3.5f; config->debug = 0; - config->ransac_min_features = 0.9; + config->ransac_min_features = 0.9f; if (tracker) { tracker->enableRX = iniFile.value("enable-rx", true).toBool(); @@ -112,12 +112,12 @@ void Tracker::StartTracker(HWND parent) shm->timer = 0; switch (subprocess.state()) { - case QProcess::ProcessState::Running: - case QProcess::ProcessState::Starting: + case QProcess::Running: + case QProcess::Starting: subprocess.kill(); } - subprocess.setWorkingDirectory("tracker-ht"); - subprocess.start("tracker-ht/headtracker-ftnoir.exe"); + subprocess.setWorkingDirectory(QCoreApplication::applicationDirPath() + "/tracker-ht"); + subprocess.start(QCoreApplication::applicationDirPath() + "/tracker-ht/headtracker-ftnoir.exe"); } } @@ -219,7 +219,7 @@ void TrackerDll::getDescription(QString *strToBeFilled) void TrackerDll::getIcon(QIcon *icon) { - *icon = QIcon(); + *icon = QIcon(":/images/HT.ico"); } @@ -309,12 +309,12 @@ void TrackerControls::loadSettings() break; } ui.cameraFPS->setCurrentIndex(fps); - ui.rx->setCheckState(iniFile.value("enable-rx", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); - ui.ry->setCheckState(iniFile.value("enable-ry", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); - ui.rz->setCheckState(iniFile.value("enable-rz", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); - ui.tx->setCheckState(iniFile.value("enable-tx", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); - ui.ty->setCheckState(iniFile.value("enable-ty", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); - ui.tz->setCheckState(iniFile.value("enable-tz", true).toBool() ? Qt::CheckState::Checked : Qt::CheckState::Unchecked); + ui.rx->setCheckState(iniFile.value("enable-rx", true).toBool() ? Qt::Checked : Qt::Unchecked); + ui.ry->setCheckState(iniFile.value("enable-ry", true).toBool() ? Qt::Checked : Qt::Unchecked); + ui.rz->setCheckState(iniFile.value("enable-rz", true).toBool() ? Qt::Checked : Qt::Unchecked); + ui.tx->setCheckState(iniFile.value("enable-tx", true).toBool() ? Qt::Checked : Qt::Unchecked); + ui.ty->setCheckState(iniFile.value("enable-ty", true).toBool() ? Qt::Checked : Qt::Unchecked); + ui.tz->setCheckState(iniFile.value("enable-tz", true).toBool() ? Qt::Checked : Qt::Unchecked); iniFile.endGroup(); settingsDirty = false; } diff --git a/FTNoIR_Tracker_HT/images/HT.ico b/FTNoIR_Tracker_HT/images/HT.ico Binary files differnew file mode 100644 index 00000000..7555ce25 --- /dev/null +++ b/FTNoIR_Tracker_HT/images/HT.ico |