Skip to content

Commit

Permalink
Updated VS2015 version
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomwolf
thomwolf committed Jul 26, 2016
1 parent 367bdcf commit 474a4f9
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 42 deletions.
20 changes: 14 additions & 6 deletions Magic Sand.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Default = Debug|Default
Debug|Win32 = Debug|Win32
Release|Default = Release|Default
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Default.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Default.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Default.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Default.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Default = Debug|Default
Debug|Win32 = Debug|Win32
Release|Default = Release|Default
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Expand Down
10 changes: 10 additions & 0 deletions bin/data/settings/kinectProjectorSettings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<KINECTSETTINGS>
<kinectROI>0, 0, 0, 640, 480</kinectROI>
<basePlaneNormalBack>0, 0, 1</basePlaneNormalBack>
<basePlaneOffsetBack>0, 0, 870</basePlaneOffsetBack>
<basePlaneEq>0, 0, 1, -870</basePlaneEq>
<maxOffsetBack>570</maxOffsetBack>
<spatialFiltering>1</spatialFiltering>
<followBigChanges>0</followBigChanges>
<numAveragingSlots>15</numAveragingSlots>
</KINECTSETTINGS>
5 changes: 5 additions & 0 deletions bin/data/settings/sandSurfaceRendererSettings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<SURFACERENDERERSETTINGS>
<colorMapFile>HeightColorMap.xml</colorMapFile>
<drawContourLines>1</drawContourLines>
<contourLineDistance>10</contourLineDistance>
</SURFACERENDERERSETTINGS>
22 changes: 11 additions & 11 deletions kinectExample.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,9 @@ C:\Users\WOLF\Documents\Personnel\of_v0.9.3_vs_release\addons\ofxParagraph\src</
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlerror.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlparser.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.cpp" />
<ClCompile Include="src\ColorMap.cpp" />
<ClCompile Include="src\KinectGrabber.cpp" />
<ClCompile Include="src\KinectProjector.cpp" />
<ClCompile Include="src\KinectProjectorCalibration.cpp" />
<ClCompile Include="src\KinectProjector\KinectGrabber.cpp" />
<ClCompile Include="src\KinectProjector\KinectProjector.cpp" />
<ClCompile Include="src\KinectProjector\KinectProjectorCalibration.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\ofApp.cpp" />
<ClCompile Include="..\..\..\addons\ofxKinect\src\extra\ofxKinectExtras.cpp" />
Expand All @@ -220,7 +219,8 @@ C:\Users\WOLF\Documents\Personnel\of_v0.9.3_vs_release\addons\ofxParagraph\src</
<ClCompile Include="..\..\..\addons\ofxOpenCv\src\ofxCvHaarFinder.cpp" />
<ClCompile Include="..\..\..\addons\ofxOpenCv\src\ofxCvColorImage.cpp" />
<ClCompile Include="..\..\..\addons\ofxOpenCv\src\ofxCvContourFinder.cpp" />
<ClCompile Include="src\SandSurfaceRenderer.cpp" />
<ClCompile Include="src\SandSurfaceRenderer\ColorMap.cpp" />
<ClCompile Include="src\SandSurfaceRenderer\SandSurfaceRenderer.cpp" />
<ClCompile Include="src\vehicle.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -270,10 +270,10 @@ C:\Users\WOLF\Documents\Personnel\of_v0.9.3_vs_release\addons\ofxParagraph\src</
<ClInclude Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.h" />
<ClInclude Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.h" />
<ClInclude Include="resource2.h" />
<ClInclude Include="src\ColorMap.h" />
<ClInclude Include="src\KinectGrabber.h" />
<ClInclude Include="src\KinectProjector.h" />
<ClInclude Include="src\KinectProjectorCalibration.h" />
<ClInclude Include="src\KinectProjector\KinectGrabber.h" />
<ClInclude Include="src\KinectProjector\KinectProjector.h" />
<ClInclude Include="src\KinectProjector\KinectProjectorCalibration.h" />
<ClInclude Include="src\KinectProjector\Utils.h" />
<ClInclude Include="src\ofApp.h" />
<ClInclude Include="..\..\..\addons\ofxKinect\src\extra\ofxKinectExtras.h" />
<ClInclude Include="..\..\..\addons\ofxKinect\src\ofxKinect.h" />
Expand Down Expand Up @@ -466,8 +466,8 @@ C:\Users\WOLF\Documents\Personnel\of_v0.9.3_vs_release\addons\ofxParagraph\src</
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv\cxeigen.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv\highgui.h" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv\cv.hpp" />
<ClInclude Include="src\SandSurfaceRenderer.h" />
<ClInclude Include="src\Utils.h" />
<ClInclude Include="src\SandSurfaceRenderer\ColorMap.h" />
<ClInclude Include="src\SandSurfaceRenderer\SandSurfaceRenderer.h" />
<ClInclude Include="src\vehicle.h" />
</ItemGroup>
<ItemGroup>
Expand Down
56 changes: 31 additions & 25 deletions kinectExample.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,23 @@
<ClCompile Include="..\..\..\addons\ofxParagraph\src\ofxParagraph.cpp">
<Filter>addons\ofxParagraph\src</Filter>
</ClCompile>
<ClCompile Include="src\KinectProjector.cpp">
<ClCompile Include="src\vehicle.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\KinectProjectorCalibration.cpp">
<Filter>src</Filter>
<ClCompile Include="src\KinectProjector\KinectProjector.cpp">
<Filter>src\KinectProjector</Filter>
</ClCompile>
<ClCompile Include="src\KinectGrabber.cpp">
<Filter>src</Filter>
<ClCompile Include="src\KinectProjector\KinectProjectorCalibration.cpp">
<Filter>src\KinectProjector</Filter>
</ClCompile>
<ClCompile Include="src\vehicle.cpp">
<Filter>src</Filter>
<ClCompile Include="src\KinectProjector\KinectGrabber.cpp">
<Filter>src\KinectProjector</Filter>
</ClCompile>
<ClCompile Include="src\ColorMap.cpp">
<Filter>src</Filter>
<ClCompile Include="src\SandSurfaceRenderer\SandSurfaceRenderer.cpp">
<Filter>src\SandSurfaceRenderer</Filter>
</ClCompile>
<ClCompile Include="src\SandSurfaceRenderer.cpp">
<Filter>src</Filter>
<ClCompile Include="src\SandSurfaceRenderer\ColorMap.cpp">
<Filter>src\SandSurfaceRenderer</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -372,6 +372,12 @@
<Filter Include="addons\ofxParagraph\src">
<UniqueIdentifier>{49cafda0-29c4-4afb-9eb8-de4f6cafc53b}</UniqueIdentifier>
</Filter>
<Filter Include="src\KinectProjector">
<UniqueIdentifier>{ecb46e3a-0e0c-4aaf-b590-b869205d5a36}</UniqueIdentifier>
</Filter>
<Filter Include="src\SandSurfaceRenderer">
<UniqueIdentifier>{4b543213-7a5b-4369-bde0-8d0b94a47c04}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\ofApp.h">
Expand Down Expand Up @@ -1085,28 +1091,28 @@
<ClInclude Include="..\..\..\addons\ofxParagraph\src\ofxParagraph.h">
<Filter>addons\ofxParagraph\src</Filter>
</ClInclude>
<ClInclude Include="src\KinectProjector.h">
<ClInclude Include="src\vehicle.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\KinectProjectorCalibration.h">
<Filter>src</Filter>
<ClInclude Include="resource2.h" />
<ClInclude Include="src\KinectProjector\KinectProjector.h">
<Filter>src\KinectProjector</Filter>
</ClInclude>
<ClInclude Include="src\Utils.h">
<Filter>src</Filter>
<ClInclude Include="src\KinectProjector\KinectProjectorCalibration.h">
<Filter>src\KinectProjector</Filter>
</ClInclude>
<ClInclude Include="src\KinectGrabber.h">
<Filter>src</Filter>
<ClInclude Include="src\KinectProjector\Utils.h">
<Filter>src\KinectProjector</Filter>
</ClInclude>
<ClInclude Include="src\vehicle.h">
<Filter>src</Filter>
<ClInclude Include="src\KinectProjector\KinectGrabber.h">
<Filter>src\KinectProjector</Filter>
</ClInclude>
<ClInclude Include="src\ColorMap.h">
<Filter>src</Filter>
<ClInclude Include="src\SandSurfaceRenderer\SandSurfaceRenderer.h">
<Filter>src\SandSurfaceRenderer</Filter>
</ClInclude>
<ClInclude Include="src\SandSurfaceRenderer.h">
<Filter>src</Filter>
<ClInclude Include="src\SandSurfaceRenderer\ColorMap.h">
<Filter>src\SandSurfaceRenderer</Filter>
</ClInclude>
<ClInclude Include="resource2.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Magic Sand2.rc" />
Expand Down

0 comments on commit 474a4f9

Please sign in to comment.