diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2012-09-28 10:45:03 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2012-09-28 10:45:03 +0000 |
| commit | ee53c49af9789553fb51987bd6003ce30344e173 (patch) | |
| tree | 5360a62d0eb29129c7e18c6a1f9896502d075a6b /FaceTrackNoIR | |
| parent | 7eefd68e5ca3323221a8cc0cf32dc4a74d1fb239 (diff) | |
Added member-function to FunctionConfig, so it accepts default-settings from a QList of QFloats.
Put Stanislaws' Accela-defaults in the Accela-filter: they work fine!
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@172 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FaceTrackNoIR')
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.vcproj | 18 | ||||
| -rw-r--r-- | FaceTrackNoIR/tracker_types.cpp | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/FaceTrackNoIR/FaceTrackNoIR.vcproj b/FaceTrackNoIR/FaceTrackNoIR.vcproj index 8266d421..57755a93 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.vcproj +++ b/FaceTrackNoIR/FaceTrackNoIR.vcproj @@ -151,7 +151,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGL4.lib QtNetworkd4.lib Strmiids.lib QFunctionConfigurator.lib FSUIPC_User.lib"
+ AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGL4.lib QtNetworkd4.lib Strmiids.lib QFunctionConfigurator.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
AdditionalLibraryDirectories="$(QTDIR)\lib"
IgnoreAllDefaultLibraries="false"
@@ -212,9 +212,17 @@ >
</File>
<File
+ RelativePath=".\rotation.cpp"
+ >
+ </File>
+ <File
RelativePath=".\tracker.cpp"
>
</File>
+ <File
+ RelativePath=".\tracker_types.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Headers"
@@ -304,6 +312,10 @@ >
</File>
<File
+ RelativePath=".\rotation.h"
+ >
+ </File>
+ <File
RelativePath=".\tracker.h"
>
<FileConfiguration
@@ -329,6 +341,10 @@ />
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\tracker_types.h"
+ >
+ </File>
</Filter>
<Filter
Name="FormsQt"
diff --git a/FaceTrackNoIR/tracker_types.cpp b/FaceTrackNoIR/tracker_types.cpp index e3c15807..cdd8d239 100644 --- a/FaceTrackNoIR/tracker_types.cpp +++ b/FaceTrackNoIR/tracker_types.cpp @@ -41,4 +41,4 @@ T6DOF operator+(const T6DOF& A, const T6DOF& B) C.z = A.z + B.z;
//C.frame_number?
return C;
-}
\ No newline at end of file +}
|