dual controls

1 files changed, 86 insertions, 98 deletions

diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser
index b0d5bf8..c80cd8f 100644
--- a/map4.xcodeproj/tim.pbxuser
+++ b/map4.xcodeproj/tim.pbxuser
@@ -1,5 +1,35 @@
 // !$*UTF8*$!
 {
+	2206BA6F14B5266200484E38 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
+		name = "viewpoint.cpp: 60";
+		rLen = 0;
+		rLoc = 1541;
+		rType = 0;
+		vrLen = 1181;
+		vrLoc = 1682;
+	};
+	2206BA7014B5266200484E38 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+		name = "main.cpp: 24";
+		rLen = 0;
+		rLoc = 437;
+		rType = 0;
+		vrLen = 802;
+		vrLoc = 0;
+	};
+	2206BA7114B5266200484E38 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
+		name = "testApp.h: 57";
+		rLen = 8;
+		rLoc = 1261;
+		rType = 0;
+		vrLen = 620;
+		vrLoc = 671;
+	};
 	220EA1CD14925A00004424ED /* ofx3DModelLoader.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {586, 351}}";
@@ -47,16 +77,6 @@
 		sourceDirectories = (
 		);
 	};
-	2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
-		name = "testApp.h: 51";
-		rLen = 0;
-		rLoc = 1161;
-		rType = 0;
-		vrLen = 629;
-		vrLoc = 649;
-	};
 	2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2226A47B14B3C58400A9FC9F /* ofLight.h */;
@@ -100,9 +120,9 @@
 	};
 	223429A314AF70B100D0B406 /* viewpoint.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1274}}";
-			sepNavSelRange = "{108, 11}";
-			sepNavVisRange = "{0, 827}";
+			sepNavIntBoundsRect = "{{0, 0}, {1076, 1235}}";
+			sepNavSelRange = "{1541, 0}";
+			sepNavVisRange = "{1682, 1181}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
@@ -113,16 +133,6 @@
 			sepNavVisRange = "{0, 492}";
 		};
 	};
-	22570F8114B111F1009BC2A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
-		name = "main.cpp: 9";
-		rLen = 0;
-		rLoc = 441;
-		rType = 0;
-		vrLen = 448;
-		vrLoc = 0;
-	};
 	22570FEC14B131A0009BC2A4 /* ofCamera.h */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
@@ -164,23 +174,6 @@
 		vrLen = 830;
 		vrLoc = 0;
 	};
-	226875CF14B51C34006FAF1F /* ofRectangle.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = ofRectangle.h;
-		path = /Developer/Library/openFrameworks/libs/openFrameworks/types/ofRectangle.h;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {917, 650}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{194, 914}";
-			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
-		};
-	};
-	226875D014B51C34006FAF1F /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 226875CF14B51C34006FAF1F /* ofRectangle.h */;
-	};
 	226875D314B51C4B006FAF1F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
@@ -231,45 +224,41 @@
 		vrLen = 492;
 		vrLoc = 0;
 	};
-	226875D814B51C4B006FAF1F /* PBXTextBookmark */ = {
+	2282731214BA65240017A99F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 32";
+		fRef = 2282731314BA65240017A99F /* iostream */;
+		name = "iostream: 77";
 		rLen = 0;
-		rLoc = 783;
+		rLoc = 2900;
 		rType = 0;
-		vrLen = 768;
-		vrLoc = 133;
+		vrLen = 2990;
+		vrLoc = 0;
 	};
-	226875D914B51C4B006FAF1F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
-		name = "viewpoint.cpp: 49";
-		rLen = 0;
-		rLoc = 1301;
-		rType = 0;
-		vrLen = 953;
-		vrLoc = 39;
+	2282731314BA65240017A99F /* iostream */ = {
+		isa = PBXFileReference;
+		name = iostream;
+		path = "/Developer/SDKs/MacOSX10.6.sdk/usr/include/c++/4.2.1/iostream";
+		sourceTree = "<absolute>";
 	};
-	226875DA14B51C4B006FAF1F /* PBXTextBookmark */ = {
+	2282731414BA65240017A99F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
-		name = "viewpoint.cpp: 5";
-		rLen = 11;
-		rLoc = 108;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 79";
+		rLen = 0;
+		rLoc = 2011;
 		rType = 0;
-		vrLen = 827;
-		vrLoc = 0;
+		vrLen = 1899;
+		vrLoc = 1553;
 	};
-	226875DD14B51C4B006FAF1F /* PBXTextBookmark */ = {
+	2282731514BA65240017A99F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 226875CF14B51C34006FAF1F /* ofRectangle.h */;
-		name = "ofRectangle.h: 1";
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 109";
 		rLen = 0;
-		rLoc = 0;
+		rLoc = 2806;
 		rType = 0;
-		vrLen = 913;
-		vrLoc = 195;
+		vrLen = 2098;
+		vrLoc = 1124;
 	};
 	22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -368,29 +357,28 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 347413595;
-			PBXWorkspaceStateSaveDate = 347413595;
+			PBXPerProjectTemplateStateSaveDate = 347757444;
+			PBXWorkspaceStateSaveDate = 347757444;
 		};
 		perUserProjectItems = {
-			220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
-			2226A46F14B3BF5C00A9FC9F = 2226A46F14B3BF5C00A9FC9F /* PBXTextBookmark */;
-			2226A47A14B3C58400A9FC9F = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
-			2226A47C14B3C58400A9FC9F = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
-			22570F8114B111F1009BC2A4 = 22570F8114B111F1009BC2A4 /* PBXTextBookmark */;
-			2257104214B1404F009BC2A4 = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
-			2257104414B1404F009BC2A4 = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
-			226875D014B51C34006FAF1F = 226875D014B51C34006FAF1F /* PBXBookmark */;
-			226875D314B51C4B006FAF1F = 226875D314B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D414B51C4B006FAF1F = 226875D414B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D514B51C4B006FAF1F = 226875D514B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D614B51C4B006FAF1F = 226875D614B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D714B51C4B006FAF1F = 226875D714B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D814B51C4B006FAF1F = 226875D814B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D914B51C4B006FAF1F = 226875D914B51C4B006FAF1F /* PBXTextBookmark */;
-			226875DA14B51C4B006FAF1F = 226875DA14B51C4B006FAF1F /* PBXTextBookmark */;
-			226875DD14B51C4B006FAF1F = 226875DD14B51C4B006FAF1F /* PBXTextBookmark */;
-			22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
-			22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
+			2206BA6F14B5266200484E38 /* PBXTextBookmark */ = 2206BA6F14B5266200484E38 /* PBXTextBookmark */;
+			2206BA7014B5266200484E38 /* PBXTextBookmark */ = 2206BA7014B5266200484E38 /* PBXTextBookmark */;
+			2206BA7114B5266200484E38 /* PBXTextBookmark */ = 2206BA7114B5266200484E38 /* PBXTextBookmark */;
+			220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
+			2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
+			2226A47C14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
+			2257104214B1404F009BC2A4 /* PBXTextBookmark */ = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
+			2257104414B1404F009BC2A4 /* PBXTextBookmark */ = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
+			226875D314B51C4B006FAF1F /* PBXTextBookmark */ = 226875D314B51C4B006FAF1F /* PBXTextBookmark */;
+			226875D414B51C4B006FAF1F /* PBXTextBookmark */ = 226875D414B51C4B006FAF1F /* PBXTextBookmark */;
+			226875D514B51C4B006FAF1F /* PBXTextBookmark */ = 226875D514B51C4B006FAF1F /* PBXTextBookmark */;
+			226875D614B51C4B006FAF1F /* PBXTextBookmark */ = 226875D614B51C4B006FAF1F /* PBXTextBookmark */;
+			226875D714B51C4B006FAF1F /* PBXTextBookmark */ = 226875D714B51C4B006FAF1F /* PBXTextBookmark */;
+			2282731214BA65240017A99F /* PBXTextBookmark */ = 2282731214BA65240017A99F /* PBXTextBookmark */;
+			2282731414BA65240017A99F /* PBXTextBookmark */ = 2282731414BA65240017A99F /* PBXTextBookmark */;
+			2282731514BA65240017A99F /* PBXTextBookmark */ = 2282731514BA65240017A99F /* PBXTextBookmark */;
+			22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
+			22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */;
 		userBuildSettings = {
@@ -404,25 +392,25 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
-			sepNavSelRange = "{832, 0}";
-			sepNavVisRange = "{0, 832}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 455}}";
+			sepNavSelRange = "{437, 0}";
+			sepNavVisRange = "{0, 802}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1664}}";
-			sepNavSelRange = "{783, 0}";
-			sepNavVisRange = "{133, 768}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 1833}}";
+			sepNavSelRange = "{2806, 0}";
+			sepNavVisRange = "{1124, 2098}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
 	E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 793}}";
-			sepNavSelRange = "{1161, 0}";
-			sepNavVisRange = "{649, 629}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 806}}";
+			sepNavSelRange = "{1261, 8}";
+			sepNavVisRange = "{671, 620}";
 		};
 	};
 	E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {