Permalink
Browse files

1) Merged code with the new unstable sensor driver from PrimeSense th…

…at adds MacOSX and multiple sensor support.

2) Added precompiled binaries for Linux & MacOSX.
  • Loading branch information...
1 parent b7cd39d commit c9b88287d410899238685621754706e9c87d6cdf @avin2 committed Jan 7, 2011
Showing with 2,985 additions and 2,005 deletions.
  1. BIN Bin/SensorKinect-Win32-5.0.0.exe
  2. +2 −0 Data/GlobalDefaults.ini
  3. +1 −1 Include/XnPsVersion.h
  4. +2 −0 Include/XnStreamParams.h
  5. +1 −1 Platform/Linux-x86/Build/XnFormats/Makefile
  6. +21 −11 Platform/Linux-x86/CreateRedist/RedistMaker
  7. +18 −9 Platform/Linux-x86/CreateRedist/install.sh
  8. +62 −26 Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj
  9. +5 −2 Platform/Win32/CreateRedist/Engine.nsi
  10. +134 −39 README
  11. +2 −3 Source/External/LibJPEG/jconfig.h
  12. +1 −1 Source/Utils/XnSensorServer/SensorServer.cpp
  13. +1 −1 Source/XnDDK/XnDeviceStream.h
  14. +1 −1 Source/XnDDK/XnPropertySet.cpp
  15. +1 −1 Source/XnDDK/XnPropertySetInternal.h
  16. +1 −1 Source/XnDDK/XnStreamReaderDevice.cpp
  17. +1 −1 Source/XnDDK/XnStreamReaderStream.cpp
  18. +1 −1 Source/XnDDK/XnStreamReaderStream.h
  19. +1 −1 Source/XnDeviceFile/XnDeviceFileReader.cpp
  20. +4 −4 Source/XnDeviceFile/XnDeviceFileReaderBC.cpp
  21. +1 −1 Source/XnDeviceFile/XnFileDevice.cpp
  22. +1 −0 Source/XnDeviceSensorV2/XnDataProcessor.h
  23. +71 −48 Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp
  24. +5 −1 Source/XnDeviceSensorV2/XnDeviceSensorIO.h
  25. +1 −1 Source/XnDeviceSensorV2/XnDeviceSensorInit.h
  26. +1 −0 Source/XnDeviceSensorV2/XnDeviceSensorProtocol.h
  27. +5 −1 Source/XnDeviceSensorV2/XnExportedSensorDevice.cpp
  28. +4 −2 Source/XnDeviceSensorV2/XnFirmwareStreams.cpp
  29. +1 −0 Source/XnDeviceSensorV2/XnHostProtocol.h
  30. +10 −30 Source/XnDeviceSensorV2/XnSensor.cpp
  31. +4 −1 Source/XnDeviceSensorV2/XnSensor.h
  32. +3 −2 Source/XnDeviceSensorV2/XnSensorAudioStream.cpp
  33. +2 −1 Source/XnDeviceSensorV2/XnSensorAudioStream.h
  34. +1 −1 Source/XnDeviceSensorV2/XnSensorClient.cpp
  35. +1 −0 Source/XnDeviceSensorV2/XnSensorClientServer.h
  36. +49 −5 Source/XnDeviceSensorV2/XnSensorClientStream.cpp
  37. +6 −0 Source/XnDeviceSensorV2/XnSensorClientStream.h
  38. +3 −2 Source/XnDeviceSensorV2/XnSensorDepthStream.cpp
  39. +1 −1 Source/XnDeviceSensorV2/XnSensorDepthStream.h
  40. +2 −1 Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp
  41. +2 −2 Source/XnDeviceSensorV2/XnSensorIRStream.cpp
  42. +1 −1 Source/XnDeviceSensorV2/XnSensorIRStream.h
  43. +4 −3 Source/XnDeviceSensorV2/XnSensorImageStream.cpp
  44. +1 −1 Source/XnDeviceSensorV2/XnSensorImageStream.h
  45. +7 −2 Source/XnDeviceSensorV2/XnSensorProductionNode.cpp
  46. +1 −1 Source/XnDeviceSensorV2/XnSensorProductionNode.h
  47. +80 −1,709 Source/XnDeviceSensorV2/XnSensorServer.cpp
  48. +15 −76 Source/XnDeviceSensorV2/XnSensorServer.h
  49. +0 −5 Source/XnDeviceSensorV2/XnSensorServerRunner.h
  50. +187 −0 Source/XnDeviceSensorV2/XnSensorsManager.cpp
  51. +71 −0 Source/XnDeviceSensorV2/XnSensorsManager.h
  52. +58 −0 Source/XnDeviceSensorV2/XnServerLogger.h
  53. +649 −0 Source/XnDeviceSensorV2/XnServerSensorInvoker.cpp
  54. +124 −0 Source/XnDeviceSensorV2/XnServerSensorInvoker.h
  55. +1,212 −0 Source/XnDeviceSensorV2/XnServerSession.cpp
  56. +138 −0 Source/XnDeviceSensorV2/XnServerSession.h
  57. +2 −2 Source/XnDeviceSensorV2/XnSharedMemoryBufferPool.cpp
  58. +1 −1 Source/XnDeviceSensorV2/XnSharedMemoryBufferPool.h
Binary file not shown.
View
@@ -82,6 +82,7 @@ InputFormat=3
;Registration=1
; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
+; --avin mod--
RegistrationType=2
; Hole Filler. 0 - Off, 1 - On (default)
@@ -137,6 +138,7 @@ RegistrationType=2
;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
+; --avin mod--
InputFormat=6
; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
View
@@ -43,7 +43,7 @@
/** Xiron maintenance version. */
#define XN_PS_MAINTENANCE_VERSION 0
/** Xiron build version. */
-#define XN_PS_BUILD_VERSION 24
+#define XN_PS_BUILD_VERSION 25
/** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */
#define XN_PS_BRIEF_VERSION_STRING \
View
@@ -263,6 +263,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 */
@@ -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
@@ -3,10 +3,10 @@
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"
@@ -27,11 +27,11 @@ 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/libXnDeviceSensorV2.* ../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
@@ -40,7 +40,17 @@ 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 [ "`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 -
@@ -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="libXnDeviceSensorV2.dylib libXnDeviceFile.dylib"
+else
+ MODULES="libXnDeviceSensorV2.so libXnDeviceFile.so"
+fi
+
RULES_FILE="55-primesense-usb.rules"
# read arguments
@@ -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
@@ -601,37 +601,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"
@@ -26,7 +26,9 @@
;SetCompress off
SetCompress auto
-SetCompressor ZLIB
+SetCompressor /FINAL /SOLID lzma
+SetCompressorDictSize 64
+SetDatablockOptimize on
!include "MUI.nsh"
!include "x64.nsh"
@@ -116,6 +118,7 @@ Section "Sensor" Sensor
CreateDirectory "$INSTDIR\Data"
; Copy all the files from the redist dir
+ File "/oname=$INSTDIR\README.txt" ..\..\..\README
File "/oname=$INSTDIR\GPL.txt" ..\redist\GPL.txt
File "/oname=$INSTDIR\LGPL.txt" ..\redist\LGPL.txt
File "/oname=$INSTDIR\Bin\XnCore.dll" ..\redist\Bin\XnCore.dll
@@ -135,7 +138,7 @@ Section "Sensor" Sensor
SetOutPath "$INSTDIR\SampleXMLs"
File /r ..\..\..\NITE
File /r ..\..\..\OPENNI
-
+
; Register it in OpenNI
ReadRegStr $OPEN_NI_INST HKLM "Software\OpenNI" "InstallDir"
; Also add OPEN_NI_INSTALL_PATH to current environment (current environment is not updated by writing to registry)
Oops, something went wrong.

0 comments on commit c9b8828

Please sign in to comment.