summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--map4.xcodeproj/tim.mode1v3134
-rw-r--r--map4.xcodeproj/tim.pbxuser184
-rw-r--r--src/testApp.cpp13
3 files changed, 142 insertions, 189 deletions
diff --git a/map4.xcodeproj/tim.mode1v3 b/map4.xcodeproj/tim.mode1v3
index d42c04d..e0536a1 100644
--- a/map4.xcodeproj/tim.mode1v3
+++ b/map4.xcodeproj/tim.mode1v3
@@ -197,48 +197,7 @@
<key>Notifications</key>
<array/>
<key>OpenEditors</key>
- <array>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>226875DB14B51C4B006FAF1F</string>
- <key>PBXProjectModuleLabel</key>
- <string>ofRectangle.h</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>226875DC14B51C4B006FAF1F</string>
- <key>PBXProjectModuleLabel</key>
- <string>ofRectangle.h</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>226875DD14B51C4B006FAF1F</string>
- <key>history</key>
- <array>
- <string>226875D014B51C34006FAF1F</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, 477}}</string>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <false/>
- <key>RubberWindowFrame</key>
- <string>15 60 976 518 0 0 1024 578 </string>
- </dict>
- </dict>
- </array>
+ <array/>
<key>PerspectiveWidths</key>
<array>
<integer>-1</integer>
@@ -312,13 +271,13 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>8</integer>
+ <integer>11</integer>
<integer>3</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 460}}</string>
+ <string>{{0, 0}, {186, 1140}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -330,14 +289,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {203, 478}}</string>
+ <string>{{0, 0}, {203, 1158}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>186</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>0 59 1024 1199 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -355,7 +314,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>viewpoint.cpp</string>
+ <string>testApp.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -363,20 +322,18 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>viewpoint.cpp</string>
+ <string>testApp.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>226875DA14B51C4B006FAF1F</string>
+ <string>2282731514BA65240017A99F</string>
<key>history</key>
<array>
<string>220EA1EF14925D45004424ED</string>
<string>22AFFECF149798EE0079DDC5</string>
<string>22AFFED1149798EE0079DDC5</string>
- <string>22570F8114B111F1009BC2A4</string>
<string>2257104214B1404F009BC2A4</string>
<string>2257104414B1404F009BC2A4</string>
- <string>2226A46F14B3BF5C00A9FC9F</string>
<string>2226A47A14B3C58400A9FC9F</string>
<string>2226A47C14B3C58400A9FC9F</string>
<string>226875D314B51C4B006FAF1F</string>
@@ -384,8 +341,11 @@
<string>226875D514B51C4B006FAF1F</string>
<string>226875D614B51C4B006FAF1F</string>
<string>226875D714B51C4B006FAF1F</string>
- <string>226875D814B51C4B006FAF1F</string>
- <string>226875D914B51C4B006FAF1F</string>
+ <string>2206BA6F14B5266200484E38</string>
+ <string>2206BA7014B5266200484E38</string>
+ <string>2206BA7114B5266200484E38</string>
+ <string>2282731214BA65240017A99F</string>
+ <string>2282731414BA65240017A99F</string>
</array>
</dict>
<key>SplitCount</key>
@@ -397,14 +357,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {816, 429}}</string>
+ <string>{{0, 0}, {816, 1105}}</string>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>0 59 1024 1199 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>429pt</string>
+ <string>1105pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -417,14 +377,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 434}, {816, 44}}</string>
+ <string>{{0, 1110}, {816, 48}}</string>
<key>RubberWindowFrame</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>0 59 1024 1199 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>44pt</string>
+ <string>48pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -443,9 +403,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>226875A714B5000F006FAF1F</string>
+ <string>2282731614BA65240017A99F</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>226875A814B5000F006FAF1F</string>
+ <string>2282731714BA65240017A99F</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -583,17 +543,15 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>226875E714B51C4B006FAF1F</string>
- <string>226875E814B51C4B006FAF1F</string>
- <string>1C78EAAD065D492600B07095</string>
+ <string>2282732014BA65240017A99F</string>
+ <string>2282732114BA65240017A99F</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>22C080D114918C2F00E6B4C0</string>
<string>/Developer/Library/openFrameworks/custom/dev/map4/map4.xcodeproj</string>
- <string>1C530D57069F1CE1000CFCEE</string>
- <string>226875DB14B51C4B006FAF1F</string>
+ <string>1C78EAAD065D492600B07095</string>
</array>
<key>WindowString</key>
- <string>0 59 1024 519 0 0 1024 578 </string>
+ <string>0 59 1024 1199 0 0 1024 1258 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -623,7 +581,7 @@
<key>Frame</key>
<string>{{0, 0}, {803, 183}}</string>
<key>RubberWindowFrame</key>
- <string>139 95 803 465 0 0 1024 578 </string>
+ <string>139 560 803 465 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -647,7 +605,7 @@
<key>Frame</key>
<string>{{0, 188}, {803, 236}}</string>
<key>RubberWindowFrame</key>
- <string>139 95 803 465 0 0 1024 578 </string>
+ <string>139 560 803 465 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -670,7 +628,7 @@
<key>TableOfContents</key>
<array>
<string>22C080D114918C2F00E6B4C0</string>
- <string>226875A914B5000F006FAF1F</string>
+ <string>2282731814BA65240017A99F</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -679,7 +637,7 @@
<key>WindowContentMinSize</key>
<string>486 300</string>
<key>WindowString</key>
- <string>139 95 803 465 0 0 1024 578 </string>
+ <string>139 560 803 465 0 0 1024 1258 </string>
<key>WindowToolGUID</key>
<string>22C080D114918C2F00E6B4C0</string>
<key>WindowToolIsVisible</key>
@@ -766,10 +724,10 @@
<key>Frame</key>
<string>{{316, 0}, {378, 203}}</string>
<key>RubberWindowFrame</key>
- <string>165 132 694 422 0 0 1024 578 </string>
+ <string>165 649 694 422 0 0 1024 1258 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>165 132 694 422 0 0 1024 578 </string>
+ <string>165 649 694 422 0 0 1024 1258 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -792,18 +750,18 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>226875DE14B51C4B006FAF1F</string>
+ <string>2282731914BA65240017A99F</string>
<string>1C162984064C10D400B95A72</string>
- <string>226875DF14B51C4B006FAF1F</string>
- <string>226875E014B51C4B006FAF1F</string>
- <string>226875E114B51C4B006FAF1F</string>
- <string>226875E214B51C4B006FAF1F</string>
- <string>226875E314B51C4B006FAF1F</string>
+ <string>2282731A14BA65240017A99F</string>
+ <string>2282731B14BA65240017A99F</string>
+ <string>2282731C14BA65240017A99F</string>
+ <string>2282731D14BA65240017A99F</string>
+ <string>2282731E14BA65240017A99F</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>165 132 694 422 0 0 1024 578 </string>
+ <string>165 649 694 422 0 0 1024 1258 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
@@ -917,6 +875,8 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -927,18 +887,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {650, 209}}</string>
+ <string>{{0, 0}, {1024, 503}}</string>
<key>RubberWindowFrame</key>
- <string>24 278 650 250 0 0 1024 578 </string>
+ <string>-1024 56 1024 544 -1024 0 1024 600 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
<key>Proportion</key>
- <string>209pt</string>
+ <string>503pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>209pt</string>
+ <string>503pt</string>
</dict>
</array>
<key>Name</key>
@@ -952,17 +912,17 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>226875E614B51C4B006FAF1F</string>
+ <string>2282731F14BA65240017A99F</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>24 278 650 250 0 0 1024 578 </string>
+ <string>-1024 56 1024 544 -1024 0 1024 600 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>Identifier</key>
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 */ = {
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 7e448fd..2094c34 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -74,8 +74,8 @@ void testApp::draw(){
//--------------------------------------------------------------
void testApp::keyPressed(int key){
- //todo: 'both' mode
- views[activeView].keyPressed(key);
+ if (activeView<0) for (int i=0;i<numViews;i++) views[i].keyPressed(key);
+ else if (activeView<numViews) views[activeView].keyPressed(key);
switch (key) {
case '8':
mode=CALIBRATE;
@@ -87,18 +87,23 @@ void testApp::keyPressed(int key){
mode=NOTHING;
break;
case '1':
- activeView=0;
+ activeView=-1;
break;
case '2':
+ activeView=0;
+ break;
+ case '3':
activeView=1;
break;
+
}
}
//--------------------------------------------------------------
void testApp::keyReleased(int key){
- views[activeView].keyReleased(key);
+ if (activeView<0) for (int i=0;i<numViews;i++) views[i].keyReleased(key);
+ else if (activeView<numViews) views[activeView].keyReleased(key);
}
//--------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 13:13:55 +0000