Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
Matthew Gingold
Matthew Gingold committed Jan 9, 2012
2 parents 1caecbd + a1f5bba commit e3d421eb7a77d295e8a58a62399d80f09cf720c2
Showing with 19,425 additions and 12,552 deletions.
  1. BIN .DS_Store
  2. +674 −0 GPL.txt
  3. +165 −0 LGPL.txt
  4. +28 −0 LICENCE.txt
  5. +133 −109 README.markdown
  6. +0 −535 example/OpenNi.cbp
  7. +0 −7 example/OpenNi.workspace
  8. +0 −16 example/bin/data/openni/config/FeatureExtraction.ini
  9. BIN example/bin/data/openni/config/h.dat
  10. +0 −8 example/bin/data/openni/config/modules.xml
  11. BIN example/bin/data/openni/config/s.dat
  12. +0 −255 example/openNISample.cbp
  13. +0 −980 example/openNISample.depend
  14. +0 −4 example/openNISample.layout
  15. +0 −270 example/openNISampleLinux64.cbp
  16. +0 −7 example/openNISampleLinux64.workspace
  17. BIN example/openNiSample.opensdf
  18. BIN example/openNiSample.suo
  19. +0 −1,446 example/openNiSample.xcodeproj/gameover.mode1v3
  20. +0 −1,281 example/openNiSample.xcodeproj/gameover.pbxuser
  21. +0 −1,373 example/openNiSample.xcodeproj/project.pbxproj
  22. +0 −1,403 example/openNiSample007.xcodeproj/gameover.mode1v3
  23. +0 −197 example/openNiSample007.xcodeproj/gameover.pbxuser
  24. 0 {example → examples/openNI-demoAllFeatures}/Project.xcconfig
  25. +7 −0 examples/openNI-demoAllFeatures/bin/data/openni/config/FeatureExtraction.ini
  26. +7 −9 ...balDefaults.ini → examples/openNI-demoAllFeatures/bin/data/openni/config/GlobalDefaultsKinect.ini
  27. 0 {example → examples/openNI-demoAllFeatures}/bin/data/openni/config/Nite.ini
  28. +31 −0 examples/openNI-demoAllFeatures/bin/data/openni/config/SamplesConfig.xml
  29. BIN examples/openNI-demoAllFeatures/bin/data/openni/config/h.dat
  30. +3 −0 examples/openNI-demoAllFeatures/bin/data/openni/config/licenses.xml
  31. +10 −0 examples/openNI-demoAllFeatures/bin/data/openni/config/modules.xml
  32. 0 {example → examples/openNI-demoAllFeatures}/bin/data/openni/config/ofxopenni_config.xml
  33. BIN examples/openNI-demoAllFeatures/bin/data/openni/config/s.dat
  34. 0 {example → examples/openNI-demoAllFeatures}/makefile
  35. 0 {example → examples/openNI-demoAllFeatures}/openFrameworks-Info.plist
  36. +553 −0 examples/openNI-demoAllFeatures/openNISample007.cbp
  37. +1,408 −0 examples/openNI-demoAllFeatures/openNISample007.depend
  38. +19 −0 examples/openNI-demoAllFeatures/openNISample007.layout
  39. BIN example/openNiSample.sdf → examples/openNI-demoAllFeatures/openNISample007.sdf
  40. +25 −25 example/openNiSample.sln → examples/openNI-demoAllFeatures/openNISample007.sln
  41. BIN examples/openNI-demoAllFeatures/openNISample007.suo
  42. +287 −263 example/openNiSample.vcxproj → examples/openNI-demoAllFeatures/openNISample007.vcxproj
  43. +479 −419 ...le/openNiSample.vcxproj.filters → examples/openNI-demoAllFeatures/openNISample007.vcxproj.filters
  44. +10 −10 example/openNiSample.vcxproj.user → examples/openNI-demoAllFeatures/openNISample007.vcxproj.user
  45. +1 −1 example/openNISample.workspace → examples/openNI-demoAllFeatures/openNISample007.workspace
  46. +213 −0 examples/openNI-demoAllFeatures/openNISample007Linux64.cbp
  47. +9 −0 examples/openNI-demoAllFeatures/openNISample007Linux64.workspace
  48. +420 −400 {example → examples/openNI-demoAllFeatures}/openNiSample007.xcodeproj/project.pbxproj
  49. +7 −0 ...les/openNI-demoAllFeatures/openNiSample007.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  50. +8,960 −0 ...e007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/UserInterfaceState.xcuserstate
  51. +8 −0 ...ple007.xcodeproj/project.xcworkspace/xcuserdata/gameover.xcuserdatad/WorkspaceSettings.xcsettings
  52. +76 −0 ...ures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/openNISample007.xcscheme
  53. +22 −0 ...ures/openNiSample007.xcodeproj/xcuserdata/gameover.xcuserdatad/xcschemes/xcschememanagement.plist
  54. 0 {example → examples/openNI-demoAllFeatures}/src/main.cpp
  55. +4 −3 {example → examples/openNI-demoAllFeatures}/src/testApp.cpp
  56. 0 {example → examples/openNI-demoAllFeatures}/src/testApp.h
  57. 0 include/libusb/libusb.h
  58. +1 −5 include/nite/XnCommon.h
  59. 0 include/nite/XnV3DVector.h
  60. 0 include/nite/XnVActivationMessage.h
  61. 0 include/nite/XnVBroadcaster.h
  62. 0 include/nite/XnVCCMessage.h
  63. 0 include/nite/XnVCircle.h
  64. +5 −5 include/nite/XnVCircleDetector.h
  65. +7 −6 include/nite/XnVClickableVirtualPlane.h
  66. 0 include/nite/XnVComplexMessage.h
  67. 0 include/nite/XnVDepthControl.h
  68. 0 include/nite/XnVDepthGenerator.h
  69. 0 include/nite/XnVDepthMessage.h
  70. 0 include/nite/XnVDeviceControl.h
  71. 0 include/nite/XnVDeviceFilter.h
  72. 0 include/nite/XnVDeviceGenerator.h
  73. 0 include/nite/XnVDeviceMessage.h
  74. 0 include/nite/XnVDirection.h
  75. 0 include/nite/XnVFilter.h
  76. +3 −2 include/nite/XnVFlowRouter.h
  77. +5 −5 include/nite/XnVGesture.h
  78. 0 include/nite/XnVHandPointContext.h
  79. 0 include/nite/XnVHandle.h
  80. 0 include/nite/XnVImageGenerator.h
  81. 0 include/nite/XnVImageMessage.h
  82. 0 include/nite/XnVMathCommon.h
  83. 0 include/nite/XnVMessage.h
  84. +5 −6 include/nite/XnVMessageGenerator.h
  85. +8 −7 include/nite/XnVMessageListener.h
  86. +4 −4 include/nite/XnVMessageMux.h
  87. +2 −2 include/nite/XnVMultiItemHysteresis1D.h
  88. +2 −3 include/nite/XnVMultiItemHysteresis2D.h
  89. +1 −2 include/nite/XnVMultiProcessFlowClient.h
  90. +2 −1 include/nite/XnVMultiProcessFlowServer.h
  91. +46 −9 include/nite/XnVMultipleHands.h
  92. 0 include/nite/XnVNite.h
  93. 0 include/nite/XnVNiteControls.h
  94. 0 include/nite/XnVNiteDefs.h
  95. +0 −33 include/nite/XnVNiteEvents.h
  96. 0 include/nite/XnVNiteFramework.h
  97. 0 include/nite/XnVNiteLog.h
  98. 0 include/nite/XnVNiteStatus.h
  99. +3 −3 include/nite/XnVNiteVersion.h
  100. +11 −2 include/nite/XnVPointArea.h
  101. +16 −15 include/nite/XnVPointControl.h
  102. +4 −12 include/nite/XnVPointDenoiser.h
  103. 0 include/nite/XnVPointFilter.h
  104. 0 include/nite/XnVPointMessage.h
  105. +3 −1 include/nite/XnVPointTracker.h
  106. +4 −3 include/nite/XnVPushDetector.h
  107. +10 −4 include/nite/XnVSelectableSlider1D.h
  108. +10 −7 include/nite/XnVSelectableSlider2D.h
  109. 0 include/nite/XnVSessionGenerator.h
  110. +0 −1 include/nite/XnVSessionListener.h
  111. +5 −13 include/nite/XnVSessionManager.h
  112. 0 include/nite/XnVSessionMessage.h
  113. +4 −3 include/nite/XnVSlider1D.h
  114. +4 −3 include/nite/XnVSlider2D.h
  115. +3 −4 include/nite/XnVSlider3D.h
  116. +10 −11 include/nite/XnVSteadyDetector.h
  117. +12 −5 include/nite/XnVSwipeDetector.h
  118. +2 −2 include/nite/XnVVirtualCoordinates.h
  119. +2 −1 include/nite/XnVWaveDetector.h
  120. +1 −1 include/openni/ARC/XnOSARC.h
  121. +7 −3 include/openni/ARC/XnPlatformARC.h
  122. +49 −0 include/openni/Android-Arm/XnPlatformAndroid-Arm.h
  123. +0 −69 include/openni/Development.txt
  124. +0 −1,572 include/openni/Documentation.txt
  125. +1 −1 include/openni/IXnNodeAllocator.h
  126. +1 −1 include/openni/Linux-Arm/XnPlatformLinux-Arm.h
  127. +4 −13 include/openni/Linux-x86/XnOSLinux-x86.h
  128. +21 −14 include/openni/Linux-x86/XnPlatformLinux-x86.h
  129. +1 −1 include/openni/MacOSX/XnPlatformMacOSX.h
  130. +22 −51 include/openni/Win32/XnOSWin32.h
  131. +37 −20 include/openni/Win32/XnPlatformWin32.h
  132. +270 −0 include/openni/Win32/usb100.h
  133. +1 −1 include/openni/XnAlgorithms.h
  134. +8 −8 include/openni/XnArray.h
  135. +3 −3 include/openni/XnBaseNode.h
  136. +16 −1 include/openni/XnBitSet.h
  137. +1 −1 include/openni/XnCallback.h
  138. +1 −1 include/openni/XnCodecIDs.h
  139. +140 −33 include/openni/XnContext.h
  140. +1,514 −425 include/openni/XnCppWrapper.h
  141. +4 −1 include/openni/XnDataTypes.h
  142. +80 −0 include/openni/XnDerivedCast.h
  143. +202 −0 include/openni/XnDump.h
  144. +127 −0 include/openni/XnDumpWriters.h
  145. +11 −11 include/openni/XnEnumerationErrors.h
  146. +39 −31 include/openni/XnEvent.h
  147. +5 −5 include/openni/XnFPSCalculator.h
  148. +1 −1 include/openni/XnGeneralBuffer.h
  149. +1 −1 include/openni/XnHash.h
  150. +1 −1 include/openni/XnInternalDefs.h
  151. +4 −4 include/openni/XnLicensing.h
  152. +6 −1 include/openni/XnList.h
  153. +338 −232 include/openni/XnLog.h
  154. +80 −0 include/openni/XnLogTypes.h
  155. +128 −0 include/openni/XnLogWriterBase.h
  156. +11 −1 include/openni/XnMacros.h
  157. +475 −213 include/openni/XnModuleCFunctions.h
  158. +103 −1 include/openni/XnModuleCppInterface.h
  159. +27 −28 include/openni/XnModuleCppRegistratration.h
  160. +61 −1 include/openni/XnModuleInterface.h
  161. +1 −1 include/openni/XnNode.h
  162. +1 −1 include/openni/XnNodeAllocator.h
  163. +176 −159 include/openni/XnOS.h
  164. +19 −12 include/openni/XnOSCpp.h
  165. +18 −18 include/openni/XnOSMemory.h
  166. +17 −15 include/openni/XnOSStrings.h
  167. +1 −1 include/openni/XnOpenNI.h
  168. +17 −12 include/openni/XnPlatform.h
  169. +485 −215 include/openni/XnPrdNode.h
  170. +32 −9 include/openni/XnPrdNodeInfo.h
  171. +17 −17 include/openni/XnPrdNodeInfoList.h
  172. +7 −7 include/openni/XnProfiling.h
  173. +1 −1 include/openni/XnPropNames.h
  174. +22 −14 include/openni/XnQueries.h
  175. +2 −1 include/openni/XnQueue.h
  176. +6 −6 include/openni/XnScheduler.h
  177. +1 −1 include/openni/XnStack.h
  178. +6 −6 include/openni/XnStatus.h
  179. +9 −1 include/openni/XnStatusCodes.h
  180. +2 −2 include/openni/XnStatusRegister.h
  181. +2 −10 include/openni/XnStringsHash.h
  182. +2 −1 include/openni/XnThreadSafeQueue.h
  183. +126 −5 include/openni/XnTypes.h
  184. +29 −29 include/openni/XnUSB.h
  185. +108 −0 include/openni/XnUSBDevice.h
  186. +50 −50 include/openni/XnUtils.h
  187. +4 −4 include/openni/XnVersion.h
  188. BIN mac/.DS_Store
  189. BIN mac/copy_to_data_openni_path/lib/XnVNite.net_1_3_1.dll
  190. 0 mac/copy_to_data_openni_path/lib/change_exec_paths.sh
  191. BIN mac/copy_to_data_openni_path/lib/libOpenNI.dylib
  192. BIN mac/copy_to_data_openni_path/lib/libXnCore.dylib
  193. BIN mac/copy_to_data_openni_path/lib/libXnDDK.dylib
  194. BIN mac/copy_to_data_openni_path/lib/libXnDeviceFile.dylib
  195. BIN mac/copy_to_data_openni_path/lib/libXnDeviceSensorV2KM.dylib
  196. BIN mac/copy_to_data_openni_path/lib/libXnFormats.dylib
  197. BIN mac/copy_to_data_openni_path/lib/libXnVCNITE_1_3_1.dylib
  198. BIN mac/copy_to_data_openni_path/lib/libXnVCNITE_1_5_2.dylib
  199. BIN mac/copy_to_data_openni_path/lib/libXnVFeatures_1_3_1.dylib
  200. BIN mac/copy_to_data_openni_path/lib/libXnVFeatures_1_5_2.dylib
  201. BIN mac/copy_to_data_openni_path/lib/libXnVHandGenerator_1_3_1.dylib
  202. BIN mac/copy_to_data_openni_path/lib/libXnVHandGenerator_1_5_2.dylib
  203. BIN mac/copy_to_data_openni_path/lib/libXnVNite_1_3_1.dylib
  204. BIN mac/copy_to_data_openni_path/lib/libXnVNite_1_5_2.dylib
  205. BIN mac/copy_to_data_openni_path/lib/libnimCodecs.dylib
  206. BIN mac/copy_to_data_openni_path/lib/libnimMockNodes.dylib
  207. BIN mac/copy_to_data_openni_path/lib/libnimRecorder.dylib
  208. BIN mac/copy_to_data_openni_path/lib/libusb-1.0.0.dylib
  209. +29 −0 src/ofxDepthGenerator.cpp
  210. +29 −0 src/ofxDepthGenerator.h
  211. +29 −0 src/ofxGestureGenerator.cpp
  212. +29 −0 src/ofxGestureGenerator.h
  213. +29 −0 src/ofxHandGenerator.cpp
  214. +29 −0 src/ofxHandGenerator.h
  215. +35 −1 src/ofxHardwareDriver.cpp
  216. +35 −1 src/ofxHardwareDriver.h
  217. +29 −0 src/ofxIRGenerator.cpp
  218. +29 −0 src/ofxIRGenerator.h
  219. +29 −0 src/ofxImageGenerator.cpp
  220. +29 −0 src/ofxImageGenerator.h
  221. +29 −0 src/ofxOpenNI.h
  222. +30 −0 src/ofxOpenNIContext.cpp
  223. +29 −0 src/ofxOpenNIContext.h
  224. +29 −0 src/ofxOpenNIMacros.h
  225. +29 −0 src/ofxOpenNIRecorder.cpp
  226. +29 −0 src/ofxOpenNIRecorder.h
  227. +29 −0 src/ofxTrackedHand.cpp
  228. +29 −0 src/ofxTrackedHand.h
  229. +29 −0 src/ofxTrackedUser.cpp
  230. +29 −0 src/ofxTrackedUser.h
  231. +29 −0 src/ofxUserGenerator.cpp
  232. +29 −0 src/ofxUserGenerator.h
  233. BIN win/copy_to_data_openni_path/lib/openNI.lib
View
BIN .DS_Store
Binary file not shown.
View
674 GPL.txt

Large diffs are not rendered by default.

Oops, something went wrong.
View
165 LGPL.txt
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
View
@@ -0,0 +1,28 @@
+/*
+ * ofxOpenNI
+ *
+ * Copyright 2011 (c) Matthew Gingold http://gingold.com.au
+ * Originally forked from a project by roxlu http://www.roxlu.com/
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
Oops, something went wrong.

0 comments on commit e3d421e

Please sign in to comment.