# HG changeset patch
# User samer
# Date 1330110127 0
# Node ID f3a1dc7d35966e80deb57ba2450bf6fee848d98d
# Parent 8ce02be21135eb98e726f7d1deb4a11eda6d68e9
Put bin/data/openni back in so usable from machines without OpenFrameworks installed.
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni
--- a/bin/data/openni Fri Feb 24 00:53:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../../../../addons/ofxOpenNI/mac/copy_to_data_path/openni
\ No newline at end of file
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/FeatureExtraction.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/FeatureExtraction.ini Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,7 @@
+[FeatureExtractor]
+;AutoBodyParameters=0
+;AutoCalibrate=0
+
+[Generator]
+;Preference=Quality
+;Preference=Speed
\ No newline at end of file
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/GlobalDefaults.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/GlobalDefaults.ini Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,188 @@
+[Core]
+; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default)
+LogLevel=0
+; leave empty for nothing (default). ALL - all masks
+LogMasks=ALL
+; 0 - No (default), 1 - Yes
+;LogWriteToConsole=1
+; 0 - No (default), 1 - Yes
+LogWriteToFile=1
+; 0 - No (default), 1 - Yes
+;LogWriteLineInfo=0
+; leave empty for nothing (default). ALL - all masks
+;DumpMasks=
+
+; Number of milliseconds between profiling logs. 0 - Off (default)
+;ProfilingInterval=1000
+
+;---------------- Server Default Configuration -------------------
+[Server]
+; Use a server to access sensor. 0 - No (single application), 1 - Yes (multiple applications, default)
+; roxlu: We need to set this to false to work with the kinect.
+EnableMultiProcess=0
+
+
+; The timeout in which a server goes down if no client is connected, in milliseconds
+;ServerNoClientsTimeout=10000
+
+; The number of shared memory buffers per stream (default is 6).
+; This value affects the number of concurrent clients to the server: (NumberOfBuffers = clients + 3)
+;NumberOfBuffers=6
+
+;---------------- Sensor Default Configuration -------------------
+[Device]
+; Mirroring. 0 - Off (default), 1 - On
+;Mirror=1
+
+; FrameSync. 0 - Off (default), 1 - On
+;FrameSync=1
+
+; Stream Data Timestamps. 0 - milliseconds, 1 - microseconds (default)
+;HighResTimestamps=1
+
+; A filter for the firmware log. Default is determined by firmware.
+;FirmwareLogFilter=0
+
+; Automatic firmare log retrieval. 0 - Off (default), or the number of milliseconds between log retrievals operations.
+;FirmwareLogInterval=1000
+
+; Print firmware log to console when automatic firmware log retrieval is on. 0 - Off (default), 1 - On
+;FirmwareLogPrint=1
+
+; Automatic firmware CPU statistics retrieval. 0 - Off (default), or the number of milliseconds between CPU retrievals operations.
+;FirmwareCPUInterval=1000
+
+; Is APC enabled. 0 - Off, 1 - On (default)
+;APCEnabled=1
+
+; USB interface to be used. 0 - FW Default (default), 1 - ISO endpoints, 2 - BULK endpoints
+;UsbInterface=2
+
+[Depth]
+; Output format. 0 - Shift values, 1 - 12-bit depth values (default)
+;OutputFormat=1
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Min depth cutoff. 0-10000 mm (default is 0)
+;MinDepthValue=0
+
+; Max depth cutoff. 0-10000 mm (default is 10000)
+;MaxDepthValue=10000
+
+; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression (default), 3 - Packed 11-bit
+InputFormat=3
+
+; 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
+
+; Hole Filler. 0 - Off, 1 - On (default)
+;HoleFilter=1
+
+; White Balance. 0 - Off, 1 - On (default)
+;WhiteBalancedEnabled=1
+
+; Gain. 0-50 (0 - Auto, 1 - Min., 50 - Max.). Default value is set by firmware.
+;Gain=0
+
+; GMC Mode. 0 - Off, 1 - On (default)
+;GMCMode=0
+
+; GMC Debug. 0 - Off (default), 1 - On
+;GMCDebug=1
+
+; Depth Auto Gain Region-of-Interest. Default values are set by firmware.
+;DepthAGCBin0MinDepth=500
+;DepthAGCBin0MaxDepth=800
+;DepthAGCBin1MinDepth=1500
+;DepthAGCBin1MaxDepth=1800
+;DepthAGCBin2MinDepth=2500
+;DepthAGCBin2MaxDepth=2800
+;DepthAGCBin3MinDepth=3500
+;DepthAGCBin3MaxDepth=3800
+
+; Wavelength Correction Mechanism. 0 - Off (default), 1 - On
+;WavelengthCorrection=1
+
+; Wavelength Correction debug info. 0 - Off (default), 1 - On
+;WavelengthCorrectionDebug=1
+
+; Cropping section
+[Depth.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[Image]
+; Output format. 2 - Gray8 (2.0 MP only), 4 - YUV422, 5 - RGB24 (default)
+;OutputFormat=5
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2- SXGA (1.3MP) 3 - UXGA (2.0MP)
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422 (default), 2 - Jpeg, 5 - Uncompressed YUV422, 6 - Uncompressed 8-bit BAYER
+InputFormat=6
+
+; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
+;Flicker=50
+
+; Image quality when using Jpeg. 1-10 (1 - Lowest, 10 - Highest (default))
+;Quality=10
+
+; Cropping section
+[Image.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[IR]
+; Output format. 3 - Grayscale 16-bit, 5 - RGB24 (default)
+;OutputFormat=3
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2 - SXGA(1.3MP)
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Cropping section
+[SensorIR.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[Audio]
+; Sample Rate. 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 (default)
+;SampleRate=48000
+
+; Volume. 0-49 (0 - Mute, 1 - Min., 49 - Max.). Default is 12.
+;LeftChannelVolume=12
+;RightChannelVolume=12
+
+; Number of channels. 1, 2 (default)
+;NumOfChannels=2
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/GlobalDefaultsKinect.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/GlobalDefaultsKinect.ini Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,186 @@
+[Core]
+; 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default)
+LogLevel=3
+; leave empty for nothing (default). ALL - all masks
+LogMasks=ALL
+; 0 - No (default), 1 - Yes
+;LogWriteToConsole=1
+; 0 - No (default), 1 - Yes
+LogWriteToFile=1
+; 0 - No (default), 1 - Yes
+;LogWriteLineInfo=0
+; leave empty for nothing (default). ALL - all masks
+;DumpMasks=
+
+; Number of milliseconds between profiling logs. 0 - Off (default)
+;ProfilingInterval=1000
+
+;---------------- Server Default Configuration -------------------
+[Server]
+; Use a server to access sensor. 0 - No (single application), 1 - Yes (multiple applications, default)
+;EnableMultiProcess=0
+
+; The timeout in which a server goes down if no client is connected, in milliseconds
+;ServerNoClientsTimeout=10000
+
+; The number of shared memory buffers per stream (default is 6).
+; This value affects the number of concurrent clients to the server: (NumberOfBuffers = clients + 3)
+;NumberOfBuffers=6
+
+;---------------- Sensor Default Configuration -------------------
+[Device]
+; Mirroring. 0 - Off (default), 1 - On
+;Mirror=1
+
+; FrameSync. 0 - Off (default), 1 - On
+;FrameSync=1
+
+; Stream Data Timestamps. 0 - milliseconds, 1 - microseconds (default)
+;HighResTimestamps=1
+
+; A filter for the firmware log. Default is determined by firmware.
+;FirmwareLogFilter=0
+
+; Automatic firmare log retrieval. 0 - Off (default), or the number of milliseconds between log retrievals operations.
+;FirmwareLogInterval=1000
+
+; Print firmware log to console when automatic firmware log retrieval is on. 0 - Off (default), 1 - On
+;FirmwareLogPrint=1
+
+; Automatic firmware CPU statistics retrieval. 0 - Off (default), or the number of milliseconds between CPU retrievals operations.
+;FirmwareCPUInterval=1000
+
+; Is APC enabled. 0 - Off, 1 - On (default)
+;APCEnabled=1
+
+; USB interface to be used. 0 - FW Default (default), 1 - ISO endpoints, 2 - BULK endpoints
+;UsbInterface=2
+
+[Depth]
+; Output format. 0 - Shift values, 1 - 12-bit depth values (default)
+;OutputFormat=1
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Min depth cutoff. 0-10000 mm (default is 0)
+;MinDepthValue=0
+
+; Max depth cutoff. 0-10000 mm (default is 10000)
+;MaxDepthValue=10000
+
+; Input format. 0 - Uncompressed 16-bit, 1 - PS Compression, 3 - Packed 11-bit (default)
+;InputFormat=1
+
+; Registration. 0 - Off (default), 1 - On
+;Registration=1
+
+; Registration Type. 0 - Don't care (default), 1 - use hardware accelaration, 2 - perform in software
+;RegistrationType=0
+
+; Hole Filler. 0 - Off, 1 - On (default)
+;HoleFilter=1
+
+; White Balance. 0 - Off, 1 - On (default)
+;WhiteBalancedEnabled=1
+
+; Gain. 0-50 (0 - Auto, 1 - Min., 50 - Max.). Default value is set by firmware.
+;Gain=0
+
+; GMC Mode. 0 - Off, 1 - On (default)
+;GMCMode=0
+
+; GMC Debug. 0 - Off (default), 1 - On
+;GMCDebug=1
+
+; Depth Auto Gain Region-of-Interest. Default values are set by firmware.
+;DepthAGCBin0MinDepth=500
+;DepthAGCBin0MaxDepth=800
+;DepthAGCBin1MinDepth=1500
+;DepthAGCBin1MaxDepth=1800
+;DepthAGCBin2MinDepth=2500
+;DepthAGCBin2MaxDepth=2800
+;DepthAGCBin3MinDepth=3500
+;DepthAGCBin3MaxDepth=3800
+
+; Wavelength Correction Mechanism. 0 - Off (default), 1 - On
+;WavelengthCorrection=1
+
+; Wavelength Correction debug info. 0 - Off (default), 1 - On
+;WavelengthCorrectionDebug=1
+
+; Cropping section
+[Depth.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[Image]
+; Output format. 2 - Gray8 (2.0 MP only), 4 - YUV422, 5 - RGB24 (default)
+;OutputFormat=5
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2- SXGA (1.3MP) 3 - UXGA (2.0MP)
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Input format. 0 - BAYER (1.3MP or 2.0MP only), 1 - Compressed YUV422, 2 - Jpeg, 5 - Uncompressed YUV422 (default), 6 - Uncompressed 8-bit BAYER
+;InputFormat=5
+
+; Anti Flicker. 0 - Off (default), 50 - 50Hz, 60 - 60 Hz.
+;Flicker=50
+
+; Image quality when using Jpeg. 1-10 (1 - Lowest, 10 - Highest (default))
+;Quality=10
+
+; Cropping section
+[Image.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[IR]
+; Output format. 3 - Grayscale 16-bit, 5 - RGB24 (default)
+;OutputFormat=3
+
+; Is stream mirrored. 0 - Off, 1 - On
+;Mirror=1
+
+; 0 - QVGA (default), 1 - VGA, 2 - SXGA(1.3MP)
+;Resolution=1
+
+; Frames per second (default is 30)
+;FPS=30
+
+; Cropping section
+[SensorIR.Cropping]
+;OffsetX=0
+;OffsetY=0
+;SizeX=320
+;SizeY=240
+;Enabled=1
+
+[Audio]
+; Sample Rate. 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 (default)
+;SampleRate=48000
+
+; Volume. 0-49 (0 - Mute, 1 - Min., 49 - Max.). Default is 12.
+;LeftChannelVolume=12
+;RightChannelVolume=12
+
+; Number of channels. 1, 2 (default)
+;NumOfChannels=2
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/Nite.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/Nite.ini Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,3 @@
+[HandTrackerManager]
+;AllowMultipleHands=1
+;TrackAdditionalHands=1
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/SamplesConfig.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/SamplesConfig.xml Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/h.dat
Binary file bin/data/openni/config/h.dat has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/licenses.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/licenses.xml Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,1 @@
+
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/modules.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/modules.xml Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/ofxopenni_config.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/ofxopenni_config.xml Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/config/s.dat
Binary file bin/data/openni/config/s.dat has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/change_exec_paths.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/lib/change_exec_paths.sh Fri Feb 24 19:02:07 2012 +0000
@@ -0,0 +1,34 @@
+in="install_name_tool -change "
+
+cd ../OpenNI_openFrameworks/openni/lib
+
+libs=(*.dylib)
+num_libs=${#libs[*]}
+
+for lib in *.dylib ; do
+ i=0
+ echo ""
+ echo "${lib}"
+ echo "-------------------------------------------------"
+ lines=`otool -L ${lib}`
+ echo ${lines}
+ for linked_name in ${lines} ; do
+ for local_lib in ${libs[@]}; do
+ in=`echo ${linked_name} | grep -i ${local_lib}`
+ if [ "$in" != "" ] ; then
+ check_id=`echo "${linked_name}" | grep -i "${lib}"`
+
+ #install_name_tool -change "/opt/local/lib/libusb-1.0.0.dylib" "@executable_path/./../../../data/openni/lib/libusb-1.0.0.dylib" ${lib}
+ #echo install_name_tool -change "/opt/local/lib/libusb-1.0.0.dylib" "@executable_path/./../../../data/openni/lib/libusb-1.0.0.dylib" ${lib}
+
+ if [ "$check_id" != "" ] ; then
+ install_name_tool -id "@executable_path/./../../../data/openni/lib/${local_lib}" ${lib}
+ echo install_name_tool -id "@executable_path/./../../../data/openni/lib/${local_lib}" ${lib}
+ else
+ install_name_tool -change "${linked_name}" "@executable_path/./../../../data/openni/lib/${local_lib}" ${lib}
+ echo install_name_tool -change "${linked_name}" "@executable_path/./../../../data/openni/lib/${local_lib}" ${lib}
+ fi
+ fi
+ done
+ done
+done
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libOpenNI.dylib
Binary file bin/data/openni/lib/libOpenNI.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnCore.dylib
Binary file bin/data/openni/lib/libXnCore.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnDDK.dylib
Binary file bin/data/openni/lib/libXnDDK.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnDeviceFile.dylib
Binary file bin/data/openni/lib/libXnDeviceFile.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnDeviceSensorV2KM.dylib
Binary file bin/data/openni/lib/libXnDeviceSensorV2KM.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnFormats.dylib
Binary file bin/data/openni/lib/libXnFormats.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnVCNITE_1_5_2.dylib
Binary file bin/data/openni/lib/libXnVCNITE_1_5_2.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnVFeatures_1_5_2.dylib
Binary file bin/data/openni/lib/libXnVFeatures_1_5_2.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnVHandGenerator_1_5_2.dylib
Binary file bin/data/openni/lib/libXnVHandGenerator_1_5_2.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libXnVNite_1_5_2.dylib
Binary file bin/data/openni/lib/libXnVNite_1_5_2.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libnimCodecs.dylib
Binary file bin/data/openni/lib/libnimCodecs.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libnimMockNodes.dylib
Binary file bin/data/openni/lib/libnimMockNodes.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libnimRecorder.dylib
Binary file bin/data/openni/lib/libnimRecorder.dylib has changed
diff -r 8ce02be21135 -r f3a1dc7d3596 bin/data/openni/lib/libusb-1.0.0.dylib
Binary file bin/data/openni/lib/libusb-1.0.0.dylib has changed