Permalink
Browse files

Merge branch 'master' of github.com:elliotwoods/artandcode.Camera-and…

…-projector-calibration

Conflicts:
	PointcloudWriter/src/testApp.cpp
	common src/ofxKinectPointcloudRecorder.cpp
  • Loading branch information...
2 parents e82aef8 + 451e5be commit 66064353fb27bb7e990b3753459f784ebccd15e6 @elliotwoods committed Dec 2, 2011
Showing with 5,791 additions and 2,279 deletions.
  1. +7 −4 RGBDPost/emptyExample_vs2010.sln → CalibrationExtract/.sln
  2. +209 −0 CalibrationExtract/.vcproj
  3. +25 −0 CalibrationExtract/.vcproj.user
  4. +581 −0 CalibrationExtract/CalibrationExtractor.xcodeproj/project.pbxproj
  5. +9 −0 CalibrationExtract/Project.xcconfig
  6. +20 −0 CalibrationExtract/openFrameworks-Info.plist
  7. +16 −0 CalibrationExtract/src/main.cpp
  8. +78 −0 CalibrationExtract/src/testApp.cpp
  9. +27 −0 CalibrationExtract/src/testApp.h
  10. +6 −6 PointcloudWriter/PointcloudWriter.xcodeproj/project.pbxproj
  11. +21 −8 PointcloudWriter/src/testApp.cpp
  12. +1 −1 PointcloudWriter/src/testApp.h
  13. +28 −0 QuickTestCalibrate/.sln
  14. +209 −0 QuickTestCalibrate/.vcproj
  15. +25 −0 QuickTestCalibrate/.vcproj.user
  16. +19 −0 QuickTestCalibrate/Project.xcconfig
  17. +2,032 −0 QuickTestCalibrate/RGBDManualAlign.xcodeproj/project.pbxproj
  18. +20 −0 QuickTestCalibrate/openFrameworks-Info.plist
  19. +16 −0 QuickTestCalibrate/src/main.cpp
  20. +401 −0 QuickTestCalibrate/src/testApp.cpp
  21. +95 −0 QuickTestCalibrate/src/testApp.h
  22. +28 −0 RGBDPost/.sln
  23. +209 −0 RGBDPost/.vcproj
  24. +25 −0 RGBDPost/.vcproj.user
  25. +522 −25 RGBDPost/RGBDPost.xcodeproj/project.pbxproj
  26. BIN RGBDPost/emptyExample_vs2010.sdf
  27. BIN RGBDPost/emptyExample_vs2010.suo
  28. +0 −145 RGBDPost/emptyExample_vs2010.vcxproj
  29. +0 −11 RGBDPost/emptyExample_vs2010.vcxproj.user
  30. +0 −309 RGBDPost/src/CameraHead.cpp
  31. +0 −82 RGBDPost/src/CameraHead.h
  32. +0 −235 RGBDPost/src/_testApp.cpp
  33. +0 −52 RGBDPost/src/_testApp.h
  34. +1 −1 RGBDPost/src/main.cpp
  35. +41 −0 RGBDPost/src/scrScrub.cpp
  36. +24 −0 RGBDPost/src/scrScrub.h
  37. +231 −173 RGBDPost/src/testApp.cpp
  38. +72 −42 RGBDPost/src/testApp.h
  39. +24 −24 RGBDPreview/RGBDPreview.xcodeproj/project.pbxproj
  40. +286 −496 RGBDPreview/bin/data/colorCalib.yml
  41. +286 −496 RGBDPreview/bin/data/depthCalib.yml
  42. +33 −24 RGBDPreview/src/testApp.cpp
  43. +1 −0 RGBDPreview/src/testApp.h
  44. +1 −1 common src/ofxCvCheckerboardPreview.cpp
  45. +39 −32 {PointcloudWriter/src → common src}/ofxKinectPointcloudRecorder.cpp
  46. +6 −4 {PointcloudWriter/src → common src}/ofxKinectPointcloudRecorder.h
  47. +90 −94 common src/ofxRGBDAlignment.cpp
  48. +13 −6 common src/ofxRGBDAlignment.h
  49. +12 −7 common src/scrGameView3D.cpp
  50. +2 −1 common src/scrGameView3D.h
@@ -1,8 +1,11 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyExample_vs2010", "emptyExample_vs2010.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyExample", "emptyExample.vcproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5837595D-ACA9-485C-8E76-729040CE4B0B} = {5837595D-ACA9-485C-8E76-729040CE4B0B}
+ EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2008\openframeworksLib.vcproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="emptyExample"
+ ProjectGUID="{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+ RootNamespace="emptyExample"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="bin"
+ IntermediateDirectory="obj\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\libs\openFrameworks;..\..\..\libs\openFrameworks\graphics;..\..\..\libs\openFrameworks\app;..\..\..\libs\openFrameworks\sound;..\..\..\libs\openFrameworks\utils;..\..\..\libs\openFrameworks\communication;..\..\..\libs\openFrameworks\video;..\..\..\libs\openFrameworks\events;..\..\..\libs\glut\include;..\..\..\libs\rtAudio\include;..\..\..\libs\quicktime\include;..\..\..\libs\freetype\include;..\..\..\libs\freetype\include\freetype2;..\..\..\libs\freeImage\include;..\..\..\libs\fmodex\include;..\..\..\libs\videoInput\include;..\..\..\libs\glee\include;..\..\..\libs\glu\include;..\..\..\libs\poco\include;..\..\..\addons"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;POCO_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openframeworksLibDebug.lib OpenGL32.lib GLu32.lib kernel32.lib setupapi.lib glut32.lib rtAudioD.lib videoInput.lib libfreetype.lib FreeImage.lib qtmlClient.lib dsound.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib GLee.lib fmodex_vc.lib glu32.lib PocoFoundationmtd.lib PocoNetmtd.lib PocoUtilmtd.lib PocoXMLmtd.lib"
+ OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\..\libs\glut\lib\vs2008;..\..\..\libs\rtAudio\lib\vs2008;..\..\..\libs\FreeImage\lib\vs2008;..\..\..\libs\freetype\lib\vs2008;..\..\..\libs\quicktime\lib\vs2008;..\..\..\libs\fmodex\lib\vs2008;..\..\..\libs\videoInput\lib\vs2008;..\..\..\libs\glee\lib\vs2008;..\..\..\libs\glu\lib\vs2008;..\..\..\libs\Poco\lib\vs2008;..\..\..\libs\openFrameworksCompiled\lib\vs2008"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames="atlthunk.lib; LIBC.lib; LIBCMT;"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(TargetDir)$(TargetName)_debugInfo.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="adding DLLs and creating data folder"
+ CommandLine="xcopy /e /i /y &quot;$(ProjectDir)..\..\..\export\vs2008\*.dll&quot; &quot;$(ProjectDir)bin&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)bin\data&quot; mkdir &quot;$(ProjectDir)bin\data&quot;&#x0D;&#x0A;"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="bin"
+ IntermediateDirectory="obj\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories="..\..\..\libs\openFrameworks;..\..\..\libs\openFrameworks\graphics;..\..\..\libs\openFrameworks\app;..\..\..\libs\openFrameworks\sound;..\..\..\libs\openFrameworks\utils;..\..\..\libs\openFrameworks\communication;..\..\..\libs\openFrameworks\video;..\..\..\libs\openFrameworks\events;..\..\..\libs\glut\include;..\..\..\libs\rtAudio\include;..\..\..\libs\quicktime\include;..\..\..\libs\freetype\include;..\..\..\libs\freetype\include\freetype2;..\..\..\libs\freeImage\include;..\..\..\libs\fmodex\include;..\..\..\libs\videoInput\include;..\..\..\libs\glee\include;..\..\..\libs\glu\include;..\..\..\libs\poco\include;..\..\..\addons"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;POCO_STATIC"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openframeworksLib.lib OpenGL32.lib GLu32.lib kernel32.lib setupapi.lib glut32.lib rtAudio.lib videoInput.lib libfreetype.lib FreeImage.lib qtmlClient.lib dsound.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib GLee.lib fmodex_vc.lib glu32.lib PocoFoundationmt.lib PocoNetmt.lib PocoUtilmt.lib PocoXMLmt.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\libs\glut\lib\vs2008;..\..\..\libs\rtAudio\lib\vs2008;..\..\..\libs\FreeImage\lib\vs2008;..\..\..\libs\freetype\lib\vs2008;..\..\..\libs\quicktime\lib\vs2008;..\..\..\libs\fmodex\lib\vs2008;..\..\..\libs\videoInput\lib\vs2008;..\..\..\libs\glee\lib\vs2008;..\..\..\libs\glu\lib\vs2008;..\..\..\libs\Poco\lib\vs2008;..\..\..\libs\openFrameworksCompiled\lib\vs2008"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="atlthunk.lib; LIBC.lib; LIBCMT;"
+ GenerateDebugInformation="false"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="adding DLLs and creating data folder"
+ CommandLine="xcopy /e /i /y &quot;$(ProjectDir)\..\..\..\export\vs2008\*.dll&quot; &quot;$(ProjectDir)\bin&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)\bin\data&quot; mkdir &quot;$(ProjectDir)\bin\data&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="src"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\src\main.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\testApp.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\testApp.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+ ProjectType="Visual C++"
+ Version="8.00"
+ ShowAllFiles="false"
+ >
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory="bin"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory="bin"
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioUserFile>
Oops, something went wrong.

0 comments on commit 6606435

Please sign in to comment.