From c23db4b5e8be6984ba7523eb19effe348ffc7b75 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 4 Oct 2016 21:14:41 -0400 Subject: [PATCH] Fixes to camera loading. --- .gitignore | 3 +++ OpenFace.sln | 2 +- .../FaceLandmarkImg.vcxproj.user | 23 ++++++++++++++++++ .../FaceLandmarkVid.vcxproj.user | 23 ++++++++++++++++++ .../FeatureExtraction.vcxproj.user | 23 ++++++++++++++++++ exe/Recording/Recording.vcxproj.user | 17 +++++++++++++ {OpenFaceDemo => gui/OpenFaceDemo}/App.config | 0 {OpenFaceDemo => gui/OpenFaceDemo}/App.xaml | 0 .../OpenFaceDemo}/App.xaml.cs | 0 .../OpenFaceDemo}/MainWindow.xaml | 0 .../OpenFaceDemo}/MainWindow.xaml.cs | 2 +- .../OpenFaceDemo}/OpenFaceDemo.csproj | 11 +++++++-- .../OpenFaceDemo}/Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../OpenFaceDemo}/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../UI_items/CameraSelection.xaml | 0 .../UI_items/CameraSelection.xaml.cs | 0 gui/OpenFaceDemo/logo1.ico | Bin 0 -> 1626582 bytes gui/OpenFaceOffline/OpenFaceOffline.csproj | 6 ++++- lib/local/CppInerop/CameraInterop.h | 12 +++++---- 22 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user create mode 100644 exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user create mode 100644 exe/FeatureExtraction/FeatureExtraction.vcxproj.user create mode 100644 exe/Recording/Recording.vcxproj.user rename {OpenFaceDemo => gui/OpenFaceDemo}/App.config (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/App.xaml (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/App.xaml.cs (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/MainWindow.xaml (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/MainWindow.xaml.cs (98%) rename {OpenFaceDemo => gui/OpenFaceDemo}/OpenFaceDemo.csproj (93%) rename {OpenFaceDemo => gui/OpenFaceDemo}/Properties/AssemblyInfo.cs (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/Properties/Resources.Designer.cs (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/Properties/Resources.resx (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/Properties/Settings.Designer.cs (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/Properties/Settings.settings (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/UI_items/CameraSelection.xaml (100%) rename {OpenFaceDemo => gui/OpenFaceDemo}/UI_items/CameraSelection.xaml.cs (100%) create mode 100644 gui/OpenFaceDemo/logo1.ico diff --git a/.gitignore b/.gitignore index e2b9836..035cfdf 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ lib/local/FaceAnalyser/Debug/ lib/local/LandmarkDetector/Debug/ OpenFaceDemo/bin/ OpenFaceDemo/obj/ +Debug/model/ +Debug/ +*.suo diff --git a/OpenFace.sln b/OpenFace.sln index f830b7b..c3e36c0 100644 --- a/OpenFace.sln +++ b/OpenFace.sln @@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CamCom", "lib\local\CamCom\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceOffline", "gui\OpenFaceOffline\OpenFaceOffline.csproj", "{A4760F41-2B1F-4144-B7B2-62785AFFE79B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceDemo", "OpenFaceDemo\OpenFaceDemo.csproj", "{E143A2AA-312E-4DFE-B61D-9A87CCBC8E90}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFaceDemo", "gui\OpenFaceDemo\OpenFaceDemo.csproj", "{E143A2AA-312E-4DFE-B61D-9A87CCBC8E90}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user new file mode 100644 index 0000000..08d8206 --- /dev/null +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj.user @@ -0,0 +1,23 @@ + + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + \ No newline at end of file diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user new file mode 100644 index 0000000..950288a --- /dev/null +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user @@ -0,0 +1,23 @@ + + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + \ No newline at end of file diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj.user b/exe/FeatureExtraction/FeatureExtraction.vcxproj.user new file mode 100644 index 0000000..08d8206 --- /dev/null +++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj.user @@ -0,0 +1,23 @@ + + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + + + + WindowsLocalDebugger + + \ No newline at end of file diff --git a/exe/Recording/Recording.vcxproj.user b/exe/Recording/Recording.vcxproj.user new file mode 100644 index 0000000..b89184e --- /dev/null +++ b/exe/Recording/Recording.vcxproj.user @@ -0,0 +1,17 @@ + + + + + + WindowsLocalDebugger + + + WindowsLocalDebugger + + + WindowsLocalDebugger + + + WindowsLocalDebugger + + \ No newline at end of file diff --git a/OpenFaceDemo/App.config b/gui/OpenFaceDemo/App.config similarity index 100% rename from OpenFaceDemo/App.config rename to gui/OpenFaceDemo/App.config diff --git a/OpenFaceDemo/App.xaml b/gui/OpenFaceDemo/App.xaml similarity index 100% rename from OpenFaceDemo/App.xaml rename to gui/OpenFaceDemo/App.xaml diff --git a/OpenFaceDemo/App.xaml.cs b/gui/OpenFaceDemo/App.xaml.cs similarity index 100% rename from OpenFaceDemo/App.xaml.cs rename to gui/OpenFaceDemo/App.xaml.cs diff --git a/OpenFaceDemo/MainWindow.xaml b/gui/OpenFaceDemo/MainWindow.xaml similarity index 100% rename from OpenFaceDemo/MainWindow.xaml rename to gui/OpenFaceDemo/MainWindow.xaml diff --git a/OpenFaceDemo/MainWindow.xaml.cs b/gui/OpenFaceDemo/MainWindow.xaml.cs similarity index 98% rename from OpenFaceDemo/MainWindow.xaml.cs rename to gui/OpenFaceDemo/MainWindow.xaml.cs index c3f5ff4..f3695fd 100644 --- a/OpenFaceDemo/MainWindow.xaml.cs +++ b/gui/OpenFaceDemo/MainWindow.xaml.cs @@ -86,7 +86,7 @@ namespace OpenFaceDemo if (cam_sec == null) { - cam_sec = new CameraSelection(); + cam_sec = new CameraSelection(); } else { diff --git a/OpenFaceDemo/OpenFaceDemo.csproj b/gui/OpenFaceDemo/OpenFaceDemo.csproj similarity index 93% rename from OpenFaceDemo/OpenFaceDemo.csproj rename to gui/OpenFaceDemo/OpenFaceDemo.csproj index 11c7dde..a451973 100644 --- a/OpenFaceDemo/OpenFaceDemo.csproj +++ b/gui/OpenFaceDemo/OpenFaceDemo.csproj @@ -123,16 +123,23 @@ - + {a4760f41-2b1f-4144-b7b2-62785affe79b} OpenFaceOffline - + {78196985-ee54-411f-822b-5a23edf80642} CppInerop + + + + + + xcopy /I /E /Y /D "$(ProjectDir)logo1.ico" "$(ProjectDir)$(OutDir)" +