Mercurial > hg > grouptrack

changeset 8:584ef20184f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: segv when too many users present - added test on user id; increased MAX_USERS to 16; changed window title to 'Melody Triangle Tracker'; ADDED: full screen option (key 'F'); ADDED: /randinit message between /birth and /start
author samer
date Wed, 15 Feb 2012 10:55:40 +0000
parents b66834fbe860
children 5df9f17ee5b9
files groupTrackKinect.xcodeproj/project.pbxproj groupTrackKinect.xcodeproj/samer.mode1v3 groupTrackKinect.xcodeproj/samer.pbxuser src/testApp.cpp src/testApp.h
diffstat 5 files changed, 138 insertions(+), 135 deletions(-) [+]
line wrap: on
line diff
--- a/groupTrackKinect.xcodeproj/project.pbxproj	Fri Feb 10 19:35:17 2012 +0000
+++ b/groupTrackKinect.xcodeproj/project.pbxproj	Wed Feb 15 10:55:40 2012 +0000
@@ -192,7 +192,6 @@
 		3078192D13028E5200D8873A /* ofxTrackedUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxTrackedUser.h; sourceTree = "<group>"; };
 		3078192E13028E5200D8873A /* ofxUserGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUserGenerator.cpp; sourceTree = "<group>"; };
 		3078192F13028E5200D8873A /* ofxUserGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxUserGenerator.h; sourceTree = "<group>"; };
-		8917CAC513084E4600ACBF05 /* davy.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = davy.jpg; sourceTree = "<group>"; };
 		8917CAC813084E4600ACBF05 /* FeatureExtraction.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FeatureExtraction.ini; sourceTree = "<group>"; };
 		8917CAC913084E4600ACBF05 /* s.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = s.dat; sourceTree = "<group>"; };
 		8917CACA13084E4600ACBF05 /* modules.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = modules.xml; sourceTree = "<group>"; };
@@ -217,7 +216,6 @@
 		8917CADE13084E4600ACBF05 /* libXnVNite.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libXnVNite.dylib; sourceTree = "<group>"; };
 		8917CADF13084E4600ACBF05 /* libXnVCNite.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libXnVCNite.dylib; sourceTree = "<group>"; };
 		8917CAE013084E4600ACBF05 /* libXnDDK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libXnDDK.dylib; sourceTree = "<group>"; };
-		8917CAE113084E4600ACBF05 /* emptyExampleDebug.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; path = emptyExampleDebug.app; sourceTree = "<group>"; };
 		89A1F59613082F7D00D71250 /* freeimage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = freeimage.a; sourceTree = "<group>"; };
 		89A1F59813082F7D00D71250 /* FreeImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FreeImage.h; sourceTree = "<group>"; };
 		89A1F59C13082F7D00D71250 /* GLee.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = GLee.a; sourceTree = "<group>"; };
@@ -460,9 +458,7 @@
 		8917CAC213084E4600ACBF05 /* bin */ = {
 			isa = PBXGroup;
 			children = (
-				E4B69E1C0A3A1BDC003C02F2 /* src */,
 				8917CAC313084E4600ACBF05 /* data */,
-				8917CAE113084E4600ACBF05 /* emptyExampleDebug.app */,
 			);
 			path = bin;
 			sourceTree = "<group>";
@@ -470,20 +466,11 @@
 		8917CAC313084E4600ACBF05 /* data */ = {
 			isa = PBXGroup;
 			children = (
-				8917CAC413084E4600ACBF05 /* images */,
 				8917CAC613084E4600ACBF05 /* openni */,
 			);
 			path = data;
 			sourceTree = "<group>";
 		};
-		8917CAC413084E4600ACBF05 /* images */ = {
-			isa = PBXGroup;
-			children = (
-				8917CAC513084E4600ACBF05 /* davy.jpg */,
-			);
-			path = images;
-			sourceTree = "<group>";
-		};
 		8917CAC613084E4600ACBF05 /* openni */ = {
 			isa = PBXGroup;
 			children = (
@@ -872,6 +859,7 @@
 			children = (
 				E4B69B5B0A3A1756003C02F2 /* IdyomTracker.app */,
 				E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */,
+				E4B69E1C0A3A1BDC003C02F2 /* src */,
 				8917CAC213084E4600ACBF05 /* bin */,
 				E4C2422310CC54B6004149E2 /* openFrameworks */,
 				BB4B014C10F69532006C3DED /* addons */,
@@ -887,7 +875,7 @@
 				E4B69E1F0A3A1BDC003C02F2 /* testApp.h */,
 			);
 			path = src;
-			sourceTree = SOURCE_ROOT;
+			sourceTree = "<group>";
 		};
 		E4C2421710CC549C004149E2 /* Products */ = {
 			isa = PBXGroup;
--- a/groupTrackKinect.xcodeproj/samer.mode1v3	Fri Feb 10 19:35:17 2012 +0000
+++ b/groupTrackKinect.xcodeproj/samer.mode1v3	Wed Feb 15 10:55:40 2012 +0000
@@ -229,8 +229,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -254,7 +252,7 @@
 						<dict>
 							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
 							<array>
-								<real>125</real>
+								<real>196</real>
 							</array>
 							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
 							<array>
@@ -266,6 +264,9 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>E4B69B4A0A3A1720003C02F2</string>
+								<string>E4B69E1C0A3A1BDC003C02F2</string>
+								<string>E4C2422310CC54B6004149E2</string>
+								<string>E45BE0360E8CC5DE009D7055</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FAAC04509CD000000102</string>
 								<string>1C37FABC05509CD000000102</string>
@@ -274,12 +275,13 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+									<integer>6</integer>
 									<integer>3</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {125, 680}}</string>
+							<string>{{0, 0}, {196, 680}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -291,11 +293,11 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {142, 698}}</string>
+						<string>{{0, 0}, {213, 698}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
-							<real>125</real>
+							<real>196</real>
 						</array>
 						<key>RubberWindowFrame</key>
 						<string>131 39 945 739 0 0 1280 778 </string>
@@ -303,7 +305,7 @@
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
 					<key>Proportion</key>
-					<string>142pt</string>
+					<string>213pt</string>
 				</dict>
 				<dict>
 					<key>Dock</key>
@@ -326,7 +328,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>3130417714D208430024870E</string>
+										<string>314DCC6414EBC5ED0008B4A4</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -335,7 +337,7 @@
 											<string>31FB947E1385362F00445736</string>
 											<string>31FB94801385362F00445736</string>
 											<string>31E0508113A2622A000BB38F</string>
-											<string>31196C5B1427B83500377BAF</string>
+											<string>314DCC0814EBBD520008B4A4</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -347,7 +349,7 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {798, 0}}</string>
+								<string>{{0, 0}, {727, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
@@ -374,7 +376,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>3130417814D208430024870E</string>
+										<string>314DCC6514EBC5ED0008B4A4</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -385,7 +387,7 @@
 											<string>31E0513613A28A95000BB38F</string>
 											<string>31E0526613A62CF2000BB38F</string>
 											<string>3161917113FDC22700656D14</string>
-											<string>31196C5C1427B83500377BAF</string>
+											<string>314DCC0914EBBD520008B4A4</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -397,22 +399,24 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 5}, {798, 162}}</string>
+								<string>{{0, 5}, {727, 129}}</string>
 								<key>RubberWindowFrame</key>
 								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>162pt</string>
+							<string>129pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>testApp.cpp</string>
+								<string>testApp.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -420,11 +424,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>testApp.cpp</string>
+										<string>testApp.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>3130417914D208430024870E</string>
+										<string>314DCC6614EBC5ED0008B4A4</string>
 										<key>history</key>
 										<array>
 											<string>31FB947B1385362F00445736</string>
@@ -432,13 +436,13 @@
 											<string>31FB947D1385362F00445736</string>
 											<string>31FB94801385362F00445736</string>
 											<string>31E0506413A2448F000BB38F</string>
-											<string>31E051D213A550B6000BB38F</string>
-											<string>318D94CB1418E1DD00C8CEFE</string>
 											<string>31196C5D1427B83500377BAF</string>
 											<string>31196C5E1427B83500377BAF</string>
 											<string>31196C5F1427B83500377BAF</string>
 											<string>31196C601427B83500377BAF</string>
-											<string>31196C621427B83500377BAF</string>
+											<string>314DCC2314EBC1900008B4A4</string>
+											<string>314DCC6014EBC5C30008B4A4</string>
+											<string>314DCC6114EBC5C30008B4A4</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -450,14 +454,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 172}, {798, 521}}</string>
+								<string>{{0, 139}, {727, 554}}</string>
 								<key>RubberWindowFrame</key>
 								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>521pt</string>
+							<string>554pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -470,7 +474,7 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 698}, {798, 0}}</string>
+								<string>{{0, 698}, {727, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>131 39 945 739 0 0 1280 778 </string>
 							</dict>
@@ -481,7 +485,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>798pt</string>
+					<string>727pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -498,9 +502,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>3130417A14D208430024870E</string>
+				<string>314DCC1814EBBD6E0008B4A4</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>3130417B14D208430024870E</string>
+				<string>314DCC1914EBBD6E0008B4A4</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
@@ -640,6 +644,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>314DCC2F14EBC1900008B4A4</string>
+		<string>314DCC3014EBC1900008B4A4</string>
+		<string>1C78EAAD065D492600B07095</string>
+		<string>1CD10A99069EF8BA00B06720</string>
 		<string>31FB94591383ED1900445736</string>
 		<string>/usr/local/src/OpenFrameworks/of_preRelease_v0062_osxSL_FAT/apps/examples/grouptrack/groupTrackKinect.xcodeproj</string>
 	</array>
@@ -660,12 +668,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string></string>
+								<string>testApp.cpp</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -721,7 +731,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>31FB94591383ED1900445736</string>
-				<string>3130417C14D208430024870E</string>
+				<string>314DCC1A14EBBD6E0008B4A4</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -843,13 +853,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>318D94861418AFE200C8CEFE</string>
+				<string>314DCC2714EBC1900008B4A4</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>318D94871418AFE200C8CEFE</string>
-				<string>318D94881418AFE200C8CEFE</string>
-				<string>318D94891418AFE200C8CEFE</string>
-				<string>318D948A1418AFE200C8CEFE</string>
-				<string>318D948B1418AFE200C8CEFE</string>
+				<string>314DCC2814EBC1900008B4A4</string>
+				<string>314DCC2914EBC1900008B4A4</string>
+				<string>314DCC2A14EBC1900008B4A4</string>
+				<string>314DCC2B14EBC1900008B4A4</string>
+				<string>314DCC2C14EBC1900008B4A4</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1003,7 +1013,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>318D948C1418AFE200C8CEFE</string>
+				<string>314DCC2D14EBC1900008B4A4</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
--- a/groupTrackKinect.xcodeproj/samer.pbxuser	Fri Feb 10 19:35:17 2012 +0000
+++ b/groupTrackKinect.xcodeproj/samer.pbxuser	Wed Feb 15 10:55:40 2012 +0000
@@ -35,26 +35,6 @@
 			sepNavVisRange = "{177, 189}";
 		};
 	};
-	31196C5B1427B83500377BAF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
-		name = "testApp.h: 60";
-		rLen = 0;
-		rLoc = 1198;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
-	31196C5C1427B83500377BAF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
-		name = "main.cpp: 12";
-		rLen = 0;
-		rLoc = 307;
-		rType = 0;
-		vrLen = 305;
-		vrLoc = 20;
-	};
 	31196C5D1427B83500377BAF /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = BFA2A38A1315131800EB981C /* ofxOscMessage.h */;
@@ -95,66 +75,96 @@
 		vrLen = 905;
 		vrLoc = 1857;
 	};
-	31196C621427B83500377BAF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 267";
-		rLen = 0;
-		rLoc = 7506;
-		rType = 0;
-		vrLen = 1043;
-		vrLoc = 6743;
-	};
-	3130417714D208430024870E /* PBXTextBookmark */ = {
+	314DCC0814EBBD520008B4A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
 		name = "testApp.h: 60";
 		rLen = 0;
-		rLoc = 1198;
+		rLoc = 1199;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	3130417814D208430024870E /* PBXTextBookmark */ = {
+	314DCC0914EBBD520008B4A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
 		name = "main.cpp: 12";
 		rLen = 0;
 		rLoc = 307;
 		rType = 0;
-		vrLen = 283;
-		vrLoc = 42;
+		vrLen = 258;
+		vrLoc = 67;
 	};
-	3130417914D208430024870E /* PBXTextBookmark */ = {
+	314DCC2314EBC1900008B4A4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+		name = "main.cpp: 9";
+		rLen = 0;
+		rLoc = 210;
+		rType = 0;
+		vrLen = 325;
+		vrLoc = 0;
+	};
+	314DCC6014EBC5C30008B4A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 267";
+		name = "testApp.cpp: 21";
 		rLen = 0;
-		rLoc = 7506;
+		rLoc = 446;
 		rType = 0;
-		vrLen = 996;
-		vrLoc = 5528;
+		vrLen = 1017;
+		vrLoc = 0;
+	};
+	314DCC6114EBC5C30008B4A4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
+		name = "testApp.h: 8";
+		rLen = 0;
+		rLoc = 105;
+		rType = 0;
+		vrLen = 728;
+		vrLoc = 0;
+	};
+	314DCC6414EBC5ED0008B4A4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
+		name = "testApp.h: 60";
+		rLen = 0;
+		rLoc = 1199;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
+	};
+	314DCC6514EBC5ED0008B4A4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+		name = "main.cpp: 12";
+		rLen = 0;
+		rLoc = 307;
+		rType = 0;
+		vrLen = 240;
+		vrLoc = 85;
+	};
+	314DCC6614EBC5ED0008B4A4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
+		name = "testApp.h: 20";
+		rLen = 0;
+		rLoc = 326;
+		rType = 0;
+		vrLen = 729;
+		vrLoc = 0;
 	};
 	3161917113FDC22700656D14 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
 		name = "testApp.cpp: 300";
 		rLen = 0;
-		rLoc = 8291;
+		rLoc = 8451;
 		rType = 0;
 		vrLen = 823;
 		vrLoc = 0;
 	};
-	318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
-		name = "testApp.h: 46";
-		rLen = 0;
-		rLoc = 845;
-		rType = 0;
-		vrLen = 663;
-		vrLoc = 546;
-	};
 	31E0506413A2448F000BB38F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 3078192913028E5200D8873A /* ofxOpenNIRecorder.cpp */;
@@ -170,7 +180,7 @@
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
 		name = "testApp.cpp: 179";
 		rLen = 0;
-		rLoc = 7849;
+		rLoc = 7938;
 		rType = 0;
 		vrLen = 1318;
 		vrLoc = 4478;
@@ -185,22 +195,12 @@
 		vrLen = 517;
 		vrLoc = 1588;
 	};
-	31E051D213A550B6000BB38F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
-		name = "main.cpp: 9";
-		rLen = 0;
-		rLoc = 210;
-		rType = 0;
-		vrLen = 298;
-		vrLoc = 0;
-	};
 	31E0526613A62CF2000BB38F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
 		name = "testApp.h: 29";
 		rLen = 0;
-		rLoc = 582;
+		rLoc = 583;
 		rType = 0;
 		vrLen = 861;
 		vrLoc = 36;
@@ -383,7 +383,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					559,
+					488,
 					20,
 					48,
 					43,
@@ -446,26 +446,26 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 349308166;
-			PBXWorkspaceStateSaveDate = 349308166;
+			PBXPerProjectTemplateStateSaveDate = 350993768;
+			PBXWorkspaceStateSaveDate = 350993768;
 		};
 		perUserProjectItems = {
-			31196C5B1427B83500377BAF /* PBXTextBookmark */ = 31196C5B1427B83500377BAF /* PBXTextBookmark */;
-			31196C5C1427B83500377BAF /* PBXTextBookmark */ = 31196C5C1427B83500377BAF /* PBXTextBookmark */;
 			31196C5D1427B83500377BAF /* PBXTextBookmark */ = 31196C5D1427B83500377BAF /* PBXTextBookmark */;
 			31196C5E1427B83500377BAF /* PBXTextBookmark */ = 31196C5E1427B83500377BAF /* PBXTextBookmark */;
 			31196C5F1427B83500377BAF /* PBXTextBookmark */ = 31196C5F1427B83500377BAF /* PBXTextBookmark */;
 			31196C601427B83500377BAF /* PBXTextBookmark */ = 31196C601427B83500377BAF /* PBXTextBookmark */;
-			31196C621427B83500377BAF /* PBXTextBookmark */ = 31196C621427B83500377BAF /* PBXTextBookmark */;
-			3130417714D208430024870E /* PBXTextBookmark */ = 3130417714D208430024870E /* PBXTextBookmark */;
-			3130417814D208430024870E /* PBXTextBookmark */ = 3130417814D208430024870E /* PBXTextBookmark */;
-			3130417914D208430024870E /* PBXTextBookmark */ = 3130417914D208430024870E /* PBXTextBookmark */;
+			314DCC0814EBBD520008B4A4 /* PBXTextBookmark */ = 314DCC0814EBBD520008B4A4 /* PBXTextBookmark */;
+			314DCC0914EBBD520008B4A4 /* PBXTextBookmark */ = 314DCC0914EBBD520008B4A4 /* PBXTextBookmark */;
+			314DCC2314EBC1900008B4A4 /* PBXTextBookmark */ = 314DCC2314EBC1900008B4A4 /* PBXTextBookmark */;
+			314DCC6014EBC5C30008B4A4 /* PBXTextBookmark */ = 314DCC6014EBC5C30008B4A4 /* PBXTextBookmark */;
+			314DCC6114EBC5C30008B4A4 /* PBXTextBookmark */ = 314DCC6114EBC5C30008B4A4 /* PBXTextBookmark */;
+			314DCC6414EBC5ED0008B4A4 /* PBXTextBookmark */ = 314DCC6414EBC5ED0008B4A4 /* PBXTextBookmark */;
+			314DCC6514EBC5ED0008B4A4 /* PBXTextBookmark */ = 314DCC6514EBC5ED0008B4A4 /* PBXTextBookmark */;
+			314DCC6614EBC5ED0008B4A4 /* PBXTextBookmark */ = 314DCC6614EBC5ED0008B4A4 /* PBXTextBookmark */;
 			3161917113FDC22700656D14 /* PBXTextBookmark */ = 3161917113FDC22700656D14 /* PBXTextBookmark */;
-			318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */ = 318D94CB1418E1DD00C8CEFE /* PBXTextBookmark */;
 			31E0506413A2448F000BB38F /* PBXTextBookmark */ = 31E0506413A2448F000BB38F /* PBXTextBookmark */;
 			31E0508113A2622A000BB38F /* PBXTextBookmark */ = 31E0508113A2622A000BB38F /* PBXTextBookmark */;
 			31E0513613A28A95000BB38F /* PBXTextBookmark */ = 31E0513613A28A95000BB38F /* PBXTextBookmark */;
-			31E051D213A550B6000BB38F /* PBXTextBookmark */ = 31E051D213A550B6000BB38F /* PBXTextBookmark */;
 			31E0526613A62CF2000BB38F /* PBXTextBookmark */ = 31E0526613A62CF2000BB38F /* PBXTextBookmark */;
 			31FB947B1385362F00445736 /* PlistBookmark */ = 31FB947B1385362F00445736 /* PlistBookmark */;
 			31FB947C1385362F00445736 /* PBXTextBookmark */ = 31FB947C1385362F00445736 /* PBXTextBookmark */;
@@ -485,24 +485,24 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {737, 182}}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 182}}";
 			sepNavSelRange = "{307, 0}";
-			sepNavVisRange = "{42, 283}";
+			sepNavVisRange = "{85, 240}";
 			sepNavWindowFrame = "{{19, 215}, {750, 558}}";
 		};
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {737, 4316}}";
-			sepNavSelRange = "{7506, 0}";
-			sepNavVisRange = "{5528, 1320}";
+			sepNavIntBoundsRect = "{{0, 0}, {734, 4485}}";
+			sepNavSelRange = "{8041, 0}";
+			sepNavVisRange = "{7708, 541}";
 			sepNavWindowFrame = "{{19, 215}, {750, 558}}";
 		};
 	};
 	E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {737, 858}}";
-			sepNavSelRange = "{1198, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 845}}";
+			sepNavSelRange = "{1199, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{42, 194}, {750, 558}}";
 		};
--- a/src/testApp.cpp	Fri Feb 10 19:35:17 2012 +0000
+++ b/src/testApp.cpp	Wed Feb 15 10:55:40 2012 +0000
@@ -100,7 +100,7 @@
 
 testApp::testApp(const char *host, int port, int FPS) {
 	ofSetupOpenGL(&window, IMGWIDTH,IMGHEIGHT, OF_WINDOW);
-	ofSetWindowTitle("Idyom Installation Tracker");
+	ofSetWindowTitle("Melody Triangle Tracker");
 	ofSetFrameRate(FPS);
 
 	// initialise OSC sender
@@ -182,7 +182,7 @@
 			for (int i=0, y=0; y<IMGHEIGHT; y++) {
 				for (int x=0; x<IMGWIDTH; x++, i++) {
 					int id=userRawPixels[i];
-					if (id>0) {
+					if (id>0 && id<=MAX_USERS) {
 						stats[id-1].accum(x,y,depthMap[i]);
 						imagePixels[i]=(128/MAX_USERS)*id;
 					} else imagePixels[i] = 255;
@@ -192,7 +192,9 @@
 			for (int i=0, y=0; y<IMGHEIGHT; y++) {
 				for (int x=0; x<IMGWIDTH; x++, i++) {
 					int id=userRawPixels[i];
-					if (id>0) stats[id-1].accum(x,y,depthMap[i]);
+					if (id>0 && id<=MAX_USERS) {
+						stats[id-1].accum(x,y,depthMap[i]);
+					}
 				}
 			}
 		}
@@ -201,6 +203,7 @@
 			if (stats[id0].area()>0) {
 				if (!users[id0].present) {
 					send_osc_i(sender,"/birth",id0+1);
+					send_osc_i(sender,"/randinit",id0+1);
 					send_osc_i(sender,"/start",id0+1);
 					users[id0].present=true;
 				}
@@ -285,6 +288,7 @@
 void testApp::draw(){
 	char buf[64];
 	ofSetColor(255,255,255);
+	ofScale(ofGetWidth()/(float)IMGWIDTH,ofGetHeight()/(float)IMGHEIGHT);
 	
     if (draw_image) userImage.draw(0, 0, IMGWIDTH, IMGHEIGHT);
 	// ofSetColor(0);
@@ -308,7 +312,7 @@
 			// ofRect(coors[0]+IMGWIDTH, (IMGHEIGHT*coors[2])/max_depth, 10, 10);
 		}
 	}
-	if (!got_floor) { //ofSetColor(0,200,0);
+	if (!got_floor) {
 		ofSetColor(255,0,0);
 		ofRect(16,16,16,16);
 	}
@@ -323,6 +327,7 @@
 				floor_pie.vNormal.X, floor_pie.vNormal.Y, floor_pie.vNormal.Z);
 			break;
 		case 't': draw_time = !draw_time; break;
+		case 'F': ofToggleFullscreen(); break;
 	}
 }
 
--- a/src/testApp.h	Fri Feb 10 19:35:17 2012 +0000
+++ b/src/testApp.h	Wed Feb 15 10:55:40 2012 +0000
@@ -5,7 +5,7 @@
 #include <ofxOsc.h>
 #include <XnCppWrapper.h>
 
-#define MAX_USERS 8
+#define MAX_USERS 16
 
 using namespace xn;