Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated codebase to the latest OpenNI / Sensor version (1.1.0.39 / 5.…

…0.1.32)
commit 8f199ca25c6d89bec06e3881d672ca5a1b8c3220 1 parent b7cd39d
@avin2 authored
Showing with 9,106 additions and 3,066 deletions.
  1. BIN  Bin/SensorKinect-Bin-Linux32-v5.0.1.32.tar.bz2
  2. BIN  Bin/SensorKinect-Bin-Linux64-v5.0.1.32.tar.bz2
  3. BIN  Bin/SensorKinect-Bin-MacOSX-v5.0.1.32.tar.bz2
  4. BIN  Bin/SensorKinect-Win-OpenSource32-5.0.1.msi
  5. BIN  Bin/SensorKinect-Win32-5.0.0.exe
  6. +62 −0 CHANGES
  7. +6 −6 Data/{GlobalDefaults.ini → GlobalDefaultsKinect.ini}
  8. +5 −0 Include/XnDDK.h
  9. +1 −0  Include/XnFormatsStatus.h
  10. +2 −2 Include/XnPsVersion.h
  11. +57 −6 Include/XnStreamParams.h
  12. +0 −23 NITE/Data/Sample-Scene.xml
  13. +0 −24 NITE/Data/Sample-Tracking.xml
  14. +0 −23 NITE/Data/Sample-User.xml
  15. +4 −6 OpenNI/Data/SamplesConfig.xml
  16. +1 −1  Platform/Linux-x86/Build/Utils/XnSensorServer/Makefile
  17. +1 −1  Platform/Linux-x86/Build/XnDeviceSensorV2/Makefile
  18. +1 −1  Platform/Linux-x86/Build/XnFormats/Makefile
  19. +37 −12 Platform/Linux-x86/CreateRedist/RedistMaker
  20. +19 −10 Platform/Linux-x86/CreateRedist/install.sh
  21. +2 −0  Platform/Linux-x86/Install/55-primesense-usb.rules
  22. BIN  Platform/Win32/Build/Prerequisites/nsis-2.46-strlen_8192.zip
  23. +177 −6 Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj
  24. +202 −7 Platform/Win32/Build/XnCore/XnCore.vcproj
  25. +189 −7 Platform/Win32/Build/XnDDK/XnDDK.vcproj
  26. +183 −7 Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj
  27. +275 −32 Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj
  28. +181 −7 Platform/Win32/Build/XnFormats/XnFormats.vcproj
  29. +26 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.sln
  30. +86 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.wixproj
  31. +304 −0 Platform/Win32/CreateRedist/EE_NI/EE_NI.wxs
  32. +99 −0 Platform/Win32/CreateRedist/EE_NI/Fragments/BinariesFragment.wxs
  33. +1,817 −0 Platform/Win32/CreateRedist/EE_NI/Fragments/FilesFragment.wxs
  34. +46 −0 Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi
  35. +14 −0 Platform/Win32/CreateRedist/EE_NI/Lang/en-us/Loc_en-us.wxl
  36. BIN  Platform/Win32/CreateRedist/EE_NI/Resources/Header.bmp
  37. BIN  Platform/Win32/CreateRedist/EE_NI/Resources/mainicon.ico
  38. +76 −0 Platform/Win32/CreateRedist/EE_NI/UI/CustomeInstallUI.wxs
  39. BIN  Platform/Win32/CreateRedist/EE_NI/bin/Release/EE_NI_setup.exe
  40. BIN  Platform/Win32/CreateRedist/EE_NI/bin/Release/en-us/EE_NI.wixpdb
  41. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/Release/EE_NI.wixobj
  42. +7 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/EE_NI.wixproj.FileList.txt
  43. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/Release/Fragments/BinariesFragment.wixobj
  44. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/Release/Fragments/FilesFragment.wixobj
  45. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/Release/Product.Generated.wixobj
  46. +6 −0 Platform/Win32/CreateRedist/EE_NI/obj/Release/Product.Generated.wxs
  47. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/Release/UI/CustomeInstallUI.wixobj
  48. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/EE_NI.wixobj
  49. +7 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/EE_NI.wixproj.FileList.txt
  50. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Fragments/BinariesFragment.wixobj
  51. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Fragments/FilesFragment.wixobj
  52. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Product.Generated.wixobj
  53. +6 −0 Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/Product.Generated.wxs
  54. +1 −0  Platform/Win32/CreateRedist/EE_NI/obj/x64/Release/UI/CustomeInstallUI.wixobj
  55. BIN  Platform/Win32/CreateRedist/EE_NI/setup.exe
  56. +0 −214 Platform/Win32/CreateRedist/Engine.nsi
  57. +8 −0 Platform/Win32/CreateRedist/Engine_Config.xml
  58. BIN  Platform/Win32/CreateRedist/Header.bmp
  59. +122 −16 Platform/Win32/CreateRedist/Redist.py
  60. +0 −54 Platform/Win32/CreateRedist/x64.nsh
  61. BIN  Platform/Win32/Driver/amd64/psdrv3.sys
  62. BIN  Platform/Win32/Driver/dpinst-amd64.exe
  63. BIN  Platform/Win32/Driver/dpinst-x86.exe
  64. +5 −5 Platform/Win32/Driver/dpinst.xml
  65. BIN  Platform/Win32/Driver/psdrv3.cat
  66. +29 −14 Platform/Win32/Driver/psdrv3.inf
  67. BIN  Platform/Win32/Driver/x86/psdrv3.sys
  68. BIN  Platform/Win32/Tools/vcredist_x86.exe
  69. +135 −44 README
  70. +2 −3 Source/External/LibJPEG/jconfig.h
  71. +4 −4 Source/Utils/XnSensorServer/SensorServer.cpp
  72. +136 −0 Source/XnDDK/XnDDK.cpp
  73. +1 −1  Source/XnDDK/XnDeviceStream.h
  74. +87 −78 Source/XnDDK/XnPixelStream.cpp
  75. +17 −7 Source/XnDDK/XnPixelStream.h
  76. +1 −1  Source/XnDDK/XnPropertySet.cpp
  77. +1 −1  Source/XnDDK/XnPropertySetInternal.h
  78. +1 −1  Source/XnDDK/XnStreamReaderDevice.cpp
  79. +1 −1  Source/XnDDK/XnStreamReaderStream.cpp
  80. +1 −1  Source/XnDDK/XnStreamReaderStream.h
  81. +1 −1  Source/XnDeviceFile/XnDeviceFileReader.cpp
  82. +4 −4 Source/XnDeviceFile/XnDeviceFileReaderBC.cpp
  83. +5 −5 Source/XnDeviceFile/XnExportedFileDevice.cpp
  84. +2 −1  Source/XnDeviceFile/XnFileDevice.cpp
  85. +2 −7 Source/XnDeviceFile/XnFileDeviceBC.cpp
  86. +1 −0  Source/XnDeviceSensorV2/Registration.cpp
  87. +44 −13 Source/XnDeviceSensorV2/XnDataProcessor.cpp
  88. +1 −0  Source/XnDeviceSensorV2/XnDataProcessor.h
  89. +9 −2 Source/XnDeviceSensorV2/XnDeviceSensor.h
  90. +103 −66 Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp
  91. +9 −3 Source/XnDeviceSensorV2/XnDeviceSensorIO.h
  92. +36 −3 Source/XnDeviceSensorV2/XnDeviceSensorInit.cpp
  93. +31 −24 Source/XnDeviceSensorV2/XnDeviceSensorInit.h
  94. +1 −1  Source/XnDeviceSensorV2/XnDeviceSensorProtocol.cpp
  95. +3 −1 Source/XnDeviceSensorV2/XnDeviceSensorProtocol.h
  96. +5 −1 Source/XnDeviceSensorV2/XnExportedSensorDevice.cpp
  97. +34 −2 Source/XnDeviceSensorV2/XnExportedSensorGenerator.cpp
  98. +2 −1  Source/XnDeviceSensorV2/XnExportedSensorGenerator.h
  99. +1 −0  Source/XnDeviceSensorV2/XnFirmwareInfo.h
  100. +4 −2 Source/XnDeviceSensorV2/XnFirmwareStreams.cpp
  101. +9 −3 Source/XnDeviceSensorV2/XnFrameStreamProcessor.cpp
  102. +4 −0 Source/XnDeviceSensorV2/XnFrameStreamProcessor.h
  103. +80 −5 Source/XnDeviceSensorV2/XnHostProtocol.cpp
  104. +5 −0 Source/XnDeviceSensorV2/XnHostProtocol.h
  105. +11 −6 Source/XnDeviceSensorV2/XnImageProcessor.cpp
  106. +3 −1 Source/XnDeviceSensorV2/XnImageProcessor.h
  107. +8 −64 Source/XnDeviceSensorV2/XnJpegImageProcessor.cpp
  108. +1 −20 Source/XnDeviceSensorV2/XnJpegImageProcessor.h
  109. +117 −0 Source/XnDeviceSensorV2/XnJpegToRGBImageProcessor.cpp
  110. +64 −0 Source/XnDeviceSensorV2/XnJpegToRGBImageProcessor.h
  111. +7 −1 Source/XnDeviceSensorV2/XnParams.h
  112. +33 −31 Source/XnDeviceSensorV2/XnSensor.cpp
  113. +7 −1 Source/XnDeviceSensorV2/XnSensor.h
  114. +1 −1  Source/XnDeviceSensorV2/XnSensorAudioGenerator.cpp
  115. +1 −0  Source/XnDeviceSensorV2/XnSensorAudioGenerator.h
  116. +32 −18 Source/XnDeviceSensorV2/XnSensorAudioStream.cpp
  117. +12 −1 Source/XnDeviceSensorV2/XnSensorAudioStream.h
  118. +34 −24 Source/XnDeviceSensorV2/XnSensorClient.cpp
  119. +0 −4 Source/XnDeviceSensorV2/XnSensorClient.h
  120. +1 −0  Source/XnDeviceSensorV2/XnSensorClientServer.h
  121. +53 −5 Source/XnDeviceSensorV2/XnSensorClientStream.cpp
  122. +7 −0 Source/XnDeviceSensorV2/XnSensorClientStream.h
  123. +3 −2 Source/XnDeviceSensorV2/XnSensorDepthGenerator.cpp
  124. +1 −0  Source/XnDeviceSensorV2/XnSensorDepthGenerator.h
  125. +107 −61 Source/XnDeviceSensorV2/XnSensorDepthStream.cpp
  126. +18 −1 Source/XnDeviceSensorV2/XnSensorDepthStream.h
  127. +18 −1 Source/XnDeviceSensorV2/XnSensorDevice.cpp
  128. +7 −1 Source/XnDeviceSensorV2/XnSensorDevice.h
  129. +114 −46 Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp
  130. +8 −0 Source/XnDeviceSensorV2/XnSensorFirmwareParams.h
  131. +6 −1 Source/XnDeviceSensorV2/XnSensorGenerator.cpp
  132. +1 −0  Source/XnDeviceSensorV2/XnSensorGenerator.h
  133. +1 −9 Source/XnDeviceSensorV2/XnSensorIRGenerator.cpp
  134. +1 −0  Source/XnDeviceSensorV2/XnSensorIRGenerator.h
  135. +68 −38 Source/XnDeviceSensorV2/XnSensorIRStream.cpp
  136. +11 −1 Source/XnDeviceSensorV2/XnSensorIRStream.h
  137. +304 −37 Source/XnDeviceSensorV2/XnSensorImageGenerator.cpp
  138. +18 −3 Source/XnDeviceSensorV2/XnSensorImageGenerator.h
  139. +306 −56 Source/XnDeviceSensorV2/XnSensorImageStream.cpp
  140. +55 −1 Source/XnDeviceSensorV2/XnSensorImageStream.h
  141. +69 −41 Source/XnDeviceSensorV2/XnSensorMapGenerator.cpp
  142. +8 −3 Source/XnDeviceSensorV2/XnSensorMapGenerator.h
  143. +1 −9 Source/XnDeviceSensorV2/XnSensorOpenNiteImpl.cpp
  144. +7 −2 Source/XnDeviceSensorV2/XnSensorProductionNode.cpp
  145. +1 −1  Source/XnDeviceSensorV2/XnSensorProductionNode.h
  146. +172 −1,719 Source/XnDeviceSensorV2/XnSensorServer.cpp
  147. +19 −77 Source/XnDeviceSensorV2/XnSensorServer.h
  148. +0 −5 Source/XnDeviceSensorV2/XnSensorServerRunner.h
  149. +187 −0 Source/XnDeviceSensorV2/XnSensorsManager.cpp
  150. +71 −0 Source/XnDeviceSensorV2/XnSensorsManager.h
  151. +58 −0 Source/XnDeviceSensorV2/XnServerLogger.h
  152. +657 −0 Source/XnDeviceSensorV2/XnServerSensorInvoker.cpp
  153. +208 −0 Source/XnDeviceSensorV2/XnServerSensorInvoker.h
  154. +1,212 −0 Source/XnDeviceSensorV2/XnServerSession.cpp
  155. +138 −0 Source/XnDeviceSensorV2/XnServerSession.h
  156. +2 −2 Source/XnDeviceSensorV2/XnSharedMemoryBufferPool.cpp
  157. +1 −1  Source/XnDeviceSensorV2/XnSharedMemoryBufferPool.h
View
BIN  Bin/SensorKinect-Bin-Linux32-v5.0.1.32.tar.bz2
Binary file not shown
View
BIN  Bin/SensorKinect-Bin-Linux64-v5.0.1.32.tar.bz2
Binary file not shown
View
BIN  Bin/SensorKinect-Bin-MacOSX-v5.0.1.32.tar.bz2
Binary file not shown
View
BIN  Bin/SensorKinect-Win-OpenSource32-5.0.1.msi
Binary file not shown
View
BIN  Bin/SensorKinect-Win32-5.0.0.exe
Binary file not shown
View
62 CHANGES
@@ -0,0 +1,62 @@
+Detailed Change log:
+--------------------
+
+Version 5.0.1.32 (Unstable version - Apr 11th 2010)
+---------------------------------------------------
+ * Fixing log prints of resolutions (-1 appeared as MAX_UINT64...) to the resolution name.
+ * Linux Bug Fix: Server creates two log files, one in the client folder and one in /var/log/primesense/XnSensorServer
+ * Fixed a memory leak when rewinding old XNS files.
+ * Win32: WIX installer (replacing NSIS)
+ * Fixed wrong version in XnDeviceFile
+
+Version 5.0.1.31 (Stable version - Apr 11th 2010)
+-------------------------------------------------
+ * Fix BULK timeout - it was too small...
+ * Bug Fix: IR only works in QVGA...
+ * Added 64bit support for the installers.
+ * Fix wrong uses of the XN_IS_STATUS_OK macro (value is evaluated twice).
+ * Adding support for MJPEG pass-through.
+ * Adding initial support for new CMOS interfaces
+ * Adding initial JPEG support
+ * Fix for UAC installer problems.
+ * Fixed uninstall without OpenNI.
+ * Set minimum OpenNI version check in the installer.
+ * Fix seeking to first frame in old XNS files.
+ * Bug Fix: Client would fail to connect if trying to connect while server is shutting down.
+ * Improving the timestamps algorithm.
+ * performance improvement when enumerating for image nodes - a sensor should only be checked once.
+ * improving error message for setting grayscale8 in low resolutions.
+ * Improve thread-safety when starting server
+ * Bug Fix: a crash when trying to open a non-existing XNS file.
+ * Bug Fix: a potential crash if Init of depth generator fails.
+ * Sensor now supports the Device Identification capability.
+ * Server: fixing a deadlock problem between closing a stream and getting new data from it. This was done by splitting the sensor lock into two locks: one for changes on the sensor and one for changing the stream collection.
+ * MultiProcess Bug Fix: the lock on a sensor didn't exist, so nothing was synchronized.
+ * ImageGenerator now also changes InputFormat when changing resolution if needed (when switching from hi-res to normal & vice versa).
+ * Adding frame IDs to Audio (just counting)
+ * restoring defaults to QVGA.
+ * Add support for sensors with no image CMOS.
+ * Updated low-bandwidth USB devices buffer information.
+ * Added the Asus WAVI auto-detection for Win32.
+ * Low bandwidth devices now use bigger USB delays.
+ * New defaults are now VGA, uncompressed.
+ * Initial support for low-band devices:
+ 1. Image, IR and audio does not enumerate.
+ 2. Defaults changed to QVGA, compressed.
+
+Version 5.0.0.25 (Unstable version - Jan 6th 2011)
+--------------------------------------------------
+ * Bug fix: infinite loop in server when a client tries to disconnect and streams can't be closed (usb timeout for example).
+ * Added MacOSX platform support.
+ * Added the unstable README file.
+ * Removed useless win32 prerequisites...
+ * Fixing audio to work properly in the client-server model.
+ * Server Bug Fix: a potential dead lock was solved.
+ * Sensor Server now supports multiple sensors.
+ * Refactored server to a better design, which should decrease deadlocks and make code more readable.
+ * Adding support for enumerating and opening different sensors.
+ * Bug Fix: GetStringProperty would always return XN_STATUS_ERROR.
+
+Version 5.0.0.24 (Stable version - Dec 8th 2010)
+------------------------------------------------
+ * Initial release...
View
12 Data/GlobalDefaults.ini → Data/GlobalDefaultsKinect.ini
@@ -1,6 +1,6 @@
[Core]
; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default)
-LogLevel=0
+LogLevel=3
; leave empty for nothing (default). ALL - all masks
LogMasks=ALL
; 0 - No (default), 1 - Yes
@@ -75,14 +75,14 @@ LogWriteToFile=1
; Max depth cutoff. 0-10000 mm (default is 10000)
;MaxDepthValue=10000
-; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression (default), 3 - Packed 11-bit
-InputFormat=3
+; 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=2
+;RegistrationType=0
; Hole Filler. 0 - Off, 1 - On (default)
;HoleFilter=1
@@ -136,8 +136,8 @@ RegistrationType=2
; Frames per second (default is 30)
;FPS=30
-; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default), 2 - Jpeg, 5 - Uncompressed YUV422, 6 - Uncompressed 8-bit BAYER
-InputFormat=6
+; 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
View
5 Include/XnDDK.h
@@ -31,6 +31,7 @@
#include <XnPlatform.h>
#include <XnStatus.h>
#include <XnDDKStatus.h>
+#include <XnStreamParams.h>
#ifdef __cplusplus
#ifdef XN_DDK_EXPORTS
@@ -80,4 +81,8 @@ XN_DDK_API XnStatus XnDDKInitFromINIFile(const XnChar* cpINIFileName);
*/
XN_DDK_API XnStatus XnDDKShutdown();
+XN_DDK_API XnResolutions XnDDKGetResolutionFromXY(XnUInt32 nXRes, XnUInt32 nYRes);
+XN_DDK_API XnBool XnDDKGetXYFromResolution(XnResolutions res, XnUInt32* pnXRes, XnUInt32* pnYRes);
+XN_DDK_API const XnChar* XnDDKGetResolutionName(XnResolutions res);
+
#endif //_XN_DDK_H_
View
1  Include/XnFormatsStatus.h
@@ -64,6 +64,7 @@ XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_DEPTH_BUFFER_SIZE, "Invalid Xiron
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_IMAGE_BUFFER_SIZE, "Invalid Xiron I/O stream image buffer size!")
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_MISC_BUFFER_SIZE, "Invalid Xiron I/O stream misc buffer size!")
XN_STATUS_MESSAGE(XN_STATUS_IO_INVALID_STREAM_AUDIO_BUFFER_SIZE, "Invalid Xiron I/O stream audio buffer size!")
+XN_STATUS_MESSAGE(XN_STATUS_INVALID_OUTPUT_FORMAT_FOR_RESOLUTION, "Pixel format is not supported for this resolution!")
XN_PS_STATUS_MESSAGE_MAP_END(XN_ERROR_GROUP_FORMATS)
#endif //_XN_FORMATS_STATUS_H_
View
4 Include/XnPsVersion.h
@@ -41,9 +41,9 @@
/** Xiron minor version. */
#define XN_PS_MINOR_VERSION 0
/** Xiron maintenance version. */
-#define XN_PS_MAINTENANCE_VERSION 0
+#define XN_PS_MAINTENANCE_VERSION 1
/** Xiron build version. */
-#define XN_PS_BUILD_VERSION 24
+#define XN_PS_BUILD_VERSION 32
/** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */
#define XN_PS_BRIEF_VERSION_STRING \
View
63 Include/XnStreamParams.h
@@ -138,12 +138,19 @@
/** XnCropping */
#define XN_STREAM_PROPERTY_CROPPING "Cropping"
+/** Boolean */
+#define XN_STREAM_PROPERTY_WHITE_BALANCE_ENABLED "WhiteBalancedEnabled"
+/** Integer */
+#define XN_STREAM_PROPERTY_GAIN "Gain"
+/** Integer */
+#define XN_STREAM_PROPERTY_SUPPORT_MODES_COUNT "SupportedModesCount"
+/** General (XnCmosPreset array) */
+#define XN_STREAM_PROPERTY_SUPPORT_MODES "SupportedModes"
+
//---------------------------------------------------------------------------
// Depth Specific Properties
//---------------------------------------------------------------------------
/** Integer */
-#define XN_STREAM_PROPERTY_GAIN "Gain"
-/** Integer */
#define XN_STREAM_PROPERTY_HOLE_FILTER "HoleFilter"
/** Integer */
#define XN_STREAM_PROPERTY_MIN_DEPTH "MinDepthValue"
@@ -157,8 +164,6 @@
#define XN_STREAM_PROPERTY_REGISTRATION "Registration"
/** XnProcessingType */
#define XN_STREAM_PROPERTY_REGISTRATION_TYPE "RegistrationType"
-/** Boolean */
-#define XN_STREAM_PROPERTY_WHITE_BALANCE_ENABLED "WhiteBalancedEnabled"
/** XnDepthAGCBin* */
#define XN_STREAM_PROPERTY_AGC_BIN "AGCBin"
/** Integer */
@@ -231,6 +236,28 @@
#define XN_STREAM_PROPERTY_FLICKER "Flicker"
/** Integer */
#define XN_STREAM_PROPERTY_QUALITY "Quality"
+/** Float */
+#define XN_STREAM_PROPERTY_BRIGHTNESS XN_CAPABILITY_BRIGHTNESS
+/** Float */
+#define XN_STREAM_PROPERTY_CONTRAST XN_CAPABILITY_CONTRAST
+/** Float */
+#define XN_STREAM_PROPERTY_SATURATION XN_CAPABILITY_SATURATION
+/** Float */
+#define XN_STREAM_PROPERTY_SHARPNESS XN_CAPABILITY_SHARPNESS
+/** Float */
+#define XN_STREAM_PROPERTY_COLOR_TEMPERATURE XN_CAPABILITY_COLOR_TEMPERATURE
+/** Float */
+#define XN_STREAM_PROPERTY_BACKLIGHT_COMPENSATION XN_CAPABILITY_BACKLIGHT_COMPENSATION
+/** Float */
+#define XN_STREAM_PROPERTY_ZOOM XN_CAPABILITY_ZOOM
+/** Integer (in microseconds) */
+#define XN_STREAM_PROPERTY_EXPOSURE XN_CAPABILITY_EXPOSURE
+/** Float */
+#define XN_STREAM_PROPERTY_PAN XN_CAPABILITY_PAN
+/** Float */
+#define XN_STREAM_PROPERTY_TILT XN_CAPABILITY_TILT
+/** Boolean */
+#define XN_STREAM_PROPERTY_LOW_LIGHT_COMPENSATION XN_CAPABILITY_LOW_LIGHT_COMPENSATION
//---------------------------------------------------------------------------
// Audio Specific Properties
@@ -263,6 +290,8 @@
#define XN_MODULE_PROPERTY_SDK_VERSION "SDKVersion"
/** String */
#define XN_MODULE_PROPERTY_DEVICE_NAME "DeviceName"
+/** String */
+#define XN_MODULE_PROPERTY_USB_PATH "USBPath"
/** Integer (XnSensorUsbInterface) */
#define XN_MODULE_PROPERTY_USB_INTERFACE "UsbInterface"
/** Integer */
@@ -317,6 +346,10 @@
#define XN_MODULE_PROPERTY_ERROR_STATE "ErrorState"
/** Boolean */
#define XN_MODULE_PROPERTY_ENABLE_MULTI_PROCESS "EnableMultiProcess"
+/** String */
+#define XN_MODULE_PROPERTY_PHYSICAL_DEVICE_NAME "PhysicalDeviceName"
+/** String */
+#define XN_MODULE_PROPERTY_VENDOR_SPECIFIC_DATA "VendorSpecificData"
//---------------------------------------------------------------------------
@@ -349,8 +382,18 @@ typedef enum XnResolutions
XN_RESOLUTION_VGA = 1, // 640x480
XN_RESOLUTION_SXGA = 2, // 1280x1024
XN_RESOLUTION_UXGA = 3, // 1600x1200
-
- XN_RESOLUTION_COUNT,
+ XN_RESOLUTION_QQVGA = 4, // 160x120
+ XN_RESOLUTION_QCIF = 5, // 176x144
+ XN_RESOLUTION_240P = 6, // 432x240
+ XN_RESOLUTION_CIF = 7, // 352x288
+ XN_RESOLUTION_WVGA = 8, // 640x360
+ XN_RESOLUTION_480P = 9, // 864x480
+ XN_RESOLUTION_800_448 = 10, // 800x448
+ XN_RESOLUTION_SVGA = 11, // 800x600
+ XN_RESOLUTION_576P = 12, // 1024x576
+ XN_RESOLUTION_DV = 13, // 960x720
+ XN_RESOLUTION_720P = 14, // 1280x720
+ XN_RESOLUTION_1280_960 = 15, // 1280x960
} XnResolutions;
typedef enum
@@ -365,6 +408,7 @@ typedef enum
XN_SENSOR_FW_VER_5_1 = 7,
XN_SENSOR_FW_VER_5_2 = 8,
XN_SENSOR_FW_VER_5_3 = 9,
+ XN_SENSOR_FW_VER_5_4 = 10,
} XnFWVer;
typedef enum
@@ -524,6 +568,13 @@ typedef struct XnDynamicSizeBuffer
XnUInt32 nDataSize;
} XnDynamicSizeBuffer;
+typedef struct XnCmosPreset
+{
+ XnUInt16 nFormat;
+ XnUInt16 nResolution;
+ XnUInt16 nFPS;
+} XnCmosPreset;
+
#pragma pack (pop)
View
23 NITE/Data/Sample-Scene.xml
@@ -1,23 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="Scene" />
- </ProductionNodes>
-</OpenNI>
View
24 NITE/Data/Sample-Tracking.xml
@@ -1,24 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="Gesture" />
- <Node type="Hands" />
- </ProductionNodes>
-</OpenNI>
View
23 NITE/Data/Sample-User.xml
@@ -1,23 +0,0 @@
-<OpenNI>
- <Licenses>
- <License vendor="PrimeSense" key="insert key here"/>
- </Licenses>
- <Log writeToConsole="true" writeToFile="false">
- <!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
- <LogLevel value="3"/>
- <Masks>
- <Mask name="ALL" on="false"/>
- </Masks>
- <Dumps>
- </Dumps>
- </Log>
- <ProductionNodes>
- <Node type="Depth">
- <Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
- <Mirror on="true"/>
- </Configuration>
- </Node>
- <Node type="User" />
- </ProductionNodes>
-</OpenNI>
View
10 OpenNI/Data/SamplesConfig.xml
@@ -4,27 +4,26 @@
<License vendor="vendor" key="key"/>
-->
</Licenses>
- <Log writeToConsole="true" writeToFile="false">
+ <Log writeToConsole="false" writeToFile="false">
<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
<LogLevel value="3"/>
<Masks>
- <Mask name="ALL" on="false"/>
+ <Mask name="ALL" on="true"/>
</Masks>
<Dumps>
</Dumps>
</Log>
<ProductionNodes>
<!-- Normal Image -->
- <Node type="Image" name="Image1">
+ <Node type="Image" name="Image1" stopOnError="false">
<Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
<Mirror on="true"/>
</Configuration>
</Node>
<!-- HighRes Image -->
<!--
- <Node type="Image" name="Image1">
+ <Node type="Image" name="Image1" stopOnError="false">
<Configuration>
<MapOutputMode xRes="1280" yRes="1024" FPS="15"/>
<Mirror on="true"/>
@@ -54,7 +53,6 @@
<Node type="Depth" name="Depth1">
<Configuration>
- <MapOutputMode xRes="640" yRes="480" FPS="30"/>
<Mirror on="true"/>
</Configuration>
</Node>
View
2  Platform/Linux-x86/Build/Utils/XnSensorServer/Makefile
@@ -1,7 +1,7 @@
SRC_FILES = ../../../../../Source/Utils/XnSensorServer/*.cpp
EXE_NAME = XnSensorServer
-USED_LIBS = OpenNI XnCore XnFormats XnDDK XnDeviceSensorV2
+USED_LIBS = OpenNI XnCore XnFormats XnDDK XnDeviceSensorV2KM
include ../EngineUtilMakefile
View
2  Platform/Linux-x86/Build/XnDeviceSensorV2/Makefile
@@ -1,7 +1,7 @@
SRC_FILES = \
../../../../Source/XnDeviceSensorV2/*.cpp
-LIB_NAME = XnDeviceSensorV2
+LIB_NAME = XnDeviceSensorV2KM
USED_LIBS = XnCore XnFormats XnDDK OpenNI
DEFINES = XN_DEVICE_EXPORTS
View
2  Platform/Linux-x86/Build/XnFormats/Makefile
@@ -3,7 +3,7 @@ SRC_FILES = \
../../../../Source/External/LibJPEG/*.c
LIB_NAME = XnFormats
-LIB_USED = XnCore OpenNI
+USED_LIBS = XnCore OpenNI
DEFINES = XN_FORMATS_EXPORTS
INC_DIRS = ../../../../Source/External/LibJPEG
View
49 Platform/Linux-x86/CreateRedist/RedistMaker
@@ -1,12 +1,18 @@
#!/bin/bash -e
+use_4100=0
+if [ "$1" == "4100" ]
+then
+use_4100=1
+fi
+
SCRIPT_DIR=`pwd`
# Take version
-MAJOR=`grep "#define XN_PS_MAJOR_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }'`
-MINOR=`grep "#define XN_PS_MINOR_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }'`
-MAINTENANCE=`grep "#define XN_PS_MAINTENANCE_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }'`
-BUILD=`grep "#define XN_PS_BUILD_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }'`
+MAJOR=`grep "#define XN_PS_MAJOR_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }' | strings -n 1`
+MINOR=`grep "#define XN_PS_MINOR_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }' | strings -n 1`
+MAINTENANCE=`grep "#define XN_PS_MAINTENANCE_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }' | strings -n 1`
+BUILD=`grep "#define XN_PS_BUILD_VERSION" ../../../Include/XnPsVersion.h | awk '{ print $3 }' | strings -n 1`
PS_VERSION="$MAJOR.$MINOR.$MAINTENANCE.$BUILD"
@@ -15,7 +21,14 @@ rm -rf Final
rm -rf ../Redist
# Build Engine
+if [ "$use_4100" == "1" ]
+then
+cd ../Build
+./Make.4100
+cd -
+else
make -C ../Build
+fi
# create redist folder structure
mkdir -p ../Redist
@@ -27,20 +40,32 @@ mkdir -p ../Redist/Config
# copy files to redist
cp ../../../GPL.txt ../Redist
cp ../../../LGPL.txt ../Redist
-cp ../Bin/Release/libXnDeviceSensorV2.so ../Redist/Lib
-cp ../Bin/Release/libXnDeviceFile.so ../Redist/Lib
-cp ../Bin/Release/libXnDDK.so ../Redist/Lib
-cp ../Bin/Release/libXnFormats.so ../Redist/Lib
-cp ../Bin/Release/libXnCore.so ../Redist/Lib
+cp ../Bin/Release/libXnDeviceSensorV2KM.* ../Redist/Lib
+cp ../Bin/Release/libXnDeviceFile.* ../Redist/Lib
+cp ../Bin/Release/libXnDDK.* ../Redist/Lib
+cp ../Bin/Release/libXnFormats.* ../Redist/Lib
+cp ../Bin/Release/libXnCore.* ../Redist/Lib
cp ../Bin/Release/XnSensorServer ../Redist/Bin
cp ../Install/* ../Redist/Install
-cp ../../../Data/GlobalDefaults.ini ../Redist/Config
+cp ../../../Data/GlobalDefaultsKinect.ini ../Redist/Config
cp install.sh ../Redist
# create tar
mkdir -p Final
cd ../Redist
-tar -cjf $SCRIPT_DIR/Final/Engine.v$PS_VERSION.tar.bz2 *
-cd -
+if [ "`uname -s`" == "Darwin" ]; then
+ TAR_TARGET="MacOSX"
+elif [ "$use_4100" == "1" ]; then
+ TAR_TARGET="CE4100"
+elif [ "`uname -m`" == "i686" ]; then
+ TAR_TARGET="Linux32"
+elif [ "`uname -m`" == "x86_64" ]; then
+ TAR_TARGET="Linux64"
+else
+ TAR_TARGET="Linux"
+fi
+tar -cjf $SCRIPT_DIR/Final/Sensor-Bin-$TAR_TARGET-v$PS_VERSION.tar.bz2 *
+
+cd -
View
29 Platform/Linux-x86/CreateRedist/install.sh
@@ -7,7 +7,12 @@ INSTALL_BIN=/usr/bin
INSTALL_ETC=/usr/etc/primesense
INSTALL_RULES=/etc/udev/rules.d
-MODULES="libXnDeviceSensorV2.so libXnDeviceFile.so"
+if [ "`uname -s`" == "Darwin" ]; then
+ MODULES="libXnDeviceSensorV2KM.dylib libXnDeviceFile.dylib"
+else
+ MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
+fi
+
RULES_FILE="55-primesense-usb.rules"
# read arguments
@@ -62,7 +67,7 @@ if [ "$INSTALL" == "1" ]; then
# copy config file
printf "copying server config file..."
- cp Config/GlobalDefaults.ini $INSTALL_ETC
+ cp Config/GlobalDefaultsKinect.ini $INSTALL_ETC
printf "OK\n"
# make server run as root
@@ -78,10 +83,12 @@ if [ "$INSTALL" == "1" ]; then
chmod a+w /var/log/primesense/XnSensorServer
printf "OK\n"
- # install USB rules (so that PrimeSense sensors will be mounted with write permissions)
- printf "installing usb rules..."
- cp Install/$RULES_FILE $INSTALL_RULES
- printf "OK\n"
+ if [ "`uname -s`" != "Darwin" ]; then
+ # install USB rules (so that PrimeSense sensors will be mounted with write permissions)
+ printf "installing usb rules..."
+ cp Install/$RULES_FILE $INSTALL_RULES
+ printf "OK\n"
+ fi
else #uninstall
@@ -112,10 +119,12 @@ else #uninstall
rm -rf $INSTALL_ETC
printf "OK\n"
- # remove USB rules
- printf "removing usb rules..."
- rm -f $INSTALL_RULES/$RULES_FILE
- printf "OK\n"
+ if [ "`uname -s`" != "Darwin" ]; then
+ # remove USB rules
+ printf "removing usb rules..."
+ rm -f $INSTALL_RULES/$RULES_FILE
+ printf "OK\n"
+ fi
fi
View
2  Platform/Linux-x86/Install/55-primesense-usb.rules
@@ -5,4 +5,6 @@ SYSFS{idProduct}=="0400",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="u
SYSFS{idProduct}=="0500",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="users"
SYSFS{idProduct}=="0600",SYSFS{idVendor}=="1d27",MODE="666",OWNER="xxx",GROUP="users"
SYSFS{idProduct}=="02AE",SYSFS{idVendor}=="045E",MODE="666",OWNER="xxx",GROUP="users"
+SYSFS{idProduct}=="02AD",SYSFS{idVendor}=="045E",MODE="666",OWNER="xxx",GROUP="users"
+SYSFS{idProduct}=="02B0",SYSFS{idVendor}=="045E",MODE="666",OWNER="xxx",GROUP="users"
View
BIN  Platform/Win32/Build/Prerequisites/nsis-2.46-strlen_8192.zip
Binary file not shown
View
183 Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -62,7 +65,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="openNI.lib XnDDK.lib XnDeviceSensorV2.lib XnFormats.lib "
+ AdditionalDependencies="openNI.lib XnDDK.lib XnDeviceSensorV2KM.lib XnFormats.lib "
OutputFile="../../../Bin/$(ConfigurationName)/$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../../Lib/$(ConfigurationName)"
@@ -94,9 +97,89 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\..\Include;..\..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib XnDDK64.lib XnDeviceSensorV2KM64.lib XnFormats64.lib "
+ OutputFile="../../../Bin64/$(ConfigurationName)/$(ProjectName)64.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../../Lib64/$(ConfigurationName)"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ SubSystem="1"
+ ImportLibrary="$(TargetDir)$(TargetName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -145,7 +228,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="openNI.lib XnDDK.lib XnDeviceSensorV2.lib XnFormats.lib "
+ AdditionalDependencies="openNI.lib XnDDK.lib XnDeviceSensorV2KM.lib XnFormats.lib "
OutputFile="../../../Bin/$(ConfigurationName)/$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../../Lib/$(ConfigurationName)"
@@ -178,6 +261,94 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\..\Include;..\..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib XnDDK64.lib XnDeviceSensorV2KM64.lib XnFormats64.lib "
+ OutputFile="../../../Bin64/$(ConfigurationName)/$(ProjectName)64.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../../Lib64/$(ConfigurationName)"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(TargetDir)$(TargetName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
View
209 Platform/Win32/Build/XnCore/XnCore.vcproj
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -65,14 +68,14 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="openNI.lib "
- OutputFile="../../Bin/$(ConfigurationName)/XnCore.dll"
+ OutputFile="../../Bin/$(ConfigurationName)/$(ProjectName).dll"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../Lib/$(ConfigurationName)"
GenerateManifest="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="../../Bin/$(ConfigurationName)/XnCore.pdb"
+ ProgramDatabaseFile="../../Bin/$(ConfigurationName)/$(ProjectName).pdb"
SubSystem="2"
- ImportLibrary="../../Lib/$(ConfigurationName)/XnCore.lib"
+ ImportLibrary="../../Lib/$(ConfigurationName)/$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -99,9 +102,92 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="xcopy /D /Y ..\..\..\..\Source\XnCommon\XnCommon.h ..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source;..\..\..\..\Source\XnCore\Win32;..\..\..\..\Platform\Win32\Driver\Build\sys"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XN_CORE_EXPORTS;XN_CROSS_PLATFORM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -190,6 +276,99 @@
CommandLine=""
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="xcopy /D /Y ..\..\..\..\Source\XnCommon\XnCommon.h ..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/fp:fast /Qprec-div- /Qprec-sqrt-"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source;..\..\..\..\Source\XnCore\Win32;..\..\..\..\Platform\Win32\Driver\Build\sys"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XN_CORE_EXPORTS;XN_CROSS_PLATFORM"
+ GeneratePreprocessedFile="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -223,6 +402,14 @@
GeneratePreprocessedFile="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Include\XnCore.h"
@@ -243,6 +430,14 @@
GeneratePreprocessedFile="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
View
196 Platform/Win32/Build/XnDDK/XnDDK.vcproj
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -63,14 +66,14 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="openNI.lib "
- OutputFile="../../Bin/$(ConfigurationName)/XnDDK.dll"
+ OutputFile="../../Bin/$(ConfigurationName)/$(ProjectName).dll"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../Lib/$(ConfigurationName)"
GenerateManifest="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="../../Bin/$(ConfigurationName)/XnDDK.pdb"
+ ProgramDatabaseFile="../../Bin/$(ConfigurationName)/$(ProjectName).pdb"
SubSystem="2"
- ImportLibrary="../../Lib/$(ConfigurationName)/XnDDK.lib"
+ ImportLibrary="../../Lib/$(ConfigurationName)/$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -96,9 +99,89 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source;..\..\..\..\Source\XnCore\Win32"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XN_DDK_EXPORTS;XN_CROSS_PLATFORM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -185,6 +268,97 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/fp:fast /Qprec-div- /Qprec-sqrt-"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source;..\..\..\..\Source\XnCore\Win32"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XN_DDK_EXPORTS;XN_CROSS_PLATFORM"
+ GeneratePreprocessedFile="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -402,6 +576,14 @@
GeneratePreprocessedFile="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Source\XnDDK\XnSimpleBufferPool.h"
View
190 Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -65,14 +68,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="XnCore.lib XnDDK.lib XnFormats.lib openNI.lib "
- OutputFile="../../Bin/$(ConfigurationName)/XnDeviceFile.dll"
+ OutputFile="../../Bin/$(ConfigurationName)/$(ProjectName).dll"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../Lib/$(ConfigurationName)"
GenerateManifest="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="../../Bin/$(ConfigurationName)/XnDeviceFile.pdb"
+ ProgramDatabaseFile="../../Bin/$(ConfigurationName)/$(ProjectName).pdb"
SubSystem="2"
- ImportLibrary="../../Lib/$(ConfigurationName)/XnDeviceFile.lib"
+ ImportLibrary="../../Lib/$(ConfigurationName)/$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -98,9 +101,91 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XN_DEVICE_EXPORTS;XN_CROSS_PLATFORM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions=""
+ AdditionalDependencies="XnCore64.lib XnDDK64.lib XnFormats64.lib openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -187,6 +272,97 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/fp:fast /Qprec-div- /Qprec-sqrt-"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XN_DEVICE_EXPORTS;XN_CROSS_PLATFORM"
+ GeneratePreprocessedFile="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="XnCore64.lib XnDDK64.lib XnFormats64.lib openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
View
307 Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="XnDeviceSensorV2"
+ Name="XnDeviceSensorV2KM"
ProjectGUID="{1653839A-ABA5-4c0e-9EA2-2640B0275894}"
- RootNamespace="XnDeviceSensorV2"
+ RootNamespace="XnDeviceSensorV2KM"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -105,9 +108,98 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine=""
+ AdditionalDependencies=""
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XN_DEVICE_EXPORTS;XN_LEAN_SENSOR"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions=""
+ AdditionalDependencies="setupapi.lib XnDDK64.lib XnFormats64.lib XnCore64.lib openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ DelayLoadDLLs=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ HeapReserveSize="0"
+ HeapCommitSize="0"
+ StackReserveSize="0"
+ StackCommitSize="0"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -194,6 +286,97 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/fp:fast /Qprec-div- /Qprec-sqrt-"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XN_DEVICE_EXPORTS;XN_CROSS_PLATFORM;XN_LEAN_SENSOR"
+ GeneratePreprocessedFile="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="setupapi.lib XnDDK64.lib XnFormats64.lib XnCore64.lib openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -408,6 +591,14 @@
>
</File>
<File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnJpegToRGBImageProcessor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnJpegToRGBImageProcessor.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnPSCompressedImageProcessor.cpp"
>
</File>
@@ -491,6 +682,14 @@
GeneratePreprocessedFile="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorDepthStream.h"
@@ -575,6 +774,14 @@
GeneratePreprocessedFile="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnHostProtocol.h"
@@ -601,37 +808,73 @@
Name="ClientServer"
>
<File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClient.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClient.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClientServer.h"
>
</File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClientStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClientStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServer.h"
+ <Filter
+ Name="Client"
>
- </File>
- <File
- RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServerRunner.h"
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClientStream.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorClientStream.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Server"
>
- </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorServerRunner.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorsManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnSensorsManager.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnServerLogger.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnServerSensorInvoker.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnServerSensorInvoker.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnServerSession.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\Source\XnDeviceSensorV2\XnServerSession.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="OpenNIImpl"
View
188 Platform/Win32/Build/XnFormats/XnFormats.vcproj
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -63,14 +66,14 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="openNI.lib "
- OutputFile="../../Bin/$(ConfigurationName)/XnFormats.dll"
+ OutputFile="../../Bin/$(ConfigurationName)/$(ProjectName).dll"
AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB)&quot;;../../Lib/$(ConfigurationName)"
GenerateManifest="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="../../Bin/$(ConfigurationName)/XnFormats.pdb"
+ ProgramDatabaseFile="../../Bin/$(ConfigurationName)/$(ProjectName).pdb"
SubSystem="2"
- ImportLibrary="../../Lib/$(ConfigurationName)/XnFormats.lib"
+ ImportLibrary="../../Lib/$(ConfigurationName)/$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -96,9 +99,89 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source\;..\..\..\..\Source\External\LibJPEG"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;XN_FORMATS_EXPORTS;XN_CROSS_PLATFORM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\Bin\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -185,6 +268,97 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\Bin64\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/fp:fast /Qprec-div- /Qprec-sqrt-"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include;..\..\..\..\Source\;..\..\..\..\Source\External\LibJPEG"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XN_FORMATS_EXPORTS;XN_CROSS_PLATFORM"
+ GeneratePreprocessedFile="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OPEN_NI_INCLUDE)&quot;;..\..\..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="openNI64.lib "
+ OutputFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="&quot;$(OPEN_NI_LIB64)&quot;;../../Lib64/$(ConfigurationName)"
+ GenerateManifest="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="../../Bin64/$(ConfigurationName)/$(ProjectName)64.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="../../Lib64/$(ConfigurationName)/$(ProjectName)64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool