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
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
Justin R. Miller
a9470feb23
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
2014-10-27 17:02:24 -04:00
Justin R. Miller
e816d301bb
refs #509 : tickets good, inline TODO bad
2014-10-27 17:02:20 -04:00
Konstantin Käfer
f50d8bbf3a
fix build with libuv 0.11
2014-10-27 12:17:52 -04: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
Konstantin Käfer
97986f603f
we don't need a root_fbo function anymore
...
[skip ci]
2014-10-16 04:27:30 -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
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
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
Mike Morris
15564b81a3
Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown
...
Conflicts:
src/map/map.cpp
2014-09-10 18:53:20 -04:00
Leith Bade
71549e7b93
Adds the function Map::terminate() to allow all GL resources held
...
by the map to be released immediately.
Map::terminate() will call any GL functions on the current thread
without blocking or defering to the rendering thread.
This function allows a GL context to be destroyed and recreated
safely without having to delete the Map object.
Fixes mapbox/mapbox-gl-native#341
Conflicts:
include/llmr/renderer/painter.hpp
test/headless.cpp
2014-09-10 18:31:20 -04:00
Leith Bade
c004c03696
Add View::make_inactive() to remove context from rendering thread
...
View::make_inactive() is called just before termination of the
rendering thread. The implementation must clear the thread's GL
context.
This ensures there is no context still bound to a thread during
GL shutdown. This is needed as GL will not actually delete a
context until it is not active on any thread.
Fixes mapbox/mapbox-gl-native#340
Conflicts:
common/glfw_view.hpp
include/llmr/map/view.hpp
test/headless.cpp
2014-09-10 18:21:03 -04:00
Mike Morris
c32bb85248
Merge branch 'master' into libuv010
2014-09-09 17:06:22 -04:00
John Firebaugh
eb4f53cbed
SDF icon support ( fixes #404 )
2014-09-08 15:12:32 -07:00
Mike Morris
050b00cb58
Merge branch 'master' into libuv010
...
Conflicts:
setup-libraries.sh
2014-08-26 16:55:08 -04:00
