diff --git a/src/FaceVFXApp.cpp b/src/FaceVFXApp.cpp index 910147a..5495679 100644 --- a/src/FaceVFXApp.cpp +++ b/src/FaceVFXApp.cpp @@ -271,7 +271,8 @@ void FaceOff::trackerThreadFn() void FaceOff::setup() { - ui::initialize(ui::Options().fontGlobalScale(getWindowContentScale())); + // ui::Options().fontGlobalScale(getWindowContentScale()) + ui::initialize(); resize(); @@ -377,7 +378,7 @@ void FaceOff::update() void FaceOff::updateGui() { - ui::ScopedWindow window("Settings", {toPixels(getWindowWidth() / 2), toPixels(getWindowHeight() / 2)}, 0.5f); + ui::ScopedWindow window("Settings");// , { toPixels(getWindowWidth() / 2), toPixels(getWindowHeight() / 2) }, 0.5f); if (ui::Button("Save Config")) { diff --git a/vs2015/FaceVFX.sln b/vs2015/FaceVFX.sln index 76761c4..2273530 100644 --- a/vs2015/FaceVFX.sln +++ b/vs2015/FaceVFX.sln @@ -1,28 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29519.87 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FaceVFX", "FaceVFX.vcxproj", "{FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Debug|x64.ActiveCfg = Debug|x64 {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Debug|x64.Build.0 = Debug|x64 - {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Debug|x86.ActiveCfg = Debug|Win32 - {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Debug|x86.Build.0 = Debug|Win32 {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Release|x64.ActiveCfg = Release|x64 {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Release|x64.Build.0 = Release|x64 - {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Release|x86.ActiveCfg = Release|Win32 - {FEBA1BC7-4A0A-4389-9D01-D087DC2D31B3}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3795BA5A-23B1-4EE5-9DD9-71EAE7D4C920} + EndGlobalSection EndGlobal diff --git a/vs2015/FaceVFX.vcxproj b/vs2015/FaceVFX.vcxproj index 5c89b23..2b8f058 100644 --- a/vs2015/FaceVFX.vcxproj +++ b/vs2015/FaceVFX.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -23,92 +15,40 @@ FaceVFX Win32Proj FaceVFX - 8.1 + 10.0 - - Application - false - v140 - Unicode - true - Application false - v140 + v142 Unicode true - - Application - true - v140 - Unicode - Application true - v140 + v142 Unicode - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false false - - - Disabled - ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include - WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - EditAndContinue - true - - - "..\..\Cinder\include";..\include - - - cinder.lib;OpenGL32.lib;%(AdditionalDependencies);..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_calib3d300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_core300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_features2d300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_flann300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_hal300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_imgproc300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_ml300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_objdetect300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_photo300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_shape300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_stitching300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_superres300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_ts300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_video300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_videostab300d.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\ippicvmt.lib;..\..\Cinder\blocks\QuickTime\lib\msw\x86\CVClient.lib;..\..\Cinder\blocks\QuickTime\lib\msw\x86\QTMLClient.lib; - "..\..\Cinder\lib\msw\$(PlatformTarget)";..\..\Cinder\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset) - true - Windows - false - - MachineX86 - LIBCMT;LIBCPMT - - Disabled - ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include + ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\..\Cinder\blocks\Cinder-Imgui\include;..\..\Cinder\blocks\Cinder-Imgui\lib;..\3rdparty\OpenFace\LandmarkDetector\include WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -117,6 +57,7 @@ Level3 ProgramDatabase true + stdcpp17 "..\..\Cinder\include";..\include @@ -132,38 +73,9 @@ LIBCMT;LIBCPMT - - - ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include - WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;NDEBUG;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - true - - - true - - - "..\..\Cinder\include";..\include - - - cinder.lib;OpenGL32.lib;%(AdditionalDependencies);..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_calib3d300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_core300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_features2d300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_flann300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_hal300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_imgproc300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_ml300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_objdetect300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_photo300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_shape300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_stitching300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_superres300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_ts300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_video300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\opencv_videostab300.lib;..\..\Cinder\blocks\Cinder-OpenCV3\lib\vc2015\x86\ippicvmt.lib;..\..\Cinder\blocks\QuickTime\lib\msw\x86\CVClient.lib;..\..\Cinder\blocks\QuickTime\lib\msw\x86\QTMLClient.lib; - "..\..\Cinder\lib\msw\$(PlatformTarget)";..\..\Cinder\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset) - false - true - Windows - true - - false - - MachineX86 - - - ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include + ..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\..\Cinder\blocks\Cinder-Imgui\include;..\..\Cinder\blocks\Cinder-Imgui\lib;..\3rdparty\OpenFace\LandmarkDetector\include WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;NDEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -171,6 +83,7 @@ Level3 ProgramDatabase true + stdcpp17 true @@ -202,10 +115,10 @@ - + @@ -237,7 +150,6 @@ - diff --git a/vs2015/FaceVFX.vcxproj.filters b/vs2015/FaceVFX.vcxproj.filters index 05dbd02..59918e7 100644 --- a/vs2015/FaceVFX.vcxproj.filters +++ b/vs2015/FaceVFX.vcxproj.filters @@ -75,9 +75,6 @@ Blocks\imgui\lib - - Blocks\imgui\lib - Source Files\OpenFace @@ -203,9 +200,6 @@ Source Files - - Blocks\imgui\lib - Source Files\OpenFace @@ -272,5 +266,8 @@ Source Files + + Blocks\imgui\lib + \ No newline at end of file