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

1088 Commits

Author SHA1 Message Date
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
40f859e482 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-osx.gypi
	platform/default/asset_request_libuv.cpp
	src/mbgl/storage/caching_http_file_source.cpp
	src/mbgl/storage/file_request.cpp
	src/mbgl/storage/file_request.hpp
	src/mbgl/storage/file_request_baton.hpp
 2014-12-18 12:39:36 +11:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files 
refs #579
 2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514 Make file request overridable by platform implementations 
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
 2014-12-17 12:14:32 +01:00
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05:00
Leith Bade
df2ebadaa3 Add missing CHECK_ERROR 2014-12-11 00:14:46 +11:00
Leith Bade
d599fc5504 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/prerendered_texture.cpp
 2014-12-11 00:09:26 +11:00
Konstantin Käfer
4ad28c931a only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them 2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
127600ef8c Fix unused param 2014-12-10 22:23:53 +11:00
Leith Bade
08b07c30a7 Reduce GL log spew 2014-12-10 22:15:41 +11:00
Leith Bade
0808485453 Use CHECK_ERROR on every GL call 2014-12-10 21:57:34 +11:00
Leith Bade
6bb1a5a146 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
 2014-12-10 19:22:25 +11:00
Leith Bade
69cd7268d7 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/http_request_baton_curl.cpp
 2014-12-10 19:13:21 +11:00
Konstantin Käfer
917c0168ab don't include the source file in every library 2014-12-09 14:14:11 +01:00
Konstantin Käfer
e11c073e51 report version number in user agent string 
refs #628
 2014-12-08 16:21:15 +01:00
Konstantin Käfer
1f91be988b add user agent header 
fixes #628
 2014-12-08 11:04:08 +01:00
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
b534520d6c Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/gl.hpp
	src/mbgl/platform/gl.cpp
	src/mbgl/shader/shader.cpp
 2014-12-07 00:29:20 +11:00
Leith Bade
67c1ff2f95 Fix rebase 2014-12-06 14:28:34 +11:00
Leith Bade
6df4e4a52c Load program binary extension on Linux 2014-12-06 14:21:08 +11:00
Leith Bade
eb8eee00c7 Remove line 2014-12-06 02:01:55 +11:00
Leith Bade
93ab4036e9 Fix commit 2014-12-06 00:50:23 +11: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
13564fb876 Create GlyphStore up front 2014-12-04 15:26:54 -08:00
John Firebaugh
0c9ae49b47 get/setBase may be called from main thread 2014-12-04 15:26:54 -08:00
John Firebaugh
36500b9f95 Add CachingHTTPFileSource::clearLoop() 
So loop state can be cleaned up in the appropriate thread.
This is a hack; loop needs to be externalized from Map.

Fixes #686
 2014-12-04 15:26:54 -08:00
John Firebaugh
16fe8e64c4 Move setReachability to CachingHTTPFileSource 2014-12-04 15:14:40 -08:00
Konstantin Käfer
3b190ddd0d fix build 2014-12-04 20:13:08 +01:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Leith Bade
20584a57dd Fix debug build 2014-12-04 23:21:23 +11: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
1c0396690e Fixup after merge 2014-12-04 22:39:38 +11: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
772f154e4d Fix Android crash 2014-12-04 01:51:17 +11:00
Leith Bade
14cdd9c96f Rename lots of things 2014-12-04 01:10:43 +11:00
Leith Bade
a26ef7f33d Remove TODOs 2014-12-03 23:22:25 +11:00
Leith Bade
08ce7157f1 Fix debug build 2014-12-03 22:58:33 +11:00
Leith Bade
31077a813c Don't use malloc 2014-12-03 22:17:42 +11:00
Leith Bade
0899b9182a Remove old TODO 2014-12-03 22:12:05 +11:00
Leith Bade
772fe9dcbc Fix make_unique 2014-12-03 22:10:55 +11:00
Leith Bade
94d34ce7ac Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/map/map.cpp
 2014-12-03 22:02:55 +11:00
Leith Bade
f090d6b264 Use uv::async and various other fixes 2014-12-03 21:57:55 +11:00