diff --git a/.gitignore b/.gitignore index 8e6ec8f..4e56679 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,13 @@ build/ /example/obj/ /example/build/ example/*.layout + +examples/bin +examples/ipch +examples/obj + +*.opensdf +*.sdf + +*.sdf +*.suo \ No newline at end of file diff --git a/examples/openNI-demoAllFeatures/Project.xcconfig b/examples/Project.xcconfig old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/Project.xcconfig rename to examples/Project.xcconfig diff --git a/examples/openNI-demoAllFeatures/makefile b/examples/makefile old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/makefile rename to examples/makefile diff --git a/examples/openNI-demoAllFeatures/openFrameworks-Info.plist b/examples/openFrameworks-Info.plist old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openFrameworks-Info.plist rename to examples/openFrameworks-Info.plist diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/FeatureExtraction.ini b/examples/openNI-demoAllFeatures/bin/data/openni/config/FeatureExtraction.ini deleted file mode 100755 index 42032cf..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/FeatureExtraction.ini +++ /dev/null @@ -1,7 +0,0 @@ -[FeatureExtractor] -;AutoBodyParameters=0 -;AutoCalibrate=0 - -[Generator] -;Preference=Quality -;Preference=Speed \ No newline at end of file diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/GlobalDefaultsKinect.ini b/examples/openNI-demoAllFeatures/bin/data/openni/config/GlobalDefaultsKinect.ini deleted file mode 100755 index a21b748..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/GlobalDefaultsKinect.ini +++ /dev/null @@ -1,186 +0,0 @@ -[Core] -; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -LogLevel=3 -; leave empty for nothing (default). ALL - all masks -LogMasks=ALL -; 0 - No (default), 1 - Yes -;LogWriteToConsole=1 -; 0 - No (default), 1 - Yes -LogWriteToFile=1 -; 0 - No (default), 1 - Yes -;LogWriteLineInfo=0 -; leave empty for nothing (default). ALL - all masks -;DumpMasks= - -; Number of milliseconds between profiling logs. 0 - Off (default) -;ProfilingInterval=1000 - -;---------------- Server Default Configuration ------------------- -[Server] -; Use a server to access sensor. 0 - No (single application), 1 - Yes (multiple applications, default) -;EnableMultiProcess=0 - -; The timeout in which a server goes down if no client is connected, in milliseconds -;ServerNoClientsTimeout=10000 - -; The number of shared memory buffers per stream (default is 6). -; This value affects the number of concurrent clients to the server: (NumberOfBuffers = clients + 3) -;NumberOfBuffers=6 - -;---------------- Sensor Default Configuration ------------------- -[Device] -; Mirroring. 0 - Off (default), 1 - On -;Mirror=1 - -; FrameSync. 0 - Off (default), 1 - On -;FrameSync=1 - -; Stream Data Timestamps. 0 - milliseconds, 1 - microseconds (default) -;HighResTimestamps=1 - -; A filter for the firmware log. Default is determined by firmware. -;FirmwareLogFilter=0 - -; Automatic firmare log retrieval. 0 - Off (default), or the number of milliseconds between log retrievals operations. -;FirmwareLogInterval=1000 - -; Print firmware log to console when automatic firmware log retrieval is on. 0 - Off (default), 1 - On -;FirmwareLogPrint=1 - -; Automatic firmware CPU statistics retrieval. 0 - Off (default), or the number of milliseconds between CPU retrievals operations. -;FirmwareCPUInterval=1000 - -; Is APC enabled. 0 - Off, 1 - On (default) -;APCEnabled=1 - -; USB interface to be used. 0 - FW Default (default), 1 - ISO endpoints, 2 - BULK endpoints -;UsbInterface=2 - -[Depth] -; Output format. 0 - Shift values, 1 - 12-bit depth values (default) -;OutputFormat=1 - -; Is stream mirrored. 0 - Off, 1 - On -;Mirror=1 - -; 0 - QVGA (default), 1 - VGA -;Resolution=1 - -; Frames per second (default is 30) -;FPS=30 - -; Min depth cutoff. 0-10000 mm (default is 0) -;MinDepthValue=0 - -; Max depth cutoff. 0-10000 mm (default is 10000) -;MaxDepthValue=10000 - -; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression, 3 - Packed 11-bit (default) -;InputFormat=1 - -; Registration. 0 - Off (default), 1 - On -;Registration=1 - -; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software -;RegistrationType=0 - -; Hole Filler. 0 - Off, 1 - On (default) -;HoleFilter=1 - -; White Balance. 0 - Off, 1 - On (default) -;WhiteBalancedEnabled=1 - -; Gain. 0-50 (0 - Auto, 1 - Min., 50 - Max.). Default value is set by firmware. -;Gain=0 - -; GMC Mode. 0 - Off, 1 - On (default) -;GMCMode=0 - -; GMC Debug. 0 - Off (default), 1 - On -;GMCDebug=1 - -; Depth Auto Gain Region-of-Interest. Default values are set by firmware. -;DepthAGCBin0MinDepth=500 -;DepthAGCBin0MaxDepth=800 -;DepthAGCBin1MinDepth=1500 -;DepthAGCBin1MaxDepth=1800 -;DepthAGCBin2MinDepth=2500 -;DepthAGCBin2MaxDepth=2800 -;DepthAGCBin3MinDepth=3500 -;DepthAGCBin3MaxDepth=3800 - -; Wavelength Correction Mechanism. 0 - Off (default), 1 - On -;WavelengthCorrection=1 - -; Wavelength Correction debug info. 0 - Off (default), 1 - On -;WavelengthCorrectionDebug=1 - -; Cropping section -[Depth.Cropping] -;OffsetX=0 -;OffsetY=0 -;SizeX=320 -;SizeY=240 -;Enabled=1 - -[Image] -; Output format. 2 - Gray8 (2.0 MP only), 4 - YUV422, 5 - RGB24 (default) -;OutputFormat=5 - -; Is stream mirrored. 0 - Off, 1 - On -;Mirror=1 - -; 0 - QVGA (default), 1 - VGA, 2- SXGA (1.3MP) 3 - UXGA (2.0MP) -;Resolution=1 - -; Frames per second (default is 30) -;FPS=30 - -; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422, 2 - Jpeg, 5 - Uncompressed YUV422 (default), 6 - Uncompressed 8-bit BAYER -;InputFormat=5 - -; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz. -;Flicker=50 - -; Image quality when using Jpeg. 1-10 (1 - Lowest, 10 - Highest (default)) -;Quality=10 - -; Cropping section -[Image.Cropping] -;OffsetX=0 -;OffsetY=0 -;SizeX=320 -;SizeY=240 -;Enabled=1 - -[IR] -; Output format. 3 - Grayscale 16-bit, 5 - RGB24 (default) -;OutputFormat=3 - -; Is stream mirrored. 0 - Off, 1 - On -;Mirror=1 - -; 0 - QVGA (default), 1 - VGA, 2 - SXGA(1.3MP) -;Resolution=1 - -; Frames per second (default is 30) -;FPS=30 - -; Cropping section -[SensorIR.Cropping] -;OffsetX=0 -;OffsetY=0 -;SizeX=320 -;SizeY=240 -;Enabled=1 - -[Audio] -; Sample Rate. 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 (default) -;SampleRate=48000 - -; Volume. 0-49 (0 - Mute, 1 - Min., 49 - Max.). Default is 12. -;LeftChannelVolume=12 -;RightChannelVolume=12 - -; Number of channels. 1, 2 (default) -;NumOfChannels=2 diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/Nite.ini b/examples/openNI-demoAllFeatures/bin/data/openni/config/Nite.ini deleted file mode 100755 index 146bfe0..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/Nite.ini +++ /dev/null @@ -1,3 +0,0 @@ -[HandTrackerManager] -;AllowMultipleHands=1 -;TrackAdditionalHands=1 diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/SamplesConfig.xml b/examples/openNI-demoAllFeatures/bin/data/openni/config/SamplesConfig.xml deleted file mode 100755 index e4f1c91..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/SamplesConfig.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/h.dat b/examples/openNI-demoAllFeatures/bin/data/openni/config/h.dat deleted file mode 100755 index cfc3200..0000000 Binary files a/examples/openNI-demoAllFeatures/bin/data/openni/config/h.dat and /dev/null differ diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/licenses.xml b/examples/openNI-demoAllFeatures/bin/data/openni/config/licenses.xml deleted file mode 100755 index e5967fd..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/licenses.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/modules.xml b/examples/openNI-demoAllFeatures/bin/data/openni/config/modules.xml deleted file mode 100755 index b0ee8d9..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/ofxopenni_config.xml b/examples/openNI-demoAllFeatures/bin/data/openni/config/ofxopenni_config.xml deleted file mode 100755 index 17413ac..0000000 --- a/examples/openNI-demoAllFeatures/bin/data/openni/config/ofxopenni_config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/openNI-demoAllFeatures/bin/data/openni/config/s.dat b/examples/openNI-demoAllFeatures/bin/data/openni/config/s.dat deleted file mode 100755 index 60a30fd..0000000 Binary files a/examples/openNI-demoAllFeatures/bin/data/openni/config/s.dat and /dev/null differ diff --git a/examples/openNI-demoAllFeatures/openNISample007.sdf b/examples/openNI-demoAllFeatures/openNISample007.sdf deleted file mode 100755 index 5d93606..0000000 Binary files a/examples/openNI-demoAllFeatures/openNISample007.sdf and /dev/null differ diff --git a/examples/openNI-demoAllFeatures/openNISample007.suo b/examples/openNI-demoAllFeatures/openNISample007.suo deleted file mode 100755 index 64fbbf3..0000000 Binary files a/examples/openNI-demoAllFeatures/openNISample007.suo and /dev/null differ diff --git a/examples/openNI-demoAllFeatures/openNISample007.cbp b/examples/openNISample007.cbp old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.cbp rename to examples/openNISample007.cbp diff --git a/examples/openNI-demoAllFeatures/openNISample007.depend b/examples/openNISample007.depend old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.depend rename to examples/openNISample007.depend diff --git a/examples/openNI-demoAllFeatures/openNISample007.layout b/examples/openNISample007.layout old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.layout rename to examples/openNISample007.layout diff --git a/examples/openNI-demoAllFeatures/openNISample007.sln b/examples/openNISample007.sln old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.sln rename to examples/openNISample007.sln diff --git a/examples/openNI-demoAllFeatures/openNISample007.vcxproj b/examples/openNISample007.vcxproj old mode 100755 new mode 100644 similarity index 97% rename from examples/openNI-demoAllFeatures/openNISample007.vcxproj rename to examples/openNISample007.vcxproj index 5d508f2..0d12c89 --- a/examples/openNI-demoAllFeatures/openNISample007.vcxproj +++ b/examples/openNISample007.vcxproj @@ -66,7 +66,7 @@ openframeworksLibDebug.lib;cairo-static.lib;pixman-1.lib;msimg32.lib;OpenGL32.lib;GLu32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.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;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmdd.lib;PocoNetmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;Ws2_32.lib;tess2.lib;OpenNI.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;bin\data\openni\lib;%(AdditionalLibraryDirectories) + ..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openni\lib\vs2010;%(AdditionalLibraryDirectories) atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries) true $(TargetDir)$(TargetName)_debugInfo.pdb @@ -97,7 +97,7 @@ if not exist "$(ProjectDir)bin\data" mkdir "$(ProjectDir)bin\data" openframeworksLib.lib;cairo-static.lib;pixman-1.lib;msimg32.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;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;tess2.lib;OpenNI.lib;%(AdditionalDependencies) - ..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;bin\data\openni\lib;%(AdditionalLibraryDirectories) + ..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openni\lib\vs2010;%(AdditionalLibraryDirectories) false atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries) false diff --git a/examples/openNI-demoAllFeatures/openNISample007.vcxproj.filters b/examples/openNISample007.vcxproj.filters old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.vcxproj.filters rename to examples/openNISample007.vcxproj.filters diff --git a/examples/openNI-demoAllFeatures/openNISample007.vcxproj.user b/examples/openNISample007.vcxproj.user old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.vcxproj.user rename to examples/openNISample007.vcxproj.user diff --git a/examples/openNI-demoAllFeatures/openNISample007.workspace b/examples/openNISample007.workspace old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007.workspace rename to examples/openNISample007.workspace diff --git a/examples/openNI-demoAllFeatures/openNISample007Linux64.cbp b/examples/openNISample007Linux64.cbp old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007Linux64.cbp rename to examples/openNISample007Linux64.cbp diff --git a/examples/openNI-demoAllFeatures/openNISample007Linux64.workspace b/examples/openNISample007Linux64.workspace old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNISample007Linux64.workspace rename to examples/openNISample007Linux64.workspace diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.pbxproj b/examples/openNiSample007.xcodeproj/project.pbxproj old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.pbxproj rename to examples/openNiSample007.xcodeproj/project.pbxproj diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples/openNiSample007.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to examples/openNiSample007.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/UserInterfaceState.xcuserstate b/examples/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/UserInterfaceState.xcuserstate old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/UserInterfaceState.xcuserstate rename to examples/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/WorkspaceSettings.xcsettings b/examples/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/WorkspaceSettings.xcsettings old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/WorkspaceSettings.xcsettings rename to examples/openNiSample007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/openNISample007.xcscheme b/examples/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/openNISample007.xcscheme old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/openNISample007.xcscheme rename to examples/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/openNISample007.xcscheme diff --git a/examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/xcschememanagement.plist b/examples/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/xcschememanagement.plist old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/xcschememanagement.plist rename to examples/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/examples/openNI-demoAllFeatures/src/main.cpp b/examples/src/main.cpp old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/src/main.cpp rename to examples/src/main.cpp diff --git a/examples/openNI-demoAllFeatures/src/testApp.cpp b/examples/src/testApp.cpp old mode 100755 new mode 100644 similarity index 99% rename from examples/openNI-demoAllFeatures/src/testApp.cpp rename to examples/src/testApp.cpp index 7553068..8d40bc3 --- a/examples/openNI-demoAllFeatures/src/testApp.cpp +++ b/examples/src/testApp.cpp @@ -12,7 +12,7 @@ void testApp::setup() { isCPBkgnd = true; isMasking = true; - nearThreshold = 500; + nearThreshold = 400; farThreshold = 1000; filterFactor = 0.1f; diff --git a/examples/openNI-demoAllFeatures/src/testApp.h b/examples/src/testApp.h old mode 100755 new mode 100644 similarity index 100% rename from examples/openNI-demoAllFeatures/src/testApp.h rename to examples/src/testApp.h