tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,603 Commits 3 Branches 22 Tags
69cd7268d783a5e449de38ab40dfe5a28fa76f64
Commit Graph

122 Commits

Author SHA1 Message Date
Leith Bade
0487b0c6a3 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/map/map.cpp
 2014-12-08 20:19:41 +11:00
John Firebaugh
de098591c5 Remove Map::cleanup and Painter::cleanup 
Both were noops.
 2014-12-06 14:08:40 -08:00
Leith Bade
de9eb00276 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp
 2014-12-05 23:16:49 +11:00
John Firebaugh
ff640132de Move setAccessToken to CachingHTTPFileSource 2014-12-04 17:03:23 -08:00
John Firebaugh
0a942b6f14 Change Map::stop to use std::function<void()> 
Fixes #685
 2014-12-04 15:58:04 -08:00
John Firebaugh
16fe8e64c4 Move setReachability to CachingHTTPFileSource 2014-12-04 15:14:40 -08:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Konstantin Käfer
b449b22abc remove use of std::to_string in favor of boost::lexical_cast 
std::to_string calls sprintf() internally, which is really slow
 2014-12-04 12:59:09 +01:00
Leith Bade
8f1754cf0a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp
 2014-12-04 22:19:46 +11:00
Konstantin Käfer
65451187f5 [performance] remove use of snprintf in hot path; it's pretty slow on iOS 2014-12-04 12:19:21 +01:00
John Firebaugh
57249ca32c Prefer stdlib to libuv (fixes #688) 2014-12-03 17:38:10 -08:00
Leith Bade
991a74774e Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
 2014-12-04 08:02:57 +11:00
Mike Morris
dac76a0f92 break out FileSource as an abstract class 
add CachingHTTPFileSource implementation
 2014-12-03 12:25:11 -05:00
Leith Bade
35b0e2bfbd Fix names in Map 2014-12-03 20:09:16 +11:00
Leith Bade
8762d5a9b6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
 2014-12-03 19:56:20 +11:00
John Firebaugh
a6522d4a5a Texturepool ⇢ TexturePool (fixes #655) 2014-12-02 12:24:25 -08:00
John Firebaugh
8fdf645e12 Adhere to naming conventions 2014-12-02 12:24:25 -08: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
John Firebaugh
7901706094 Use uv::async 2014-11-26 17:37:13 -08:00
John Firebaugh
84c3191044 Eliminate Map::getActiveSources() 2014-11-26 16:04:22 -08:00
John Firebaugh
01ecbaf51a Make Map::updateTiles() private 2014-11-26 16:01:51 -08:00
John Firebaugh
4ce94170c1 Remove unused 2014-11-26 16:01:36 -08:00
John Firebaugh
12bf2fd326 Inline Source::updateTiles() 2014-11-26 16:01:15 -08:00
John Firebaugh
80df07a5da Remove redundant access specifiers 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
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
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
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
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
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
John Firebaugh
c151f12997 Implement v6 filters 2014-11-04 12:26:14 -08:00
artemp
aaa8927169 remove unused and unimplemented method 2014-10-30 11:04:10 -04:00
artemp
fd2d8f48cb pass Tile::ID by const ref 2014-10-30 10:43:58 -04:00
artemp
9ff0d00912 store uv::loop as unique_ptr 2014-10-29 18:12:11 -04:00
artemp
6622a07ad8 simplify - remove before/afterParse and create Parser on stack in worker thread 2014-10-29 14:37:13 -04:00
artemp
2607a755af store spriteAtlas by value + make TileParser noncopyable 2014-10-29 14:09:06 -04:00