Permalink
Browse files

compiles and runs!

  • Loading branch information...
1 parent 9384300 commit b5db353170eb29ae7d1acd2f09b2cb08aa199e95 @RandomEtc committed Aug 22, 2010
View
84 modestMapsExample/modestMapsExample.xcodeproj/tom.mode1v3
@@ -229,8 +229,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -266,18 +264,11 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>E4B69B4A0A3A1720003C02F2</string>
- <string>E4B69E1C0A3A1BDC003C02F2</string>
- <string>E20FF694121F4F0D00F42001</string>
- <string>E20FF76812205FC900F42001</string>
- <string>E20FF6BF121F4F4D00F42001</string>
- <string>E20FF6BD121F4F4700F42001</string>
- <string>E20FF6BC121F4F4300F42001</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>28</integer>
<integer>3</integer>
<integer>0</integer>
</array>
@@ -313,32 +304,33 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>testApp.cpp</string>
+ <string>Map.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>testApp.cpp</string>
+ <string>Map.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>E20FF9B31220FA3000F42001</string>
+ <string>E20FF9F9122100A900F42001</string>
<key>history</key>
<array>
<string>E20FF6FF121F5C4300F42001</string>
<string>E20FF7441220542A00F42001</string>
<string>E20FF7B61220DA3A00F42001</string>
<string>E20FF7B71220DA3A00F42001</string>
<string>E20FF8391220E55E00F42001</string>
- <string>E20FF8B21220EC6F00F42001</string>
<string>E20FF8B31220EC6F00F42001</string>
<string>E20FF8B41220EC6F00F42001</string>
<string>E20FF8B61220EC6F00F42001</string>
@@ -347,14 +339,16 @@
<string>E20FF8FE1220F0F300F42001</string>
<string>E20FF8FF1220F0F300F42001</string>
<string>E20FF9001220F0F300F42001</string>
- <string>E20FF9011220F0F300F42001</string>
- <string>E20FF9291220F26000F42001</string>
- <string>E20FF97E1220F93900F42001</string>
- <string>E20FF98B1220F99000F42001</string>
<string>E20FF9B01220FA3000F42001</string>
<string>E20FF9B11220FA3000F42001</string>
- <string>E20FF9B21220FA3000F42001</string>
- <string>E20FF97F1220F93900F42001</string>
+ <string>E20FF9BF1220FFB000F42001</string>
+ <string>E20FF9C01220FFB000F42001</string>
+ <string>E20FF9C11220FFB000F42001</string>
+ <string>E20FF9C21220FFB000F42001</string>
+ <string>E20FF9C41220FFB000F42001</string>
+ <string>E20FF9F6122100A900F42001</string>
+ <string>E20FF9F7122100A900F42001</string>
+ <string>E20FF9F8122100A900F42001</string>
</array>
</dict>
<key>SplitCount</key>
@@ -366,14 +360,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {731, 346}}</string>
+ <string>{{0, 0}, {731, 335}}</string>
<key>RubberWindowFrame</key>
<string>240 115 1024 763 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>346pt</string>
+ <string>335pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -386,14 +380,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 351}, {731, 371}}</string>
+ <string>{{0, 340}, {731, 382}}</string>
<key>RubberWindowFrame</key>
<string>240 115 1024 763 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>371pt</string>
+ <string>382pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -412,9 +406,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>E20FF9B41220FA3000F42001</string>
+ <string>E20FF9FA122100A900F42001</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>E20FF9B51220FA3000F42001</string>
+ <string>E20FF9FB122100A900F42001</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -552,6 +546,12 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>E20FF9FC122100A900F42001</string>
+ <string>E20FF9FD122100A900F42001</string>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <string>E20FF9FE122100A900F42001</string>
+ <string>E20FF9FF122100A900F42001</string>
<string>E212B288121E53AE0097DE49</string>
<string>/Users/tom/Documents/Code/OpenFrameworks/openFrameworks/apps/modestMaps/modestMapsExample/modestMapsExample.xcodeproj</string>
</array>
@@ -572,12 +572,14 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>Map.cpp</string>
+ <string>TileLoader.cpp</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -633,7 +635,7 @@
<key>TableOfContents</key>
<array>
<string>E212B288121E53AE0097DE49</string>
- <string>E20FF99E1220F9A000F42001</string>
+ <string>E20FF9EE122100A100F42001</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -677,8 +679,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {316, 198}}</string>
- <string>{{316, 0}, {378, 198}}</string>
+ <string>{{0, 0}, {316, 201}}</string>
+ <string>{{316, 0}, {378, 201}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -693,8 +695,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {694, 198}}</string>
- <string>{{0, 198}, {694, 183}}</string>
+ <string>{{0, 0}, {694, 201}}</string>
+ <string>{{0, 201}, {694, 180}}</string>
</array>
</dict>
</dict>
@@ -727,7 +729,7 @@
<real>148</real>
</array>
<key>Frame</key>
- <string>{{316, 0}, {378, 198}}</string>
+ <string>{{316, 0}, {378, 201}}</string>
<key>RubberWindowFrame</key>
<string>353 369 694 422 0 0 1440 878 </string>
</dict>
@@ -755,13 +757,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>E20FF7591220599100F42001</string>
+ <string>E20FF9EF122100A100F42001</string>
<string>1C162984064C10D400B95A72</string>
- <string>E20FF75A1220599100F42001</string>
- <string>E20FF75B1220599100F42001</string>
- <string>E20FF75C1220599100F42001</string>
- <string>E20FF75D1220599100F42001</string>
- <string>E20FF75E1220599100F42001</string>
+ <string>E20FF9F0122100A100F42001</string>
+ <string>E20FF9F1122100A100F42001</string>
+ <string>E20FF9F2122100A100F42001</string>
+ <string>E20FF9F3122100A100F42001</string>
+ <string>E20FF9F4122100A100F42001</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -892,7 +894,7 @@
<key>Frame</key>
<string>{{0, 0}, {650, 209}}</string>
<key>RubberWindowFrame</key>
- <string>467 659 650 250 0 0 1680 1028 </string>
+ <string>358 534 650 250 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -915,13 +917,13 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>E20FF690121F4EF800F42001</string>
+ <string>E20FF9F5122100A100F42001</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>467 659 650 250 0 0 1680 1028 </string>
+ <string>358 534 650 250 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
View
382 modestMapsExample/modestMapsExample.xcodeproj/tom.pbxuser
@@ -4,31 +4,31 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {670, 611}}";
sepNavSelRange = "{128, 0}";
- sepNavVisRange = "{488, 618}";
+ sepNavVisRange = "{435, 664}";
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
E20FF698121F4F0D00F42001 /* AbstractProjection.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {677, 572}}";
+ sepNavIntBoundsRect = "{{0, 0}, {670, 598}}";
sepNavSelRange = "{149, 0}";
- sepNavVisRange = "{0, 656}";
+ sepNavVisRange = "{0, 619}";
sepNavWindowFrame = "{{216, 60}, {1197, 818}}";
};
};
E20FF69A121F4F0D00F42001 /* Coordinate.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {726, 858}}";
- sepNavSelRange = "{1471, 7}";
- sepNavVisRange = "{0, 690}";
+ sepNavIntBoundsRect = "{{0, 0}, {859, 910}}";
+ sepNavSelRange = "{748, 0}";
+ sepNavVisRange = "{288, 814}";
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
E20FF69C121F4F0D00F42001 /* Map.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {670, 1820}}";
- sepNavSelRange = "{1538, 0}";
- sepNavVisRange = "{1304, 591}";
+ sepNavIntBoundsRect = "{{0, 0}, {1138, 1833}}";
+ sepNavSelRange = "{2901, 0}";
+ sepNavVisRange = "{1795, 1149}";
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
@@ -190,16 +190,6 @@
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
- E20FF8B21220EC6F00F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF69A121F4F0D00F42001 /* Coordinate.h */;
- name = "Coordinate.h: 65";
- rLen = 7;
- rLoc = 1471;
- rType = 0;
- vrLen = 690;
- vrLoc = 0;
- };
E20FF8B31220EC6F00F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = E20FF6A8121F4F0D00F42001 /* Point2d.h */;
@@ -239,9 +229,9 @@
};
E20FF8FA1220F0D100F42001 /* TileLoader.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {670, 314}}";
- sepNavSelRange = "{447, 0}";
- sepNavVisRange = "{0, 471}";
+ sepNavIntBoundsRect = "{{0, 0}, {614, 247}}";
+ sepNavSelRange = "{213, 0}";
+ sepNavVisRange = "{74, 415}";
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
@@ -295,55 +285,42 @@
vrLen = 216;
vrLoc = 0;
};
- E20FF9011220F0F300F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF698121F4F0D00F42001 /* AbstractProjection.h */;
- name = "AbstractProjection.h: 7";
- rLen = 0;
- rLoc = 149;
- rType = 0;
- vrLen = 656;
- vrLoc = 0;
- };
- E20FF9291220F26000F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF696121F4F0D00F42001 /* AbstractMapProvider.h */;
- name = "AbstractMapProvider.h: 6";
- rLen = 0;
- rLoc = 128;
- rType = 0;
- vrLen = 618;
- vrLoc = 488;
- };
E20FF9691220F45600F42001 /* Map.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {621, 5018}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 410}";
+ sepNavIntBoundsRect = "{{0, 0}, {929, 4979}}";
+ sepNavSelRange = "{3662, 0}";
+ sepNavVisRange = "{3305, 883}";
sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
};
};
- E20FF97D1220F93900F42001 /* PBXTextBookmark */ = {
+ E20FF9A11220F9C100F42001 /* stl_function.h */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = stl_function.h;
+ path = "/usr/include/c++/4.2.1/bits/stl_function.h";
+ sourceTree = "<absolute>";
+ };
+ E20FF9B01220FA3000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
- name = "TileLoader.cpp: 3";
+ fRef = E20FF76B122062F300F42001 /* TileLoader.h */;
+ name = "TileLoader.h: 8";
rLen = 0;
- rLoc = 73;
+ rLoc = 125;
rType = 0;
- vrLen = 469;
- vrLoc = 0;
+ vrLen = 444;
+ vrLoc = 20;
};
- E20FF97E1220F93900F42001 /* PBXTextBookmark */ = {
+ E20FF9B11220FA3000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF69C121F4F0D00F42001 /* Map.h */;
- name = "Map.h: 72";
+ fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
+ name = "TileLoader.cpp: 17";
rLen = 0;
- rLoc = 1538;
+ rLoc = 465;
rType = 0;
- vrLen = 591;
- vrLoc = 1304;
+ vrLen = 471;
+ vrLoc = 0;
};
- E20FF97F1220F93900F42001 /* PBXTextBookmark */ = {
+ E20FF9BF1220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
name = "testApp.cpp: 6";
@@ -353,195 +330,169 @@
vrLen = 670;
vrLoc = 0;
};
- E20FF98B1220F99000F42001 /* PBXTextBookmark */ = {
+ E20FF9C01220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF9691220F45600F42001 /* Map.cpp */;
- name = "Map.cpp: 382";
- rLen = 10;
- rLoc = 10783;
+ fRef = E20FF696121F4F0D00F42001 /* AbstractMapProvider.h */;
+ name = "AbstractMapProvider.h: 6";
+ rLen = 0;
+ rLoc = 128;
rType = 0;
- vrLen = 771;
- vrLoc = 10080;
+ vrLen = 664;
+ vrLoc = 435;
};
- E20FF98C1220F99000F42001 /* PBXTextBookmark */ = {
+ E20FF9C11220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF76B122062F300F42001 /* TileLoader.h */;
- rLen = 1;
- rLoc = 10;
- rType = 1;
+ fRef = E20FF698121F4F0D00F42001 /* AbstractProjection.h */;
+ name = "AbstractProjection.h: 7";
+ rLen = 0;
+ rLoc = 149;
+ rType = 0;
+ vrLen = 619;
+ vrLoc = 0;
};
- E20FF98D1220F99000F42001 /* PBXTextBookmark */ = {
+ E20FF9C21220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF76B122062F300F42001 /* TileLoader.h */;
- name = "TileLoader.h: 19";
+ fRef = E20FF9A11220F9C100F42001 /* stl_function.h */;
+ name = "stl_function.h: 227";
rLen = 0;
- rLoc = 336;
+ rLoc = 8207;
rType = 0;
- vrLen = 446;
- vrLoc = 20;
+ vrLen = 785;
+ vrLoc = 7720;
};
- E20FF99C1220F9A000F42001 /* XCBuildMessageTextBookmark */ = {
+ E20FF9C31220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- comments = "Request for member 'getTileUrls' in '((TileLoader*)this)->TileLoader::provider', which is of non-class type 'AbstractMapProvider*'";
- fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 5;
- rType = 1;
+ fRef = E20FF9691220F45600F42001 /* Map.cpp */;
+ name = "Map.cpp: 382";
+ rLen = 10;
+ rLoc = 10791;
+ rType = 0;
+ vrLen = 772;
+ vrLoc = 10079;
};
- E20FF99D1220F9A000F42001 /* PBXTextBookmark */ = {
+ E20FF9C41220FFB000F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
- name = "TileLoader.cpp: 6";
+ fRef = E20FF69A121F4F0D00F42001 /* Coordinate.h */;
+ name = "Coordinate.h: 33";
rLen = 0;
- rLoc = 113;
+ rLoc = 748;
rType = 0;
- vrLen = 431;
- vrLoc = 0;
+ vrLen = 814;
+ vrLoc = 288;
};
- E20FF9A11220F9C100F42001 /* stl_function.h */ = {
+ E20FF9C51220FFB000F42001 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = E20FF69C121F4F0D00F42001 /* Map.h */;
+ name = "Map.h: 47";
+ rLen = 7;
+ rLoc = 942;
+ rType = 0;
+ vrLen = 607;
+ vrLoc = 665;
+ };
+ E20FF9C61220FFB000F42001 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = E20FF9C71220FFB000F42001 /* ofImage.h */;
+ rLen = 1;
+ rLoc = 31;
+ rType = 1;
+ };
+ E20FF9C71220FFB000F42001 /* ofImage.h */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = stl_function.h;
- path = "/usr/include/c++/4.2.1/bits/stl_function.h";
+ name = ofImage.h;
+ path = /Users/tom/Documents/Code/OpenFrameworks/openFrameworks/libs/openFrameworks/graphics/ofImage.h;
sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {551, 9763}}";
- sepNavSelRange = "{8207, 0}";
- sepNavVisRange = "{7815, 427}";
- sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
- };
};
- E20FF9A31220F9E700F42001 /* stl_algo.h */ = {
+ E20FF9C81220FFB000F42001 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = E20FF9C91220FFB000F42001 /* ofImage.h */;
+ name = "ofImage.h: 32";
+ rLen = 36;
+ rLoc = 745;
+ rType = 0;
+ vrLen = 599;
+ vrLoc = 690;
+ };
+ E20FF9C91220FFB000F42001 /* ofImage.h */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = stl_algo.h;
- path = "/usr/include/c++/4.2.1/bits/stl_algo.h";
+ name = ofImage.h;
+ path = /Users/tom/Documents/Code/OpenFrameworks/openFrameworks/libs/openFrameworks/graphics/ofImage.h;
sourceTree = "<absolute>";
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1138, 71838}}";
- sepNavSelRange = "{7230, 0}";
- sepNavVisRange = "{6342, 1093}";
- sepNavWindowFrame = "{{15, 60}, {1197, 818}}";
+ sepNavIntBoundsRect = "{{0, 0}, {670, 1690}}";
+ sepNavSelRange = "{745, 36}";
+ sepNavVisRange = "{690, 598}";
};
};
- E20FF9A51220FA0B00F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
- name = "TileLoader.cpp: 6";
- rLen = 0;
- rLoc = 113;
- rType = 0;
- vrLen = 432;
- vrLoc = 0;
- };
- E20FF9A61220FA0B00F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF9A31220F9E700F42001 /* stl_algo.h */;
- name = "stl_algo.h: 208";
- rLen = 0;
- rLoc = 6795;
- rType = 0;
- vrLen = 330;
- vrLoc = 6574;
- };
- E20FF9A71220FA0B00F42001 /* PBXTextBookmark */ = {
+ E20FF9EB122100A100F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF9A11220F9C100F42001 /* stl_function.h */;
- name = "stl_function.h: 227";
+ fRef = E20FF9691220F45600F42001 /* Map.cpp */;
+ name = "Map.cpp: 364";
rLen = 0;
- rLoc = 8207;
+ rLoc = 10219;
rType = 0;
- vrLen = 443;
- vrLoc = 7792;
+ vrLen = 510;
+ vrLoc = 10054;
};
- E20FF9A81220FA0B00F42001 /* XCBuildMessageTextBookmark */ = {
+ E20FF9EC122100A100F42001 /* XCBuildMessageTextBookmark */ = {
isa = PBXTextBookmark;
- comments = "Compile /Users/tom/Documents/Code/OpenFrameworks/openFrameworks/apps/modestMaps/modestMapsExample/src/modestmaps/Map.cpp";
- fRef = E20FF9691220F45600F42001 /* Map.cpp */;
+ comments = "No matching function for call to 'Map::tileDone(Coordinate&, ofImage&)'";
+ fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 0;
- rLoc = 0;
+ rLen = 1;
+ rLoc = 16;
rType = 1;
};
- E20FF9A91220FA0B00F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF9691220F45600F42001 /* Map.cpp */;
- name = "Map.cpp: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 410;
- vrLoc = 0;
- };
- E20FF9B01220FA3000F42001 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = E20FF76B122062F300F42001 /* TileLoader.h */;
- name = "TileLoader.h: 8";
- rLen = 0;
- rLoc = 125;
- rType = 0;
- vrLen = 444;
- vrLoc = 20;
- };
- E20FF9B11220FA3000F42001 /* PBXTextBookmark */ = {
+ E20FF9ED122100A100F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = E20FF8FA1220F0D100F42001 /* TileLoader.cpp */;
- name = "TileLoader.cpp: 17";
+ name = "TileLoader.cpp: 8";
rLen = 0;
- rLoc = 447;
+ rLoc = 213;
rType = 0;
- vrLen = 471;
- vrLoc = 0;
+ vrLen = 415;
+ vrLoc = 74;
};
- E20FF9B21220FA3000F42001 /* PBXTextBookmark */ = {
+ E20FF9F6122100A900F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF9A11220F9C100F42001 /* stl_function.h */;
- name = "stl_function.h: 223";
- rLen = 0;
- rLoc = 8115;
+ fRef = E20FF9C91220FFB000F42001 /* ofImage.h */;
+ name = "ofImage.h: 32";
+ rLen = 36;
+ rLoc = 745;
rType = 0;
- vrLen = 785;
- vrLoc = 7720;
+ vrLen = 598;
+ vrLoc = 690;
};
- E20FF9B31220FA3000F42001 /* PBXTextBookmark */ = {
+ E20FF9F7122100A900F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
- name = "testApp.cpp: 6";
+ fRef = E20FF69C121F4F0D00F42001 /* Map.h */;
+ name = "Map.h: 46";
rLen = 0;
- rLoc = 160;
+ rLoc = 916;
rType = 0;
- vrLen = 670;
- vrLoc = 0;
+ vrLen = 597;
+ vrLoc = 678;
};
- E20FF9B61220FADA00F42001 /* PBXTextBookmark */ = {
+ E20FF9F8122100A900F42001 /* XCBuildMessageTextBookmark */ = {
isa = PBXTextBookmark;
+ comments = "Conversion from 'ofImage*' to non-scalar type 'ofImage' requested";
fRef = E20FF9691220F45600F42001 /* Map.cpp */;
- name = "Map.cpp: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 410;
- vrLoc = 0;
- };
- E20FF9B71220FADA00F42001 /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "No match for 'operator<' in '__x < __y'";
- fRef = E20FF9A11220F9C100F42001 /* stl_function.h */;
fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
- rLoc = 226;
+ rLoc = 124;
rType = 1;
};
- E20FF9B81220FADA00F42001 /* PBXTextBookmark */ = {
+ E20FF9F9122100A900F42001 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = E20FF9A11220F9C100F42001 /* stl_function.h */;
- name = "stl_function.h: 227";
+ fRef = E20FF9691220F45600F42001 /* Map.cpp */;
+ name = "Map.cpp: 125";
rLen = 0;
- rLoc = 8207;
+ rLoc = 3662;
rType = 0;
- vrLen = 427;
- vrLoc = 7815;
+ vrLen = 883;
+ vrLoc = 3305;
};
E212B261121E539F0097DE49 /* modestMapsExample */ = {
isa = PBXExecutable;
@@ -648,16 +599,15 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 304150932;
- PBXWorkspaceStateSaveDate = 304150932;
+ PBXPerProjectTemplateStateSaveDate = 304152501;
+ PBXWorkspaceStateSaveDate = 304152501;
};
perUserProjectItems = {
E20FF6FF121F5C4300F42001 = E20FF6FF121F5C4300F42001 /* PBXTextBookmark */;
E20FF7441220542A00F42001 = E20FF7441220542A00F42001 /* PBXTextBookmark */;
E20FF7B61220DA3A00F42001 = E20FF7B61220DA3A00F42001 /* PBXTextBookmark */;
E20FF7B71220DA3A00F42001 = E20FF7B71220DA3A00F42001 /* PBXTextBookmark */;
E20FF8391220E55E00F42001 = E20FF8391220E55E00F42001 /* PBXTextBookmark */;
- E20FF8B21220EC6F00F42001 = E20FF8B21220EC6F00F42001 /* PBXTextBookmark */;
E20FF8B31220EC6F00F42001 = E20FF8B31220EC6F00F42001 /* PBXTextBookmark */;
E20FF8B41220EC6F00F42001 = E20FF8B41220EC6F00F42001 /* PBXTextBookmark */;
E20FF8B61220EC6F00F42001 = E20FF8B61220EC6F00F42001 /* PBXTextBookmark */;
@@ -666,28 +616,24 @@
E20FF8FE1220F0F300F42001 = E20FF8FE1220F0F300F42001 /* PBXTextBookmark */;
E20FF8FF1220F0F300F42001 = E20FF8FF1220F0F300F42001 /* PBXTextBookmark */;
E20FF9001220F0F300F42001 = E20FF9001220F0F300F42001 /* PBXTextBookmark */;
- E20FF9011220F0F300F42001 = E20FF9011220F0F300F42001 /* PBXTextBookmark */;
- E20FF9291220F26000F42001 = E20FF9291220F26000F42001 /* PBXTextBookmark */;
- E20FF97D1220F93900F42001 = E20FF97D1220F93900F42001 /* PBXTextBookmark */;
- E20FF97E1220F93900F42001 = E20FF97E1220F93900F42001 /* PBXTextBookmark */;
- E20FF97F1220F93900F42001 = E20FF97F1220F93900F42001 /* PBXTextBookmark */;
- E20FF98B1220F99000F42001 = E20FF98B1220F99000F42001 /* PBXTextBookmark */;
- E20FF98C1220F99000F42001 = E20FF98C1220F99000F42001 /* PBXTextBookmark */;
- E20FF98D1220F99000F42001 = E20FF98D1220F99000F42001 /* PBXTextBookmark */;
- E20FF99C1220F9A000F42001 /* XCBuildMessageTextBookmark */ = E20FF99C1220F9A000F42001 /* XCBuildMessageTextBookmark */;
- E20FF99D1220F9A000F42001 /* PBXTextBookmark */ = E20FF99D1220F9A000F42001 /* PBXTextBookmark */;
- E20FF9A51220FA0B00F42001 /* PBXTextBookmark */ = E20FF9A51220FA0B00F42001 /* PBXTextBookmark */;
- E20FF9A61220FA0B00F42001 /* PBXTextBookmark */ = E20FF9A61220FA0B00F42001 /* PBXTextBookmark */;
- E20FF9A71220FA0B00F42001 /* PBXTextBookmark */ = E20FF9A71220FA0B00F42001 /* PBXTextBookmark */;
- E20FF9A81220FA0B00F42001 /* XCBuildMessageTextBookmark */ = E20FF9A81220FA0B00F42001 /* XCBuildMessageTextBookmark */;
- E20FF9A91220FA0B00F42001 /* PBXTextBookmark */ = E20FF9A91220FA0B00F42001 /* PBXTextBookmark */;
- E20FF9B01220FA3000F42001 /* PBXTextBookmark */ = E20FF9B01220FA3000F42001 /* PBXTextBookmark */;
- E20FF9B11220FA3000F42001 /* PBXTextBookmark */ = E20FF9B11220FA3000F42001 /* PBXTextBookmark */;
- E20FF9B21220FA3000F42001 /* PBXTextBookmark */ = E20FF9B21220FA3000F42001 /* PBXTextBookmark */;
- E20FF9B31220FA3000F42001 /* PBXTextBookmark */ = E20FF9B31220FA3000F42001 /* PBXTextBookmark */;
- E20FF9B61220FADA00F42001 /* PBXTextBookmark */ = E20FF9B61220FADA00F42001 /* PBXTextBookmark */;
- E20FF9B71220FADA00F42001 /* XCBuildMessageTextBookmark */ = E20FF9B71220FADA00F42001 /* XCBuildMessageTextBookmark */;
- E20FF9B81220FADA00F42001 /* PBXTextBookmark */ = E20FF9B81220FADA00F42001 /* PBXTextBookmark */;
+ E20FF9B01220FA3000F42001 = E20FF9B01220FA3000F42001 /* PBXTextBookmark */;
+ E20FF9B11220FA3000F42001 = E20FF9B11220FA3000F42001 /* PBXTextBookmark */;
+ E20FF9BF1220FFB000F42001 = E20FF9BF1220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C01220FFB000F42001 = E20FF9C01220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C11220FFB000F42001 = E20FF9C11220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C21220FFB000F42001 = E20FF9C21220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C31220FFB000F42001 = E20FF9C31220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C41220FFB000F42001 = E20FF9C41220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C51220FFB000F42001 = E20FF9C51220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C61220FFB000F42001 = E20FF9C61220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9C81220FFB000F42001 = E20FF9C81220FFB000F42001 /* PBXTextBookmark */;
+ E20FF9EB122100A100F42001 /* PBXTextBookmark */ = E20FF9EB122100A100F42001 /* PBXTextBookmark */;
+ E20FF9EC122100A100F42001 /* XCBuildMessageTextBookmark */ = E20FF9EC122100A100F42001 /* XCBuildMessageTextBookmark */;
+ E20FF9ED122100A100F42001 /* PBXTextBookmark */ = E20FF9ED122100A100F42001 /* PBXTextBookmark */;
+ E20FF9F6122100A900F42001 /* PBXTextBookmark */ = E20FF9F6122100A900F42001 /* PBXTextBookmark */;
+ E20FF9F7122100A900F42001 /* PBXTextBookmark */ = E20FF9F7122100A900F42001 /* PBXTextBookmark */;
+ E20FF9F8122100A900F42001 /* XCBuildMessageTextBookmark */ = E20FF9F8122100A900F42001 /* XCBuildMessageTextBookmark */;
+ E20FF9F9122100A900F42001 /* PBXTextBookmark */ = E20FF9F9122100A900F42001 /* PBXTextBookmark */;
};
sourceControlManager = E212B28A121E53AF0097DE49 /* Source Control */;
userBuildSettings = {
View
5 modestMapsExample/src/modestmaps/Coordinate.h
@@ -27,6 +27,11 @@ class Coordinate {
{
return c.row == row && c.column == column && c.zoom == zoom;
}
+
+ bool operator < (const Coordinate &c) const
+ {
+ return zoom < c.zoom || (zoom == c.zoom && row < c.row) || (zoom == c.zoom && row == c.row && column < c.column);
+ }
Coordinate container() {
return Coordinate(floor(row), floor(column), zoom);
View
16 modestMapsExample/src/modestmaps/Map.cpp
@@ -122,11 +122,11 @@ void Map::draw() {
}
if (images.count(coord) > 0) {
- ofImage tile = images[coord];
- tile.draw(coord.column*TILE_SIZE,coord.row*TILE_SIZE,TILE_SIZE,TILE_SIZE);
+ ofImage *tile = images[coord];
+ tile->draw(coord.column*TILE_SIZE,coord.row*TILE_SIZE,TILE_SIZE,TILE_SIZE);
// TODO: must be a cleaner C++ way to do this?
// we want this image to be at the end of recentImages, if it's already there we'll remove it and then add it again
- vector<ofImage>::iterator result = find(recentImages.begin(), recentImages.end(), tile);
+ vector<ofImage*>::iterator result = find(recentImages.begin(), recentImages.end(), tile);
if (result != recentImages.end()) {
recentImages.erase(result);
}
@@ -157,11 +157,11 @@ void Map::draw() {
recentImages.erase(recentImages.begin(), recentImages.end()-MAX_IMAGES_TO_KEEP);
//images.values().retainAll(recentImages);
// TODO: re-think the stl collections used so that a simpler retainAll equivalent is available
- map<Coordinate,ofImage>::iterator iter = images.begin();
- map<Coordinate,ofImage>::iterator endIter = images.end();
+ map<Coordinate,ofImage*>::iterator iter = images.begin();
+ map<Coordinate,ofImage*>::iterator endIter = images.end();
for (; iter != endIter;) {
- ofImage tile = iter->second;
- vector<ofImage>::iterator result = find(recentImages.begin(), recentImages.end(), tile);
+ ofImage* tile = iter->second;
+ vector<ofImage*>::iterator result = find(recentImages.begin(), recentImages.end(), tile);
if (result != recentImages.end()) {
images.erase(iter++);
}
@@ -361,7 +361,7 @@ void Map::grabTile(Coordinate coord) {
// TODO: there could be issues when this is called from within a thread
// probably needs synchronizing on images / pending / queue
-void Map::tileDone(Coordinate coord, ofImage img) {
+void Map::tileDone(Coordinate coord, ofImage *img) {
// check if we're still waiting for this (new provider clears pending)
// also check if we got something
if (pending.count(coord) > 0) { // TODO: check the C++ equivalent of img != NULL) {
View
8 modestMapsExample/src/modestmaps/Map.h
@@ -40,11 +40,11 @@ class Map {
// loading tiles
map<Coordinate, TileLoader> pending;
// loaded tiles
- map<Coordinate, ofImage> images;
+ map<Coordinate, ofImage*> images;
// coords waiting to load
vector<Coordinate> queue;
- // a list of the most recent MAX_IMAGES_TO_KEEP PImages we've seen
- vector<ofImage> recentImages;
+ // a list of the most recent MAX_IMAGES_TO_KEEP ofImages we've seen
+ vector<ofImage*> recentImages;
// for sorting coordinates by zoom
//ZoomComparator zoomComparator;
@@ -132,7 +132,7 @@ class Map {
void grabTile(Coordinate coord);
- void tileDone(Coordinate coord, ofImage img);
+ void tileDone(Coordinate coord, ofImage *img);
void processQueue();
View
4 modestMapsExample/src/modestmaps/TileLoader.cpp
@@ -4,8 +4,8 @@
void TileLoader::threadedFunction() {
vector<string> urls = provider->getTileUrls(coord);
- ofImage img;
- img.loadImage(urls[0]);
+ ofImage* img = new ofImage();
+ img->loadImage(urls[0]);
/*if (img != null) {
for (int i = 1; i < urls.length; i++) {
PImage img2 = p.loadImage(urls[i], "unknown");

0 comments on commit b5db353

Please sign in to comment.