2 screens

7 files changed, 272 insertions, 143 deletions

diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index 0c43106..66d87b2 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <map4>
-    <view> 
-        <settings x="0.0" y="0.0" w="0.5" h="1.0" distort="0.0" fov="17.25" targX="0" targY="112" targZ="0" lat="0.0" lng="0.0" dolly="1000" />
+    <view>
+        <settings x="0.000000" y="0.000000" w="1.220703" h="0.140625" distort="0.000000" fov="17.250000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="0.000000" />
     </view>
-    <view> 
-        <settings x="0.5" y="0.0" w="0.5" h="1.0" distort="0.0" fov="17.25" targX="0" targY="112" targZ="0" lat="0.0" lng="0.0" dolly="1000" />
+    <view>
+        <settings x="1.220703" y="0.000000" w="1.220703" h="0.140625" distort="0.000000" fov="17.250000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="0.000000" />
     </view>
 </map4>
diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3
index 4d62f21..008c995 100644
--- a/map4.xcodeproj/tim.mode1v3
+++ b/map4.xcodeproj/tim.mode1v3
@@ -197,7 +197,48 @@
 	<key>Notifications</key>
 	<array/>
 	<key>OpenEditors</key>
-	<array/>
+	<array>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>22D6C6E814BC4A5C00A0C31F</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>ofxXmlSettings.cpp</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>22D6C6E914BC4A5C00A0C31F</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>ofxXmlSettings.cpp</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>22D6C73014BC68B500A0C31F</string>
+						<key>history</key>
+						<array>
+							<string>22D6C6DE14BC49CA00A0C31F</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {976, 1157}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>15 60 976 1198 0 0 1024 1258 </string>
+			</dict>
+		</dict>
+	</array>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>-1</integer>
@@ -272,7 +313,8 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>16</integer>
+									<integer>10</integer>
+									<integer>3</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -296,7 +338,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>2 59 1024 1199 0 0 1024 1258 </string>
+						<string>0 59 1024 1199 0 0 1024 1258 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -314,7 +356,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>keyVar.cpp</string>
+								<string>main.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -322,11 +364,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>keyVar.cpp</string>
+										<string>main.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>22C9B6E014BBB4ED0055B293</string>
+										<string>22D6C72F14BC68B500A0C31F</string>
 										<key>history</key>
 										<array>
 											<string>220EA1EF14925D45004424ED</string>
@@ -336,17 +378,18 @@
 											<string>2257104414B1404F009BC2A4</string>
 											<string>2226A47A14B3C58400A9FC9F</string>
 											<string>2226A47C14B3C58400A9FC9F</string>
-											<string>226875D314B51C4B006FAF1F</string>
 											<string>226875D414B51C4B006FAF1F</string>
 											<string>226875D714B51C4B006FAF1F</string>
-											<string>2206BA7014B5266200484E38</string>
 											<string>2282731214BA65240017A99F</string>
-											<string>22C9B6DA14BBB4ED0055B293</string>
 											<string>22C9B6DB14BBB4ED0055B293</string>
-											<string>22C9B6DC14BBB4ED0055B293</string>
-											<string>22C9B6DD14BBB4ED0055B293</string>
 											<string>22C9B6DE14BBB4ED0055B293</string>
-											<string>22C9B6DF14BBB4ED0055B293</string>
+											<string>22C9B75D14BBB9290055B293</string>
+											<string>22D6C70114BC4B8C00A0C31F</string>
+											<string>22D6C72A14BC68B500A0C31F</string>
+											<string>22D6C72B14BC68B500A0C31F</string>
+											<string>22D6C72C14BC68B500A0C31F</string>
+											<string>22D6C72D14BC68B500A0C31F</string>
+											<string>22D6C72E14BC68B500A0C31F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -358,14 +401,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {816, 1104}}</string>
+								<string>{{0, 0}, {816, 1051}}</string>
 								<key>RubberWindowFrame</key>
-								<string>2 59 1024 1199 0 0 1024 1258 </string>
+								<string>0 59 1024 1199 0 0 1024 1258 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>1104pt</string>
+							<string>1051pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -378,14 +421,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 1109}, {816, 49}}</string>
+								<string>{{0, 1056}, {816, 102}}</string>
 								<key>RubberWindowFrame</key>
-								<string>2 59 1024 1199 0 0 1024 1258 </string>
+								<string>0 59 1024 1199 0 0 1024 1258 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>49pt</string>
+							<string>102pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -404,9 +447,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>22C9B6E114BBB4ED0055B293</string>
+				<string>22D6C6E614BC4A5C00A0C31F</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>22C9B6E214BBB4ED0055B293</string>
+				<string>22D6C6E714BC4A5C00A0C31F</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -544,12 +587,16 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>22D6C6F414BC4A5C00A0C31F</string>
+		<string>22D6C6F514BC4A5C00A0C31F</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>22C080D114918C2F00E6B4C0</string>
+		<string>22D6C6E814BC4A5C00A0C31F</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>/Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>2 59 1024 1199 0 0 1024 1258 </string>
+	<string>0 59 1024 1199 0 0 1024 1258 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -570,7 +617,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>keyVar.cpp</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -587,8 +634,6 @@
 							<string>183pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -628,7 +673,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>22C080D114918C2F00E6B4C0</string>
-				<string>22C9B6A314BBB08B0055B293</string>
+				<string>22D6C6EB14BC4A5C00A0C31F</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -672,8 +717,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {316, 203}}</string>
-											<string>{{316, 0}, {378, 203}}</string>
+											<string>{{0, 0}, {347, 190}}</string>
+											<string>{{0, 190}, {347, 191}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -688,8 +733,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {694, 203}}</string>
-											<string>{{0, 203}, {694, 178}}</string>
+											<string>{{0, 0}, {347, 381}}</string>
+											<string>{{347, 0}, {347, 381}}</string>
 										</array>
 									</dict>
 								</dict>
@@ -719,10 +764,10 @@
 										<string>Value</string>
 										<real>85</real>
 										<string>Summary</string>
-										<real>148</real>
+										<real>117</real>
 									</array>
 									<key>Frame</key>
-									<string>{{316, 0}, {378, 203}}</string>
+									<string>{{0, 190}, {347, 191}}</string>
 									<key>RubberWindowFrame</key>
 									<string>165 649 694 422 0 0 1024 1258 </string>
 								</dict>
@@ -750,13 +795,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>22C9B6A414BBB08B0055B293</string>
+				<string>22D6C6EC14BC4A5C00A0C31F</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>22C9B6A514BBB08B0055B293</string>
-				<string>22C9B6A614BBB08B0055B293</string>
-				<string>22C9B6A714BBB08B0055B293</string>
-				<string>22C9B6A814BBB08B0055B293</string>
-				<string>22C9B6A914BBB08B0055B293</string>
+				<string>22D6C6ED14BC4A5C00A0C31F</string>
+				<string>22D6C6EE14BC4A5C00A0C31F</string>
+				<string>22D6C6EF14BC4A5C00A0C31F</string>
+				<string>22D6C6F014BC4A5C00A0C31F</string>
+				<string>22D6C6F114BC4A5C00A0C31F</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -889,7 +934,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {1024, 503}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-1024 56 1024 544 -1024 0 1024 600 </string>
+								<string>-1026 55 1024 544 -1024 0 1024 600 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugCLIModule</string>
@@ -912,13 +957,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2282731F14BA65240017A99F</string>
+				<string>22D6C6F214BC4A5C00A0C31F</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.consoleV3</string>
 			<key>WindowString</key>
-			<string>-1024 56 1024 544 -1024 0 1024 600 </string>
+			<string>-1026 55 1024 544 -1024 0 1024 600 </string>
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
diff --git a/map4.xcodeproj/tim.pbxuser b/map4.xcodeproj/tim.pbxuser
index f9818bd..026e2c8 100644
--- a/map4.xcodeproj/tim.pbxuser
+++ b/map4.xcodeproj/tim.pbxuser
@@ -1,15 +1,5 @@
 // !$*UTF8*$!
 {
-	2206BA7014B5266200484E38 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
-		name = "main.cpp: 24";
-		rLen = 0;
-		rLoc = 437;
-		rType = 0;
-		vrLen = 802;
-		vrLoc = 0;
-	};
 	220EA1CD14925A00004424ED /* ofx3DModelLoader.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {586, 351}}";
@@ -56,6 +46,8 @@
 		showTypeColumn = 0;
 		sourceDirectories = (
 		);
+		variableFormatDictionary = {
+		};
 	};
 	2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -86,7 +78,7 @@
 	};
 	223429A114AF70B100D0B406 /* keyVar.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1071}}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 998}}";
 			sepNavSelRange = "{1511, 0}";
 			sepNavVisRange = "{0, 1514}";
 			sepNavWindowFrame = "{{15, 4}, {976, 1254}}";
@@ -101,9 +93,9 @@
 	};
 	223429A314AF70B100D0B406 /* viewpoint.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1419, 1586}}";
-			sepNavSelRange = "{4222, 0}";
-			sepNavVisRange = "{1729, 2669}";
+			sepNavIntBoundsRect = "{{0, 0}, {1419, 1599}}";
+			sepNavSelRange = "{38, 0}";
+			sepNavVisRange = "{1937, 2479}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
@@ -155,16 +147,6 @@
 		vrLen = 830;
 		vrLoc = 0;
 	};
-	226875D314B51C4B006FAF1F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
-		name = "mapUtils.cpp: 11";
-		rLen = 0;
-		rLoc = 171;
-		rType = 0;
-		vrLen = 739;
-		vrLoc = 0;
-	};
 	226875D414B51C4B006FAF1F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 22EF433914AF89EF003C3497 /* mapUtils.h */;
@@ -250,6 +232,14 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
+	22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {917, 9282}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{557, 2291}";
+			sepNavWindowFrame = "{{15, 4}, {976, 1254}}";
+		};
+	};
 	22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {943, 2301}}";
@@ -257,16 +247,6 @@
 			sepNavVisRange = "{0, 3177}";
 		};
 	};
-	22C9B6DA14BBB4ED0055B293 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		name = "testApp.cpp: 88";
-		rLen = 0;
-		rLoc = 2285;
-		rType = 0;
-		vrLen = 2377;
-		vrLoc = 966;
-	};
 	22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 223429A214AF70B100D0B406 /* keyVar.h */;
@@ -277,17 +257,74 @@
 		vrLen = 548;
 		vrLoc = 0;
 	};
-	22C9B6DC14BBB4ED0055B293 /* PBXTextBookmark */ = {
+	22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */;
+		name = "ofxXmlSettings.h: 73";
+		rLen = 1;
+		rLoc = 2722;
+		rType = 0;
+		vrLen = 3177;
+		vrLoc = 0;
+	};
+	22C9B74D14BBB6150055B293 /* tinyxml.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {755, 23634}}";
+			sepNavSelRange = "{1056, 0}";
+			sepNavVisRange = "{0, 2259}";
+		};
+	};
+	22C9B75D14BBB9290055B293 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */;
+		name = "keyVar.cpp: 56";
+		rLen = 0;
+		rLoc = 1511;
+		rType = 0;
+		vrLen = 1514;
+		vrLoc = 0;
+	};
+	22D6C6DE14BC49CA00A0C31F /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */;
+	};
+	22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22D6C70214BC4B8C00A0C31F /* basic_string.h */;
+		name = "basic_string.h: 493";
+		rLen = 0;
+		rLoc = 16054;
+		rType = 0;
+		vrLen = 2466;
+		vrLoc = 14602;
+	};
+	22D6C70214BC4B8C00A0C31F /* basic_string.h */ = {
+		isa = PBXFileReference;
+		name = basic_string.h;
+		path = "/usr/include/c++/4.2.1/bits/basic_string.h";
+		sourceTree = "<absolute>";
+	};
+	22D6C72A14BC68B500A0C31F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 223429A314AF70B100D0B406 /* viewpoint.cpp */;
-		name = "viewpoint.cpp: 116";
+		name = "viewpoint.cpp: 2";
 		rLen = 0;
-		rLoc = 4222;
+		rLoc = 38;
 		rType = 0;
-		vrLen = 2669;
-		vrLoc = 1729;
+		vrLen = 2479;
+		vrLoc = 1937;
 	};
-	22C9B6DD14BBB4ED0055B293 /* PBXTextBookmark */ = {
+	22D6C72B14BC68B500A0C31F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22EF433814AF89EF003C3497 /* mapUtils.cpp */;
+		name = "mapUtils.cpp: 105";
+		rLen = 0;
+		rLoc = 4558;
+		rType = 0;
+		vrLen = 3885;
+		vrLoc = 0;
+	};
+	22D6C72C14BC68B500A0C31F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
 		name = "testApp.h: 28";
@@ -297,39 +334,51 @@
 		vrLen = 1415;
 		vrLoc = 0;
 	};
-	22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */ = {
+	22D6C72D14BC68B500A0C31F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 22C9B6AC14BBB0B90055B293 /* ofxXmlSettings.h */;
-		name = "ofxXmlSettings.h: 73";
-		rLen = 1;
-		rLoc = 2722;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 71";
+		rLen = 0;
+		rLoc = 1797;
 		rType = 0;
-		vrLen = 3177;
+		vrLen = 2041;
 		vrLoc = 0;
 	};
-	22C9B6DF14BBB4ED0055B293 /* PBXTextBookmark */ = {
+	22D6C72E14BC68B500A0C31F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		comments = "Expected `;' before '}' token";
-		fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */;
-		rLen = 1;
-		rLoc = 56;
-		rType = 1;
+		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+		name = "main.cpp: 20";
+		rLen = 0;
+		rLoc = 442;
+		rType = 0;
+		vrLen = 815;
+		vrLoc = 0;
 	};
-	22C9B6E014BBB4ED0055B293 /* PBXTextBookmark */ = {
+	22D6C72F14BC68B500A0C31F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 223429A114AF70B100D0B406 /* keyVar.cpp */;
-		name = "keyVar.cpp: 56";
+		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
+		name = "main.cpp: 28";
 		rLen = 0;
-		rLoc = 1511;
+		rLoc = 816;
 		rType = 0;
-		vrLen = 1514;
+		vrLen = 820;
 		vrLoc = 0;
 	};
+	22D6C73014BC68B500A0C31F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 22C9B6AB14BBB0B90055B293 /* ofxXmlSettings.cpp */;
+		name = "ofxXmlSettings.cpp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 2291;
+		vrLoc = 557;
+	};
 	22EF433814AF89EF003C3497 /* mapUtils.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {761, 1248}}";
-			sepNavSelRange = "{171, 0}";
-			sepNavVisRange = "{0, 739}";
+			sepNavIntBoundsRect = "{{0, 0}, {761, 1547}}";
+			sepNavSelRange = "{4558, 0}";
+			sepNavVisRange = "{0, 3885}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
@@ -347,13 +396,15 @@
 		addToTargets = (
 			E4B69B5A0A3A1756003C02F2 /* 3dnav */,
 		);
+		breakpoints = (
+		);
 		codeSenseManager = 22C080CD1491244000E6B4C0 /* Code sense */;
 		executables = (
 			220EA2591492649C004424ED /* 3dnav */,
 		);
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingDirectionKey = 1;
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
@@ -374,29 +425,32 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 347846098;
-			PBXWorkspaceStateSaveDate = 347846098;
+			PBXPerProjectTemplateStateSaveDate = 347882548;
+			PBXWorkspaceStateSaveDate = 347882548;
 		};
 		perUserProjectItems = {
-			2206BA7014B5266200484E38 = 2206BA7014B5266200484E38 /* PBXTextBookmark */;
-			220EA1EF14925D45004424ED = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
-			2226A47A14B3C58400A9FC9F = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
-			2226A47C14B3C58400A9FC9F = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
-			2257104214B1404F009BC2A4 = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
-			2257104414B1404F009BC2A4 = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
-			226875D314B51C4B006FAF1F = 226875D314B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D414B51C4B006FAF1F = 226875D414B51C4B006FAF1F /* PBXTextBookmark */;
-			226875D714B51C4B006FAF1F = 226875D714B51C4B006FAF1F /* PBXTextBookmark */;
-			2282731214BA65240017A99F = 2282731214BA65240017A99F /* PBXTextBookmark */;
-			22AFFECF149798EE0079DDC5 = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
-			22AFFED1149798EE0079DDC5 = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
-			22C9B6DA14BBB4ED0055B293 = 22C9B6DA14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6DB14BBB4ED0055B293 = 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6DC14BBB4ED0055B293 = 22C9B6DC14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6DD14BBB4ED0055B293 = 22C9B6DD14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6DE14BBB4ED0055B293 = 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6DF14BBB4ED0055B293 = 22C9B6DF14BBB4ED0055B293 /* PBXTextBookmark */;
-			22C9B6E014BBB4ED0055B293 = 22C9B6E014BBB4ED0055B293 /* PBXTextBookmark */;
+			220EA1EF14925D45004424ED /* PBXTextBookmark */ = 220EA1EF14925D45004424ED /* PBXTextBookmark */;
+			2226A47A14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47A14B3C58400A9FC9F /* PBXTextBookmark */;
+			2226A47C14B3C58400A9FC9F /* PBXTextBookmark */ = 2226A47C14B3C58400A9FC9F /* PBXTextBookmark */;
+			2257104214B1404F009BC2A4 /* PBXTextBookmark */ = 2257104214B1404F009BC2A4 /* PBXTextBookmark */;
+			2257104414B1404F009BC2A4 /* PBXTextBookmark */ = 2257104414B1404F009BC2A4 /* PBXTextBookmark */;
+			226875D414B51C4B006FAF1F /* PBXTextBookmark */ = 226875D414B51C4B006FAF1F /* PBXTextBookmark */;
+			226875D714B51C4B006FAF1F /* PBXTextBookmark */ = 226875D714B51C4B006FAF1F /* PBXTextBookmark */;
+			2282731214BA65240017A99F /* PBXTextBookmark */ = 2282731214BA65240017A99F /* PBXTextBookmark */;
+			22AFFECF149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFECF149798EE0079DDC5 /* PBXTextBookmark */;
+			22AFFED1149798EE0079DDC5 /* PBXTextBookmark */ = 22AFFED1149798EE0079DDC5 /* PBXTextBookmark */;
+			22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */ = 22C9B6DB14BBB4ED0055B293 /* PBXTextBookmark */;
+			22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */ = 22C9B6DE14BBB4ED0055B293 /* PBXTextBookmark */;
+			22C9B75D14BBB9290055B293 /* PBXTextBookmark */ = 22C9B75D14BBB9290055B293 /* PBXTextBookmark */;
+			22D6C6DE14BC49CA00A0C31F /* PBXBookmark */ = 22D6C6DE14BC49CA00A0C31F /* PBXBookmark */;
+			22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */ = 22D6C70114BC4B8C00A0C31F /* PBXTextBookmark */;
+			22D6C72A14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72A14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C72B14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72B14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C72C14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72C14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C72D14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72D14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C72E14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72E14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C72F14BC68B500A0C31F /* PBXTextBookmark */ = 22D6C72F14BC68B500A0C31F /* PBXTextBookmark */;
+			22D6C73014BC68B500A0C31F /* PBXTextBookmark */ = 22D6C73014BC68B500A0C31F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 22C080CC1491244000E6B4C0 /* Source Control */;
 		userBuildSettings = {
@@ -410,23 +464,23 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 455}}";
-			sepNavSelRange = "{437, 0}";
-			sepNavVisRange = "{0, 802}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 1019}}";
+			sepNavSelRange = "{816, 0}";
+			sepNavVisRange = "{0, 820}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 2431}}";
-			sepNavSelRange = "{2285, 0}";
-			sepNavVisRange = "{966, 2377}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 2626}}";
+			sepNavSelRange = "{1797, 0}";
+			sepNavVisRange = "{0, 2041}";
 			sepNavWindowFrame = "{{15, 4}, {976, 574}}";
 		};
 	};
 	E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {755, 1072}}";
+			sepNavIntBoundsRect = "{{0, 0}, {755, 1019}}";
 			sepNavSelRange = "{619, 0}";
 			sepNavVisRange = "{0, 1415}";
 			sepNavWindowFrame = "{{15, 4}, {976, 1254}}";
diff --git a/src/main.cpp b/src/main.cpp
index 57716da..9527ea6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 800,400, OF_WINDOW);			// <-------- setup the GL context
+	ofSetupOpenGL(&window, 1600,480, OF_FULLSCREEN);			// <-------- setup the GL context
 	glutIgnoreKeyRepeat(1);
 	glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!!
 	printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
diff --git a/src/mapUtils.cpp b/src/mapUtils.cpp
index c6a1955..3787bf4 100644
--- a/src/mapUtils.cpp
+++ b/src/mapUtils.cpp
@@ -84,10 +84,33 @@ void drawBoard(float x,float y,float z) {
 		for (int j=0;j<4;j++) {
 			cx=((i%2)*16)+(j*32)-56;
 			cz=(i*16)-56;
-			glVertex3f(cx+8, 0, cz-8);
-			glVertex3f(cx+8, 0, cz+8);
-			glVertex3f(cx-8, 0, cz+8);
-			glVertex3f(cx-8, 0, cz-8);
+			if ((i==7)&&(j==3)) { //draw special square
+				glVertex3f(cx+8, 0, cz-8);
+				glVertex3f(cx+8, 0, cz+8);
+				glVertex3f(cx+4, 0, cz+4);
+				glVertex3f(cx+4, 0, cz-4);
+				
+				glVertex3f(cx+4, 0, cz+4);
+				glVertex3f(cx+8, 0, cz+8);
+				glVertex3f(cx-8, 0, cz+8);
+				glVertex3f(cx-4, 0, cz+4);
+				
+				glVertex3f(cx-4, 0, cz-4);
+				glVertex3f(cx-4, 0, cz+4);
+				glVertex3f(cx-8, 0, cz+8);
+				glVertex3f(cx-8, 0, cz-8);
+				
+				glVertex3f(cx+8, 0, cz-8);
+				glVertex3f(cx+4, 0, cz-4);
+				glVertex3f(cx-4, 0, cz-4);
+				glVertex3f(cx-8, 0, cz-8);
+			}
+			else {
+				glVertex3f(cx+8, 0, cz-8);
+				glVertex3f(cx+8, 0, cz+8);
+				glVertex3f(cx-8, 0, cz+8);
+				glVertex3f(cx-8, 0, cz-8);
+			}
 		}
 	}
 	glEnd();
diff --git a/src/testApp.cpp b/src/testApp.cpp
index b93f4be..e7921d4 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -23,7 +23,7 @@ void testApp::setup(){
 
     //ofDisableArbTex();
 
-   texture.loadMovie("gradblend01.mov");
+   texture.loadMovie("stripey2.mov");
    texture.play();
 
    mode=CALIBRATE;
@@ -65,8 +65,10 @@ void testApp::draw(){
         }
     views[i].end();
 	}
-    ofSetHexColor(0xFFFFFF);
-    ofDrawBitmapString("fps: "+ofToString(ofGetFrameRate(), 2), 10, 15);
+	if (mode==CALIBRATE) {
+		ofSetHexColor(0xFFFFFF);
+		ofDrawBitmapString("fps: "+ofToString(ofGetFrameRate(), 2), 10, 15);
+	}
 }
 
 //--------------------------------------------------------------
@@ -92,6 +94,10 @@ void testApp::keyPressed(int key){
 		case '3':
             activeView=1;
             break;
+		case 'p':
+            saveSettings();
+			printf("saved settings.xml\n");
+            break;
 
     }
 
diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 2b7cd7a..a61b235 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -1,5 +1,5 @@
 #include "viewpoint.h"
-#define DEBUG 1
+#define DEBUG 0
 
 void viewpoint::setup(map<string,string>&settings){
     //setup(float w, float h, float x, float y) {
@@ -23,7 +23,7 @@ void viewpoint::setup(map<string,string>&settings){
 	vars[4].set('u','n',ofToFloat(settings["lat"]),10,1.0,3.0);
 	vars[5].set('j','h',ofToFloat(settings["lng"]),10,1.0,3.0);
 	vars[6].set('o','l',ofToFloat(settings["dolly"]),10,1.0,3.0);
-	vars[7].set('q','a',0,ofToFloat(settings["distort"]),1.0,3.0);
+	vars[7].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0);
 
 	light.enable();
 	light.setDirectional();
@@ -41,6 +41,7 @@ double viewpoint::getSetting(const string& setting){
 	if (setting=="lng") return vars[5].getVal();
 	if (setting=="dolly") return vars[7].getVal();
 	if (setting=="distort") return vars[7].getVal();
+	return 0.0;
 }
 //--------------------------------------------------------------
 void viewpoint::setLight(){