Commit Graph

447 Commits

Author SHA1 Message Date
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
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
6c5331ee73 Add more detail to TileJSON error 2014-11-08 02:29:07 +11:00
Konstantin Käfer
3038cdbbf3 fix various issues in curl bindings related to tile cancelation 2014-11-06 13:05:51 +01:00
John Firebaugh
c151f12997 Implement v6 filters 2014-11-04 12:26:14 -08:00
Konstantin Käfer
7a13db9a86 do not crash for missing images 2014-10-30 11:58:16 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
artemp
fd2d8f48cb pass Tile::ID by const ref 2014-10-30 10:43:58 -04:00
artemp
665497672e access member variables directly inside class methods 2014-10-29 18:13:25 -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
artemp
92f99cbc16 remove commented out assert 2014-10-29 13:55:17 -04:00
artemp
3b5b15a4e4 store glyphAtlas by value in Map object, pass by ref
change hasData signiture to expect ```StyleLayer const&```
2014-10-29 13:44:26 -04:00
John Firebaugh
8ae0dcb5a4 Replace uv::rwlock with std::recursive_mutex
Fixes #491
2014-10-29 09:58:56 -04:00
John Firebaugh
da8aa391d0 Render map with a copy of TransformState 2014-10-29 09:58:56 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -04:00
Konstantin Käfer
f50d8bbf3a fix build with libuv 0.11 2014-10-27 12:17:52 -04:00
Konstantin Käfer
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
40a933ddce add missing header 2014-10-22 18:22:43 +02:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
087d04292a Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-22 15:18:30 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
253bbd1c5b New mason-based build system 2014-10-22 15:13:35 +02:00
Konstantin Käfer
5a87fb337d first attempt at using mason to install packages
[skip ci]
2014-10-20 17:55:49 +02:00
John Firebaugh
4603ca037c background-image support 2014-10-17 10:44:38 -07:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
2014-10-10 12:24:45 -04:00
Konstantin Käfer
d03b7aa31a properly ref/unref the handle and run the loop again for shutdown purposes 2014-10-01 13:26:49 +02:00
Mike Morris
848dccbcae make view active/inactive around Map::setup, don't leave active after view.resize() 2014-09-30 12:06:51 -04:00
Konstantin Käfer
8fcc74e253 fix headless tests 2014-09-30 17:29:10 +02:00
Konstantin Käfer
9e44c0eae8 add reachability 2014-09-29 14:02:42 +02:00
Mike Morris
3dec4933a9 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
Conflicts:
	common/headless_view.cpp
	test/headless.cpp
2014-09-24 15:58:52 -04:00
Mike Morris
8a19896c3a Merge branch 'master' into libuv010 2014-09-24 15:40:08 -04:00
Konstantin Käfer
1209744b38 use the default cache location on ios to avoid writing to unwritable file system locations 2014-09-24 17:08:44 +02:00
Konstantin Käfer
19129cbd02 make SourceInfo object noncopyable and use a shared_pointer for it 2014-09-24 16:16:29 +02:00
Konstantin Käfer
111fccb76c option to pass data parameter, and add more explanation 2014-09-24 16:14:10 +02:00
Konstantin Käfer
ba18c08524 add a callback to stop() to allow running the current thread's event loop 2014-09-24 16:14:10 +02:00
Konstantin Käfer
fd2b2e2082 use separate workers for tile parsing to avoid blocking the threadpool for other libuv actions 2014-09-24 16:14:09 +02:00
Konstantin Käfer
f26bb724dc use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness 2014-09-24 16:14:09 +02:00
Konstantin Käfer
6c526e5637 make sure all of our async handles are stopped before stopping the map thread 2014-09-24 16:14:09 +02:00
Konstantin Käfer
d9fc7708a2 do 304 requests and cache them in sqlite 2014-09-24 16:14:09 +02:00
John Firebaugh
896379daa5 Refactor tile cover to match JS 2014-09-22 13:39:43 -07:00