# HG changeset patch
# User Henrik Ekeus <hekeus@eecs.qmul.ac.uk>
# Date 1328808589 0
# Node ID 199f47eb6fa380f27fd02b499330c95c54595f1e
# Parent  5ab35fbad51ac2f843d29b9c8e17dbf8eededa56# Parent  c265c6b3b98d8b47a5872a2a776eb5ea0d4bd7bc
Merge

diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/frabk.ttf
Binary file bin/data/frabk.ttf has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/images/.DS_Store
Binary file bin/data/images/.DS_Store has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/images/davy.jpg
Binary file bin/data/images/davy.jpg has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/images/davy2.jpg
Binary file bin/data/images/davy2.jpg has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/FeatureExtraction.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/FeatureExtraction.ini	Thu Feb 09 17:29:49 2012 +0000
@@ -0,0 +1,16 @@
+[BodyParameters]
+;ShoulderWidth=350
+;HipWidth=250
+;TorsoHeight=500
+;UpperArmLength=300
+;LowerArmLength=300
+;UpperLegLength=420
+;LowerLegLength=480
+;NeckHeight=100
+;HeadHeight=250
+
+[FeatureExtractor]
+AutoBodyParameters=1
+AutoCalibrate=1
+AlwaysRunCalibration=0
+;OverrideHeight=1000
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/GlobalDefaults.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/GlobalDefaults.ini	Thu Feb 09 17:29:49 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 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/Nite.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/Nite.ini	Thu Feb 09 17:29:49 2012 +0000
@@ -0,0 +1,3 @@
+[HandTrackerManager]
+;AllowMultipleHands=1
+;TrackAdditionalHands=1
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/SamplesConfig.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/SamplesConfig.xml	Thu Feb 09 17:29:49 2012 +0000
@@ -0,0 +1,34 @@
+<OpenNI>
+	<Licenses>
+		<!-- Add licenses here 
+		<License vendor="vendor" key="key"/>
+		-->
+	</Licenses>
+	<Log writeToConsole="true" writeToFile="true">
+		<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
+		<LogLevel value="0"/>
+		<Masks>
+			<Mask name="ALL" on="true"/>
+		</Masks>
+		<Dumps>
+		</Dumps>
+	</Log>
+	<ProductionNodes>
+		<Node type="Image" name="Image1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		<Node type="Depth" name="Depth1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		<!--
+		<Node type="Audio" name="Audio1">
+		</Node>
+		-->
+	</ProductionNodes>
+</OpenNI>
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/h.dat
Binary file bin/data/openni/config/h.dat has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/modules.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/data/openni/config/modules.xml	Thu Feb 09 17:29:49 2012 +0000
@@ -0,0 +1,8 @@
+<Modules>
+	<Module path="./../../../data/openni/lib/libnimMockNodes.dylib" />
+    <Module path="./../../../data/openni/lib/libnimCodecs.dylib" />
+    <Module path="./../../../data/openni/lib/libnimRecorder.dylib" />
+    <Module path="./../../../data/openni/lib/libXnDevicesSensorV2.dylib" configDir="./../../../data/openni/config/" />
+    <Module path="./../../../data/openni/lib/libXnVFeatures.dylib" configDir="./../../../data/openni/config/" />
+    <Module path="./../../../data/openni/lib/libXnVHandGenerator.dylib" configDir="./../../../data/openni/config/" />
+</Modules>
diff -r 5ab35fbad51a -r 199f47eb6fa3 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	Thu Feb 09 17:29:49 2012 +0000
@@ -0,0 +1,32 @@
+<OpenNI>
+	<Licenses>
+		<License vendor="PrimeSense" key="0KOIk2JeIBYClPWVnMoRKn5cdY4="/>
+	</Licenses>
+	<Log writeToConsole="true" writeToFile="true">
+		<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
+		<LogLevel value="3"/>
+		<Masks>
+			<Mask name="ALL" on="true"/>
+		</Masks>
+		<Dumps>
+		</Dumps>
+	</Log>
+	<ProductionNodes>
+		<!-- ofxDepthGenerator -->
+		<Node type="Depth" name="Depth1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		<Node type="Image" name="Image1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		
+		<!-- ofxUserGenerator -->
+		<Node type="User" />
+	</ProductionNodes>
+</OpenNI>
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/config/s.dat
Binary file bin/data/openni/config/s.dat has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libJPEG.dylib
Binary file bin/data/openni/lib/libJPEG.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libOpenNI.dylib
Binary file bin/data/openni/lib/libOpenNI.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libTinyXml.dylib
Binary file bin/data/openni/lib/libTinyXml.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnCore.dylib
Binary file bin/data/openni/lib/libXnCore.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnDDK.dylib
Binary file bin/data/openni/lib/libXnDDK.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnDeviceFile.dylib
Binary file bin/data/openni/lib/libXnDeviceFile.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnDevicesSensorV2.dylib
Binary file bin/data/openni/lib/libXnDevicesSensorV2.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnFormats.dylib
Binary file bin/data/openni/lib/libXnFormats.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnVCNite.dylib
Binary file bin/data/openni/lib/libXnVCNite.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnVFeatures.dylib
Binary file bin/data/openni/lib/libXnVFeatures.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnVHandGenerator.dylib
Binary file bin/data/openni/lib/libXnVHandGenerator.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libXnVNite.dylib
Binary file bin/data/openni/lib/libXnVNite.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libnimCodecs.dylib
Binary file bin/data/openni/lib/libnimCodecs.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libnimCommon.dylib
Binary file bin/data/openni/lib/libnimCommon.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libnimMockNodes.dylib
Binary file bin/data/openni/lib/libnimMockNodes.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 bin/data/openni/lib/libnimRecorder.dylib
Binary file bin/data/openni/lib/libnimRecorder.dylib has changed
diff -r 5ab35fbad51a -r 199f47eb6fa3 groupTrackKinect.xcodeproj/samer.mode1v3
--- a/groupTrackKinect.xcodeproj/samer.mode1v3	Thu Feb 09 17:29:37 2012 +0000
+++ b/groupTrackKinect.xcodeproj/samer.mode1v3	Thu Feb 09 17:29:49 2012 +0000
@@ -229,6 +229,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -252,7 +254,7 @@
 						<dict>
 							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
 							<array>
-								<real>16</real>
+								<real>125</real>
 							</array>
 							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
 							<array>
@@ -272,12 +274,12 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>24</integer>
-									<integer>15</integer>
+									<integer>3</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {0, 0}}</string>
+							<string>{{0, 0}, {125, 680}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -289,19 +291,19 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {0, 698}}</string>
+						<string>{{0, 0}, {142, 698}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
-							<real>16</real>
+							<real>125</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>131 39 788 739 0 0 1280 778 </string>
+						<string>131 39 945 739 0 0 1280 778 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
 					<key>Proportion</key>
-					<string>0pt</string>
+					<string>142pt</string>
 				</dict>
 				<dict>
 					<key>Dock</key>
@@ -324,7 +326,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>31196C5B1427B83500377BAF</string>
+										<string>3130417714D208430024870E</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -332,9 +334,8 @@
 											<string>31FB947D1385362F00445736</string>
 											<string>31FB947E1385362F00445736</string>
 											<string>31FB94801385362F00445736</string>
-											<string>31FB949C138C01E400445736</string>
 											<string>31E0508113A2622A000BB38F</string>
-											<string>31316A9F1420F8060017B8D7</string>
+											<string>31196C5B1427B83500377BAF</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -346,9 +347,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {783, 0}}</string>
+								<string>{{0, 0}, {798, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>131 39 788 739 0 0 1280 778 </string>
+								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -373,7 +374,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>31196C5C1427B83500377BAF</string>
+										<string>3130417814D208430024870E</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -381,12 +382,10 @@
 											<string>31FB947D1385362F00445736</string>
 											<string>31FB94801385362F00445736</string>
 											<string>31E0506413A2448F000BB38F</string>
-											<string>31E0509B13A26EAD000BB38F</string>
 											<string>31E0513613A28A95000BB38F</string>
-											<string>31E0517213A40DB5000BB38F</string>
 											<string>31E0526613A62CF2000BB38F</string>
 											<string>3161917113FDC22700656D14</string>
-											<string>31316AA01420F8060017B8D7</string>
+											<string>31196C5C1427B83500377BAF</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -398,18 +397,16 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 5}, {783, 178}}</string>
+								<string>{{0, 5}, {798, 162}}</string>
 								<key>RubberWindowFrame</key>
-								<string>131 39 788 739 0 0 1280 778 </string>
+								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>178pt</string>
+							<string>162pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -427,7 +424,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>31196C621427B83500377BAF</string>
+										<string>3130417914D208430024870E</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -435,16 +432,13 @@
 											<string>31FB947D1385362F00445736</string>
 											<string>31FB94801385362F00445736</string>
 											<string>31E0506413A2448F000BB38F</string>
-											<string>31E0509B13A26EAD000BB38F</string>
-											<string>31E0517213A40DB5000BB38F</string>
 											<string>31E051D213A550B6000BB38F</string>
-											<string>318D947A1418AF4500C8CEFE</string>
 											<string>318D94CB1418E1DD00C8CEFE</string>
 											<string>31196C5D1427B83500377BAF</string>
 											<string>31196C5E1427B83500377BAF</string>
 											<string>31196C5F1427B83500377BAF</string>
 											<string>31196C601427B83500377BAF</string>
-											<string>31196C611427B83500377BAF</string>
+											<string>31196C621427B83500377BAF</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -456,14 +450,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 188}, {783, 505}}</string>
+								<string>{{0, 172}, {798, 521}}</string>
 								<key>RubberWindowFrame</key>
-								<string>131 39 788 739 0 0 1280 778 </string>
+								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>505pt</string>
+							<string>521pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -476,9 +470,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 698}, {783, 0}}</string>
+								<string>{{0, 698}, {798, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>131 39 788 739 0 0 1280 778 </string>
+								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -487,7 +481,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>783pt</string>
+					<string>798pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -504,9 +498,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>31196C631427B83500377BAF</string>
+				<string>3130417A14D208430024870E</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>31196C641427B83500377BAF</string>
+				<string>3130417B14D208430024870E</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
@@ -647,10 +641,10 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>31FB94591383ED1900445736</string>
-		<string>/Users/samer/Downloads/kinect/infodyn/OpenFrameworks_torun/of_preRelease_v0062_osxSL_FAT/apps/examples/group tracking kinect new/groupTrackKinect.xcodeproj</string>
+		<string>/usr/local/src/OpenFrameworks/of_preRelease_v0062_osxSL_FAT/apps/examples/grouptrack/groupTrackKinect.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>131 39 788 739 0 0 1280 778 </string>
+	<string>131 39 945 739 0 0 1280 778 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -727,7 +721,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>31FB94591383ED1900445736</string>
-				<string>31196C651427B83500377BAF</string>
+				<string>3130417C14D208430024870E</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
diff -r 5ab35fbad51a -r 199f47eb6fa3 groupTrackKinect.xcodeproj/samer.pbxuser
--- a/groupTrackKinect.xcodeproj/samer.pbxuser	Thu Feb 09 17:29:37 2012 +0000
+++ b/groupTrackKinect.xcodeproj/samer.pbxuser	Thu Feb 09 17:29:49 2012 +0000
@@ -95,16 +95,6 @@
 		vrLen = 905;
 		vrLoc = 1857;
 	};
-	31196C611427B83500377BAF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 271";
-		rLen = 11;
-		rLoc = 7563;
-		rType = 0;
-		vrLen = 1043;
-		vrLoc = 6743;
-	};
 	31196C621427B83500377BAF /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
@@ -115,7 +105,7 @@
 		vrLen = 1043;
 		vrLoc = 6743;
 	};
-	31316A9F1420F8060017B8D7 /* PBXTextBookmark */ = {
+	3130417714D208430024870E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
 		name = "testApp.h: 60";
@@ -125,15 +115,25 @@
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	31316AA01420F8060017B8D7 /* PBXTextBookmark */ = {
+	3130417814D208430024870E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
 		name = "main.cpp: 12";
 		rLen = 0;
 		rLoc = 307;
 		rType = 0;
-		vrLen = 325;
-		vrLoc = 0;
+		vrLen = 283;
+		vrLoc = 42;
+	};
+	3130417914D208430024870E /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 267";
+		rLen = 0;
+		rLoc = 7506;
+		rType = 0;
+		vrLen = 996;
+		vrLoc = 5528;
 	};
 	3161917113FDC22700656D14 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -145,23 +145,6 @@
 		vrLen = 823;
 		vrLoc = 0;
 	};
-	318D947A1418AF4500C8CEFE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 318D947B1418AF4500C8CEFE /* ofGraphics.h */;
-		name = "ofGraphics.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1085;
-		vrLoc = 0;
-	};
-	318D947B1418AF4500C8CEFE /* ofGraphics.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = ofGraphics.h;
-		path = /Users/samer/Downloads/kinect/infodyn/OpenFrameworks_torun/of_preRelease_v0062_osxSL_FAT/libs/openFrameworks/graphics/ofGraphics.h;
-		sourceTree = "<absolute>";
-	};
 	318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
@@ -192,16 +175,6 @@
 		vrLen = 1318;
 		vrLoc = 4478;
 	};
-	31E0509B13A26EAD000BB38F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8917CACF13084E4600ACBF05 /* ofxopenni_config.xml */;
-		name = "ofxopenni_config.xml: 3";
-		rLen = 30;
-		rLoc = 58;
-		rType = 0;
-		vrLen = 809;
-		vrLoc = 0;
-	};
 	31E0513613A28A95000BB38F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = BFA2A38D1315131800EB981C /* ofxOscSender.cpp */;
@@ -212,23 +185,6 @@
 		vrLen = 517;
 		vrLoc = 1588;
 	};
-	31E0517213A40DB5000BB38F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 31E0517313A40DB5000BB38F /* ofConstants.h */;
-		name = "ofConstants.h: 279";
-		rLen = 34;
-		rLoc = 6843;
-		rType = 0;
-		vrLen = 906;
-		vrLoc = 6390;
-	};
-	31E0517313A40DB5000BB38F /* ofConstants.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = ofConstants.h;
-		path = /Users/samer/Downloads/kinect/infodyn/OpenFrameworks_torun/of_preRelease_v0062_osxSL_FAT/libs/openFrameworks/utils/ofConstants.h;
-		sourceTree = "<absolute>";
-	};
 	31E051D213A550B6000BB38F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
@@ -350,16 +306,6 @@
 		vrLen = 961;
 		vrLoc = 10623;
 	};
-	31FB949C138C01E400445736 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8917CACF13084E4600ACBF05 /* ofxopenni_config.xml */;
-		name = "ofxopenni_config.xml: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 610;
-		vrLoc = 0;
-	};
 	8917CACF13084E4600ACBF05 /* ofxopenni_config.xml */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {683, 473}}";
@@ -437,7 +383,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					544,
+					559,
 					20,
 					48,
 					43,
@@ -500,8 +446,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 338147127;
-			PBXWorkspaceStateSaveDate = 338147127;
+			PBXPerProjectTemplateStateSaveDate = 349308166;
+			PBXWorkspaceStateSaveDate = 349308166;
 		};
 		perUserProjectItems = {
 			31196C5B1427B83500377BAF /* PBXTextBookmark */ = 31196C5B1427B83500377BAF /* PBXTextBookmark */;
@@ -510,18 +456,15 @@
 			31196C5E1427B83500377BAF /* PBXTextBookmark */ = 31196C5E1427B83500377BAF /* PBXTextBookmark */;
 			31196C5F1427B83500377BAF /* PBXTextBookmark */ = 31196C5F1427B83500377BAF /* PBXTextBookmark */;
 			31196C601427B83500377BAF /* PBXTextBookmark */ = 31196C601427B83500377BAF /* PBXTextBookmark */;
-			31196C611427B83500377BAF /* PBXTextBookmark */ = 31196C611427B83500377BAF /* PBXTextBookmark */;
 			31196C621427B83500377BAF /* PBXTextBookmark */ = 31196C621427B83500377BAF /* PBXTextBookmark */;
-			31316A9F1420F8060017B8D7 /* PBXTextBookmark */ = 31316A9F1420F8060017B8D7 /* PBXTextBookmark */;
-			31316AA01420F8060017B8D7 /* PBXTextBookmark */ = 31316AA01420F8060017B8D7 /* PBXTextBookmark */;
+			3130417714D208430024870E /* PBXTextBookmark */ = 3130417714D208430024870E /* PBXTextBookmark */;
+			3130417814D208430024870E /* PBXTextBookmark */ = 3130417814D208430024870E /* PBXTextBookmark */;
+			3130417914D208430024870E /* PBXTextBookmark */ = 3130417914D208430024870E /* PBXTextBookmark */;
 			3161917113FDC22700656D14 /* PBXTextBookmark */ = 3161917113FDC22700656D14 /* PBXTextBookmark */;
-			318D947A1418AF4500C8CEFE /* PBXTextBookmark */ = 318D947A1418AF4500C8CEFE /* PBXTextBookmark */;
 			318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */ = 318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */;
 			31E0506413A2448F000BB38F /* PBXTextBookmark */ = 31E0506413A2448F000BB38F /* PBXTextBookmark */;
 			31E0508113A2622A000BB38F /* PBXTextBookmark */ = 31E0508113A2622A000BB38F /* PBXTextBookmark */;
-			31E0509B13A26EAD000BB38F /* PBXTextBookmark */ = 31E0509B13A26EAD000BB38F /* PBXTextBookmark */;
 			31E0513613A28A95000BB38F /* PBXTextBookmark */ = 31E0513613A28A95000BB38F /* PBXTextBookmark */;
-			31E0517213A40DB5000BB38F /* PBXTextBookmark */ = 31E0517213A40DB5000BB38F /* PBXTextBookmark */;
 			31E051D213A550B6000BB38F /* PBXTextBookmark */ = 31E051D213A550B6000BB38F /* PBXTextBookmark */;
 			31E0526613A62CF2000BB38F /* PBXTextBookmark */ = 31E0526613A62CF2000BB38F /* PBXTextBookmark */;
 			31FB947B1385362F00445736 /* PlistBookmark */ = 31FB947B1385362F00445736 /* PlistBookmark */;
@@ -529,7 +472,6 @@
 			31FB947D1385362F00445736 /* PBXTextBookmark */ = 31FB947D1385362F00445736 /* PBXTextBookmark */;
 			31FB947E1385362F00445736 /* PBXTextBookmark */ = 31FB947E1385362F00445736 /* PBXTextBookmark */;
 			31FB94801385362F00445736 /* PBXTextBookmark */ = 31FB94801385362F00445736 /* PBXTextBookmark */;
-			31FB949C138C01E400445736 /* PBXTextBookmark */ = 31FB949C138C01E400445736 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 31FB945B1383ED1900445736 /* Source Control */;
 		userBuildSettings = {
@@ -543,23 +485,23 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {722, 182}}";
+			sepNavIntBoundsRect = "{{0, 0}, {737, 182}}";
 			sepNavSelRange = "{307, 0}";
-			sepNavVisRange = "{20, 305}";
+			sepNavVisRange = "{42, 283}";
 			sepNavWindowFrame = "{{19, 215}, {750, 558}}";
 		};
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {722, 4524}}";
+			sepNavIntBoundsRect = "{{0, 0}, {737, 4316}}";
 			sepNavSelRange = "{7506, 0}";
-			sepNavVisRange = "{6743, 1301}";
+			sepNavVisRange = "{5528, 1320}";
 			sepNavWindowFrame = "{{19, 215}, {750, 558}}";
 		};
 	};
 	E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {722, 858}}";
+			sepNavIntBoundsRect = "{{0, 0}, {737, 858}}";
 			sepNavSelRange = "{1198, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{42, 194}, {750, 558}}";