Permalink
Browse files

Merged and updated from dev

  • Loading branch information...
1 parent 15ad1db commit ffc812679201a794dedb4d14598e87fe3107b911 @BanTheRewind BanTheRewind committed Jun 6, 2014
Showing with 144 additions and 1,724 deletions.
  1. +1 −2 samples/BasicApp/src/BasicApp.cpp
  2. +0 −2 samples/BasicApp/vc2012/BasicApp.vcxproj
  3. +0 −6 samples/BasicApp/vc2012/BasicApp.vcxproj.filters
  4. +0 −28 samples/BasicApp/vc2013/BasicApp.sln
  5. +0 −248 samples/BasicApp/vc2013/BasicApp.vcxproj
  6. +0 −54 samples/BasicApp/vc2013/BasicApp.vcxproj.filters
  7. BIN samples/BasicApp/vc2013/Resources.rc
  8. BIN samples/HandApp/resources/cinder_app_icon.ico
  9. +0 −157 samples/HandApp/src/HandApp.cpp
  10. +2 −6 samples/ParticleApp/resources/draw_frag.glsl
  11. +22 −28 samples/ParticleApp/resources/draw_vert.glsl
  12. +6 −11 samples/ParticleApp/resources/gpgpu_frag.glsl
  13. +3 −10 samples/ParticleApp/resources/gpgpu_vert.glsl
  14. +89 −113 samples/ParticleApp/src/ParticleApp.cpp
  15. +0 −2 samples/ParticleApp/vc2012/ParticleApp.vcxproj
  16. +0 −6 samples/ParticleApp/vc2012/ParticleApp.vcxproj.filters
  17. +0 −28 samples/ParticleApp/vc2013/ParticleApp.sln
  18. +0 −255 samples/ParticleApp/vc2013/ParticleApp.vcxproj
  19. +0 −74 samples/ParticleApp/vc2013/ParticleApp.vcxproj.filters
  20. +0 −9 samples/ParticleApp/vc2013/Resources.rc
  21. +9 −20 samples/UserApp/src/UserApp.cpp
  22. +0 −2 samples/UserApp/vc2012/UserApp.vcxproj
  23. +0 −6 samples/UserApp/vc2012/UserApp.vcxproj.filters
  24. BIN samples/UserApp/vc2013/Resources.rc
  25. +0 −28 samples/UserApp/vc2013/UserApp.sln
  26. +0 −248 samples/UserApp/vc2013/UserApp.vcxproj
  27. +0 −54 samples/UserApp/vc2013/UserApp.vcxproj.filters
  28. +0 −203 src/HandTracker.cpp
  29. +0 −112 src/HandTracker.h
  30. +8 −8 src/Kinect.cpp
  31. +4 −4 src/Kinect.h
@@ -35,7 +35,6 @@
*/
#include "cinder/app/AppBasic.h"
-#include "cinder/app/RendererGl.h"
#include "cinder/gl/Texture.h"
#include "Kinect.h"
@@ -57,7 +56,7 @@ using namespace std;
void BasicApp::draw()
{
- gl::viewport( getWindowSize() );
+ gl::setViewport( getWindowBounds() );
gl::clear();
gl::setMatricesWindow( getWindowSize() );
@@ -227,7 +227,6 @@ xcopy "$(KINECT_TOOLKIT_DIR)Redist\amd64\Face*.*" "$(OutDir)" /Y /C</Command>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\FaceTracker.cpp" />
<ClCompile Include="..\..\..\src\Kinect.cpp" />
<ClCompile Include="..\src\BasicApp.cpp" />
</ItemGroup>
@@ -239,7 +238,6 @@ xcopy "$(KINECT_TOOLKIT_DIR)Redist\amd64\Face*.*" "$(OutDir)" /Y /C</Command>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\lib\KinectCommonBridgeLib.h" />
- <ClInclude Include="..\..\..\src\FaceTracker.h" />
<ClInclude Include="..\..\..\src\Kinect.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -26,9 +26,6 @@
<ClCompile Include="..\..\..\src\Kinect.cpp">
<Filter>blocks\Cinder-KCB</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\FaceTracker.cpp">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="cinder_app_icon.ico">
@@ -44,9 +41,6 @@
<ClInclude Include="..\..\..\src\Kinect.h">
<Filter>blocks\Cinder-KCB</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\FaceTracker.h">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\lib\KinectCommonBridgeLib.h">
<Filter>blocks\Cinder-KCB\lib</Filter>
</ClInclude>
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicApp", "BasicApp.vcxproj", "{74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Debug|Win32.ActiveCfg = Debug|Win32
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Debug|Win32.Build.0 = Debug|Win32
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Debug|x64.ActiveCfg = Debug|x64
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Debug|x64.Build.0 = Debug|x64
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Release|Win32.ActiveCfg = Release|Win32
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Release|Win32.Build.0 = Release|Win32
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Release|x64.ActiveCfg = Release|x64
- {74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{74202EDD-91D2-4D2A-B0B6-355CEB16E6BE}</ProjectGuid>
- <RootNamespace>BasicApp</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
- </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 Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
- </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'">$(ProjectDir)bin\</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'">$(ProjectDir)bin\</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>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath)</IncludePath>
- <LibraryPath>$(LibraryPath)</LibraryPath>
- <TargetName>$(ProjectName)_d</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath)</IncludePath>
- <LibraryPath>$(LibraryPath)</LibraryPath>
- <TargetName>$(ProjectName)_d</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(KINECTSDK10_DIR)\inc</IncludePath>
- <LibraryPath>$(KINECTSDK10_DIR)\lib\x86;$(LibraryPath)</LibraryPath>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(KINECTSDK10_DIR)\inc</IncludePath>
- <LibraryPath>$(KINECTSDK10_DIR)\lib\x86;$(LibraryPath)</LibraryPath>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\boost;..\..\..\lib;..\..\..\src;$(KINECTSDK10_DIR)\inc;$(KINECT_TOOLKIT_DIR)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;Kinect10.lib;KinectCommonBridge.lib;FaceTrackLib.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\..\lib;..\..\..\..\..\lib\msw\$(PlatformTarget);..\..\..\lib\$(PlatformTarget)\lib\$(Configuration)\$(PlatformToolset);$(KINECTSDK10_DIR)\lib\x86;$(KINECT_TOOLKIT_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <PreBuildEvent>
- <Command>xcopy "..\..\..\lib\$(PlatformTarget)\dll\$(Configuration)\*.dll" "$(OutDir)" /Y /C
-xcopy "$(KINECT_TOOLKIT_DIR)Redist\x86\Face*.*" "$(OutDir)" /Y /C</Command>
- </PreBuildEvent>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\boost;..\..\..\lib;..\..\..\src;$(KINECTSDK10_DIR)\inc;$(KINECT_TOOLKIT_DIR)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;Kinect10.lib;KinectCommonBridge.lib;FaceTrackLib.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\..\lib;..\..\..\..\..\lib\msw\$(PlatformTarget);..\..\..\lib\$(PlatformTarget)\lib\$(Configuration)\$(PlatformToolset);$(KINECTSDK10_DIR)\lib\amd64;$(KINECT_TOOLKIT_DIR)Lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <PreBuildEvent>
- <Command>xcopy "..\..\..\lib\$(PlatformTarget)\dll\$(Configuration)\*.dll" "$(OutDir)" /Y /C
-xcopy "$(KINECT_TOOLKIT_DIR)Redist\amd64\Face*.*" "$(OutDir)" /Y /C</Command>
- </PreBuildEvent>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\boost;..\..\..\lib;..\..\..\src;$(KINECTSDK10_DIR)\inc;$(KINECT_TOOLKIT_DIR)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- </ProjectReference>
- <Link>
- <AdditionalDependencies>cinder-$(PlatformToolset).lib;Kinect10.lib;KinectCommonBridge.lib;FaceTrackLib.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\..\lib;..\..\..\..\..\lib\msw\$(PlatformTarget);..\..\..\lib\$(PlatformTarget)\lib\$(Configuration)\$(PlatformToolset);$(KINECTSDK10_DIR)\lib\x86;$(KINECT_TOOLKIT_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <GenerateMapFile>true</GenerateMapFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>
- </EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <PreBuildEvent>
- <Command>xcopy "..\..\..\lib\$(PlatformTarget)\dll\$(Configuration)\*.dll" "$(OutDir)" /Y /C
-xcopy "$(KINECT_TOOLKIT_DIR)Redist\x86\Face*.*" "$(OutDir)" /Y /C</Command>
- </PreBuildEvent>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\boost;..\..\..\lib;..\..\..\src;$(KINECTSDK10_DIR)\inc;$(KINECT_TOOLKIT_DIR)inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- </ProjectReference>
- <Link>
- <AdditionalDependencies>cinder-$(PlatformToolset).lib;Kinect10.lib;KinectCommonBridge.lib;FaceTrackLib.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\..\..\..\lib;..\..\..\..\..\lib\msw\$(PlatformTarget);..\..\..\lib\$(PlatformTarget)\lib\$(Configuration)\$(PlatformToolset);$(KINECTSDK10_DIR)\lib\amd64;$(KINECT_TOOLKIT_DIR)Lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <GenerateMapFile>true</GenerateMapFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>
- </EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- <PreBuildEvent>
- <Command>xcopy "..\..\..\lib\$(PlatformTarget)\dll\$(Configuration)\*.dll" "$(OutDir)" /Y /C
-xcopy "$(KINECT_TOOLKIT_DIR)Redist\amd64\Face*.*" "$(OutDir)" /Y /C</Command>
- </PreBuildEvent>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\src\FaceTracker.cpp" />
- <ClCompile Include="..\..\..\src\Kinect.cpp" />
- <ClCompile Include="..\src\BasicApp.cpp" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="cinder_app_icon.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Resources.rc" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\lib\KinectCommonBridgeLib.h" />
- <ClInclude Include="..\..\..\src\FaceTracker.h" />
- <ClInclude Include="..\..\..\src\Kinect.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- <Filter Include="blocks">
- <UniqueIdentifier>{91831fb1-aa3f-4402-a6d9-0f176988c673}</UniqueIdentifier>
- </Filter>
- <Filter Include="blocks\Cinder-KCB">
- <UniqueIdentifier>{283212cd-4dad-4d11-aea7-e74e45dbf2df}</UniqueIdentifier>
- </Filter>
- <Filter Include="blocks\Cinder-KCB\lib">
- <UniqueIdentifier>{9efc914e-bd85-4865-b4d4-e561e1274ebc}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\src\BasicApp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\Kinect.cpp">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\FaceTracker.cpp">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="cinder_app_icon.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Resources.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\src\Kinect.h">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\src\FaceTracker.h">
- <Filter>blocks\Cinder-KCB</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\lib\KinectCommonBridgeLib.h">
- <Filter>blocks\Cinder-KCB\lib</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
Binary file not shown.
Binary file not shown.
Oops, something went wrong. Retry.

0 comments on commit ffc8126

Please sign in to comment.