Skip to content

Commit

Permalink
Update Cinder + VS 2019 solution
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentz committed Dec 30, 2019
1 parent c81cb63 commit ebeb278
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 112 deletions.
5 changes: 3 additions & 2 deletions src/FaceVFXApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ void FaceOff::trackerThreadFn()

void FaceOff::setup()
{
ui::initialize(ui::Options().fontGlobalScale(getWindowContentScale()));
// ui::Options().fontGlobalScale(getWindowContentScale())
ui::initialize();

resize();

Expand Down Expand Up @@ -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"))
{
Expand Down
13 changes: 5 additions & 8 deletions vs2015/FaceVFX.sln
Original file line number Diff line number Diff line change
@@ -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
104 changes: 8 additions & 96 deletions vs2015/FaceVFX.vcxproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
Expand All @@ -23,92 +15,40 @@
<RootNamespace>FaceVFX</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>FaceVFX</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>"..\..\Cinder\include";..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>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;</AdditionalDependencies>
<AdditionalLibraryDirectories>"..\..\Cinder\lib\msw\$(PlatformTarget)";..\..\Cinder\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>LIBCMT;LIBCPMT</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\..\Cinder\blocks\Cinder-Imgui\include;..\..\Cinder\blocks\Cinder-Imgui\lib;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -117,6 +57,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>"..\..\Cinder\include";..\include</AdditionalIncludeDirectories>
Expand All @@ -132,45 +73,17 @@
<IgnoreSpecificDefaultLibraries>LIBCMT;LIBCPMT</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
<ResourceCompile>
<AdditionalIncludeDirectories>"..\..\Cinder\include";..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>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;</AdditionalDependencies>
<AdditionalLibraryDirectories>"..\..\Cinder\lib\msw\$(PlatformTarget)";..\..\Cinder\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding />
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\..\Cinder\include;..\..\Cinder\Blocks;..\..\Cinder\blocks\Cinder-OpenCV3\include;..\..\Cinder\blocks\Cinder-Imgui\include;..\..\Cinder\blocks\Cinder-Imgui\lib;..\3rdparty\OpenFace\LandmarkDetector\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0601;_WINDOWS;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
Expand Down Expand Up @@ -202,10 +115,10 @@
<None Include="..\include\item.def" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\ImGuizmo\ImGuizmo.cpp" />
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui.cpp" />
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_demo.cpp" />
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\src\CinderImGui.cpp" />
<ClCompile Include="..\3rdparty\FaceTracker\CLM.cc" />
<ClCompile Include="..\3rdparty\FaceTracker\FCheck.cc" />
Expand Down Expand Up @@ -237,7 +150,6 @@
<ItemGroup>
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\include\CinderImGui.h" />
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\include\imgui_user.h" />
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\lib\ImGuizmo\ImGuizmo.h" />
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imconfig.h" />
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui.h" />
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_internal.h" />
Expand Down
9 changes: 3 additions & 6 deletions vs2015/FaceVFX.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_draw.cpp">
<Filter>Blocks\imgui\lib</Filter>
</ClCompile>
<ClInclude Include="..\..\Cinder\blocks\Cinder-ImGui\lib\ImGuizmo\ImGuizmo.h">
<Filter>Blocks\imgui\lib</Filter>
</ClInclude>
<ClInclude Include="..\3rdparty\OpenFace\LandmarkDetector\include\CCNF_patch_expert.h">
<Filter>Source Files\OpenFace</Filter>
</ClInclude>
Expand Down Expand Up @@ -203,9 +200,6 @@
<ClCompile Include="..\src\FaceVFXApp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\ImGuizmo\ImGuizmo.cpp">
<Filter>Blocks\imgui\lib</Filter>
</ClCompile>
<ClCompile Include="..\3rdparty\OpenFace\LandmarkDetector\src\CCNF_patch_expert.cpp">
<Filter>Source Files\OpenFace</Filter>
</ClCompile>
Expand Down Expand Up @@ -272,5 +266,8 @@
<ClCompile Include="..\src\OpenFaceTracker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\Cinder\blocks\Cinder-ImGui\lib\imgui\imgui_widgets.cpp">
<Filter>Blocks\imgui\lib</Filter>
</ClCompile>
</ItemGroup>
</Project>

0 comments on commit ebeb278

Please sign in to comment.