Permalink
Browse files

Merge branch 'master' of github.com:ofTheo/ofxKinect

  • Loading branch information...
2 parents e4ab27d + 6e7db7e commit ad4168f67ad37c0e991f7b2ec902e7c0d38ff03e @danomatika danomatika committed Jul 30, 2012
View
@@ -75,7 +75,7 @@ Xcode4: Open the Xcode project, select the "ofxKinectExample" scheme, and hit "R
Install the libusb-1.0 library. On Ubuntu, you can do this with:
<pre>
-sudo apt-get install libusb1.0-0-dev
+sudo apt-get install libusb-1.0-0-dev
</pre>
Open the Code::Blocks .cbp and hit F9 to build. Optionally, you can build the example with the Makefile.
@@ -105,6 +105,8 @@ libs/libusb/win/inf
You may need to manually update each driver individually if you've plugged it in before. ofxKinect will not work if the drivers are not installed.
+**NOTE**: You cannot use the OpenNI drivers and the libfreenect drivers included with ofxKinect at the same time. You must manually uninstall one and reinstall the other in the Device Manager. Sorry, that's just how it is. :P
+
How to Create a New ofxKinect Project
-----------------------------------------
@@ -227,6 +229,8 @@ ofxKinect supports multiple kinects, however stability is based on the bandwidth
kinect.init(false, false); // disable video image (faster fps)
</pre>
+For Kinect4Windows, Microsoft states that only 2 Kinects can be supported on the same USB bus. In practice on OSX, this proves to be the case as, even with the RGB images disabled, there are transfer errors using ofxKinect and 3 Kinects simultaneously. If you need to support many Kinects, you will probably need to add extra USB controllers to your machine …
+
Developing ofxKinect
--------------------
@@ -62,7 +62,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>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;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_calib3d220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_contrib220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_core220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_features2d220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_flann220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_gpu220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_highgui220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_imgproc220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_legacy220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ml220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_objdetect220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ts220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_video220d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_lapackd.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\zlibd.lib;..\..\..\addons\ofxKinect\libs\libfreenect\lib\vs2010\freenect.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>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;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_calib3d231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_contrib231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_core231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_features2d231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_flann231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_gpu231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_haartraining_engined.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_highgui231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_imgproc231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_legacy231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ml231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_objdetect231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_video231d.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\zlibd.lib;..\..\..\addons\ofxKinect\libs\libfreenect\lib\vs2010\freenect.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<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\glew\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxKinect\libs\libfreenect\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -95,7 +95,7 @@ xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxKinect\libs\libfreenect\lib\vs20
</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>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;Vfw32.lib;comctl32.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;Ws2_32.lib;tess2.lib;..\..\..\addons\ofxOsc\libs\oscpack\lib\vs2010\oscpack.lib;..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs2010\assimp.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_calib3d220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_contrib220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_core220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_features2d220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_flann220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_gpu220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_highgui220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_imgproc220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_legacy220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ml220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_objdetect220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ts220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_video220.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_lapack.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\zlib.lib;freenect.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>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;Vfw32.lib;comctl32.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;Ws2_32.lib;tess2.lib;..\..\..\addons\ofxOsc\libs\oscpack\lib\vs2010\oscpack.lib;..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs2010\assimp.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_calib3d231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_contrib231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_core231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_features2d231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_flann231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_gpu231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_haartraining_engine.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_highgui231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_imgproc231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_legacy231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_ml231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_objdetect231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\opencv_video231.lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010\zlib.lib;freenect.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\libs\cairo\lib\vs2010;..\..\..\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\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxKinect\libs\libfreenect\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -174,6 +174,7 @@
30F2B6731415565D00597A7B /* ofxCvShortImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxCvShortImage.cpp; sourceTree = "<group>"; };
30F2B6741415565D00597A7B /* ofxCvShortImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxCvShortImage.h; sourceTree = "<group>"; };
30F2B6751415565D00597A7B /* ofxOpenCv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxOpenCv.h; sourceTree = "<group>"; };
+ 9D03FCC9156DA82000292683 /* loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = loader.h; sourceTree = "<group>"; };
BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
@@ -248,6 +249,7 @@
children = (
27975048144D1F9600BF8888 /* registration.h */,
27974FD5144D1A5A00BF8888 /* cameras.c */,
+ 9D03FCC9156DA82000292683 /* loader.h */,
27974FD6144D1A5A00BF8888 /* cameras.h */,
27974FD7144D1A5A00BF8888 /* core.c */,
27974FD8144D1A5A00BF8888 /* freenect_internal.h */,
@@ -791,6 +793,7 @@
"-D__MACOSX_CORE__",
"-lpthread",
);
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -820,6 +823,7 @@
"-D__MACOSX_CORE__",
"-lpthread",
);
+ SDKROOT = macosx10.6;
};
name = Release;
};
@@ -93,20 +93,20 @@
<Add directory="..\..\..\addons\ofxKinect\libs\libfreenect" />
</Compiler>
<Linker>
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_legacy220.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_legacy231.a" />
<Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_haartraining_engine.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_features2d220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_calib3d220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_objdetect220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_imgproc220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_video220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_highgui220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_ml220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_core220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_lapack.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_flann220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_contrib220.a" />
- <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_gpu220.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_calib3d231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_features2d231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_objdetect231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_imgproc231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_video231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_highgui231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_ml231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_core231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_flann231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_contrib231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_gpu231.a" />
+ <Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libopencv_ts231.a" />
<Add option="../../../addons/ofxOpenCv/libs/opencv/lib/win_cb/libzlib.a" />
<Add option="../../../addons/ofxKinect/libs/libfreenect/lib/vs2010/freenect.lib" />
<Add library="..\..\..\libs\FreeImage\lib\win_cb\FreeImage.lib" />
@@ -120,10 +120,10 @@
<Add library="..\..\..\libs\fmodex\lib\win_cb\libfmodex.a" />
<Add library="..\..\..\libs\glew\lib\win_cb\glew32s.lib" />
<Add library="..\..\..\libs\glu\lib\win_cb\glu32.lib" />
- <Add library="..\..\..\libs\poco\lib\win_cb\libPocoNetmt.a" />
- <Add library="..\..\..\libs\poco\lib\win_cb\libPocoUtilmt.a" />
- <Add library="..\..\..\libs\poco\lib\win_cb\libPocoXMLmt.a" />
- <Add library="..\..\..\libs\poco\lib\win_cb\libPocoFoundationmt.a" />
+ <Add library="..\..\..\libs\poco\lib\win_cb\libPocoNet.a" />
+ <Add library="..\..\..\libs\poco\lib\win_cb\libPocoUtil.a" />
+ <Add library="..\..\..\libs\poco\lib\win_cb\libPocoXML.a" />
+ <Add library="..\..\..\libs\poco\lib\win_cb\libPocoFoundation.a" />
<Add library="..\..\..\libs\tess2\lib\win_cb\libtess2.a" />
<Add library="opengl32" />
<Add library="gdi32" />
View
@@ -11,7 +11,10 @@ void testApp::setup() {
kinect.init();
//kinect.init(true); // shows infrared instead of RGB video image
//kinect.init(false, false); // disable video image (faster fps)
- kinect.open();
+
+ kinect.open(); // opens first available kinect
+ //kinect.open(1); // open a kinect by id, starting with 0 (sorted by serial # lexicographically))
+ //kinect.open("A00362A08602047A"); // open a kinect using it's unique serial #
#ifdef USE_TWO_KINECTS
kinect2.init();
Oops, something went wrong.

0 comments on commit ad4168f

Please sign in to comment.