Commit Graph

2256 Commits

Author SHA1 Message Date
John Firebaugh
fdc988a4a0 Use unique_ptr 2014-11-26 15:13:14 -08:00
John Firebaugh
2cc5e01137 auto 2014-11-26 15:13:14 -08:00
John Firebaugh
167097936a Store SourceInfo as direct member 2014-11-26 15:13:14 -08:00
John Firebaugh
41e90b4150 Pass SourceInfo as reference 2014-11-26 15:13:14 -08:00
John Firebaugh
23b61f808c Eliminate remaining uses of Map in TileData 2014-11-26 15:13:14 -08:00
John Firebaugh
9af3b033bf Eliminate Map::getStyle() 2014-11-26 15:13:13 -08:00
John Firebaugh
d3ba1071cb Make Map::getSprite() private 2014-11-26 15:13:13 -08:00
John Firebaugh
576533b18c Eliminate Map::getTexturepool() 2014-11-26 15:13:13 -08:00
John Firebaugh
3aa15306f6 Map Map::getWorker() private 2014-11-26 15:13:13 -08:00
John Firebaugh
8c3e39a516 Eliminate Map::getGlyphStore() 2014-11-26 15:13:13 -08:00
John Firebaugh
8e33076bf1 Eliminate Map::getSpriteAtlas() 2014-11-26 15:13:13 -08:00
John Firebaugh
a5fe8ec3dc Eliminate Map::getGlyphAtlas() 2014-11-26 15:13:13 -08:00
Konstantin Käfer
1f067f1e9d add {prefix} to tile URL replacement token scheme
prefix is a 2 character hex code derived from the tile x/y
2014-11-26 17:58:23 +01:00
Vincent Schüßler
2b0cb4a518 Fix member shadowing warnings 2014-11-25 14:10:59 -08:00
Leith Bade
198a8eb455 Add dropdown to select map style 2014-11-23 16:06:50 +11:00
Leith Bade
bc7e97f37e Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/map/source.cpp
2014-11-23 09:45:17 +11:00
Leith Bade
78a667762a Swtitch to stdlib mutex and cond vars 2014-11-22 13:14:22 +11:00
Leith Bade
fb4e57e8a9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-22 09:25:23 +11:00
John Firebaugh
c3940cf082 Eliminate Map::getFileSource 2014-11-21 14:25:12 -08:00
John Firebaugh
9e971095d3 Pass FileSource by reference 2014-11-21 14:25:11 -08:00
John Firebaugh
a9b20fc09a Remove other rotation constraint (fixes #463) 2014-11-21 12:50:34 -08:00
Leith Bade
5b718d7fc9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	ios/mapbox-gl-cocoa
2014-11-21 20:36:55 +11:00
John Firebaugh
aaa1e3a6f1 Remove rotation constraints
This should be an iOS SDK option, not hard coded into
low-level renderering.

Fixes #458
2014-11-20 15:13:23 -08:00
Leith Bade
bc72a3f79f Fix typos 2014-11-20 20:23:38 +11:00
Jordan Hollinger
4e3ae54062 Add functionality to get default transition duration from native code. Use it to save and restore state. #617 2014-11-19 17:24:49 -08:00
Jordan Hollinger
a888e9b7f3 Add temporary applied classes list in map, in case they are set before style is loaded. #620 2014-11-19 15:17:38 -08:00
Leith Bade
69d42411ab Fix hand/crash in pause when rotating screen 2014-11-19 20:13:37 +11:00
Leith Bade
e52cf05ac3 Fix json string crash 2014-11-18 23:34:46 +11:00
Leith Bade
f0e4e27cd3 Read styles from APK 2014-11-17 23:17:22 +11:00
Leith Bade
aee724d6cf Create AssetRequest 2014-11-17 20:00:44 +11:00
Leith Bade
2aed807d4c Add coffeecatch to Map::run() 2014-11-16 20:04:36 +11:00
Leith Bade
0dd54c0379 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	platform/default/image.cpp
2014-11-12 23:16:56 +11:00
Konstantin Käfer
27cf24171a check library versions against header symbols in static initialization function
fixes #580
2014-11-12 12:12:01 +01:00
Leith Bade
6109102923 Remove left over test logs 2014-11-11 22:30:55 +11:00
Leith Bade
6b65aa62a1 Fix flixker after switch 2014-11-10 00:23:09 +11:00
Leith Bade
145296ac11 Actually remove read fill 2014-11-09 23:55:00 +11:00
Leith Bade
1e55c332cd Wait for pause
Tidy up
Remove red fill
2014-11-09 23:52:34 +11:00
Leith Bade
3696e05193 Add async asserts 2014-11-09 22:54:05 +11:00
Leith Bade
28d66bb6f8 Add Map::pause/resume
Fixed bug after switching apps
2014-11-09 22:36:37 +11:00
Leith Bade
b3e3c21129 Reduce calls to context swapping 2014-11-09 17:36:27 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Leith Bade
30a420d9a3 More tidying up 2014-11-08 22:59:16 +11:00
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Leith Bade
01ead83b39 Android mapbogl now loads maps!
(had to change JSON loading to http - temp fix)
2014-11-08 08:07:47 +11:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Leith Bade
6c5331ee73 Add more detail to TileJSON error 2014-11-08 02:29:07 +11:00
Leith Bade
585805a754 Add logging of http requests 2014-11-08 02:15:19 +11:00
Leith Bade
86f8f626f1 Change clear to red to debug tile loading 2014-11-07 01:40:05 +11:00
Konstantin Käfer
618a4a5785 add -Werror to os x as well 2014-11-06 14:18:52 +01:00
Konstantin Käfer
3038cdbbf3 fix various issues in curl bindings related to tile cancelation 2014-11-06 13:05:51 +01:00