Commit Graph

1029 Commits

Author SHA1 Message Date
Leith Bade
0935cef9c3 Fix tests when using GL 3.0+ context 2014-12-02 21:40:23 +11:00
Leith Bade
cfb6e2752c Fix Linux build 2014-12-02 20:04:12 +11:00
Leith Bade
2b86522412 Share asset_request between platforms 2014-12-02 19:41:50 +11:00
Leith Bade
9a8c018a32 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-02 19:05:05 +11:00
Leith Bade
5ad094e823 Fix iOS compile 2014-12-02 03:43:04 +11:00
Leith Bade
2800f36142 Add debug markers and labels 2014-12-02 03:24:42 +11:00
Leith Bade
204700ff7e Stop mipmap allocation for textures 2014-12-02 02:29:07 +11:00
Leith Bade
763e636fd7 Improve formatting 2014-12-02 02:01:10 +11:00
Leith Bade
d27ede63fe Enable all messages 2014-12-02 01:57:18 +11:00
Leith Bade
2113e27990 Implement debug callback 2014-12-02 01:53:44 +11:00
Leith Bade
bbfe5d5ce4 Define GL callback func. Improve GL err macro. 2014-12-02 01:21:40 +11:00
Leith Bade
759e806516 Add KHR_debug definitions 2014-12-02 00:35:30 +11:00
Leith Bade
8ae2cd3985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp
2014-11-28 01:51:21 +11:00
Vincent Schüßler
49519ba7f3 Fix member shadowing warnings 2014-11-28 00:16:06 +11:00
Leith Bade
598df496a7 Log framebuffer errors 2014-11-28 00:11:37 +11:00
Leith Bade
eac887c1b8 Check for packed depth stencil 2014-11-28 00:11:37 +11:00
Leith Bade
705552c26e Quick fix for #608 2014-11-28 00:11:37 +11:00
John Firebaugh
7901706094 Use uv::async 2014-11-26 17:37:13 -08:00
John Firebaugh
f91322cf4a Remove unused 2014-11-26 16:34:03 -08:00
John Firebaugh
0d5e1339ef Remove vague comments 2014-11-26 16:08:10 -08:00
John Firebaugh
84c3191044 Eliminate Map::getActiveSources() 2014-11-26 16:04:22 -08:00
John Firebaugh
12bf2fd326 Inline Source::updateTiles() 2014-11-26 16:01:15 -08:00
John Firebaugh
78f11ae947 Fix destruction order 2014-11-26 15:13:14 -08:00
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