Commit Graph

689 Commits

Author SHA1 Message Date
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
artemp
9364fd7322 make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method to minimise number of mutex locking 2014-10-27 14:18:11 -04:00
Konstantin Käfer
f50d8bbf3a fix build with libuv 0.11 2014-10-27 12:17:52 -04:00
Konstantin Käfer
0e928b5204 make tests work 2014-10-24 17:44:51 +02:00
Konstantin Käfer
d299e58088 Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
Conflicts:
	Makefile
	ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a restructure gyp files 2014-10-24 16:40:08 +02:00
Konstantin Käfer
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
7d6feffd56 replace boost optional with mapbox optional 2014-10-22 16:29:10 +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
2f3952b305 fix compile warnings 2014-10-22 11:00:34 +02:00
Konstantin Käfer
3a39d69504 link boost when the boost variable is set 2014-10-22 10:45:50 +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
d54809b04a Fix log message filtering
Taking the sizeof a pointer doesn't give you the array length!
2014-10-17 12:03:43 -07:00
John Firebaugh
4e9688e430 Fix compiler warnings 2014-10-17 11:12:31 -07: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
91f40daa69 don't do concurrent access to a static member variable
in situations where the renderer is used from multiple threads, this causes memory corruption.

fixes mapbox/node-mapbox-gl-native#7
2014-10-08 15:27:33 +02:00
Konstantin Käfer
6b1a86c37c fix gcc cannot call member function without object error 2014-10-01 05:20:12 -07: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
a9039cf5d7 move file request baton to its own file 2014-09-30 17:29:09 +02:00
Konstantin Käfer
9e44c0eae8 add reachability 2014-09-29 14:02:42 +02:00
Konstantin Käfer
135f68e249 add retries in case of connection failures 2014-09-29 13:18:50 +02:00
Konstantin Käfer
46e06bf378 don't pass the loop through all function calls 2014-09-29 12:27:34 +02:00
Konstantin Käfer
b9628c8654 add etag support and if-none-match/if-modified-since to cocoa http handling 2014-09-26 16:10:39 +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
992d9ff051 add back CURL requesting 2014-09-24 16:19:47 +02:00
Konstantin Käfer
0fc1f66868 whitespace fixes 2014-09-24 16:16:30 +02:00
Konstantin Käfer
3f38c7650e add retry timers 2014-09-24 16:16:29 +02:00
Konstantin Käfer
daa22d6b0f use asynchronous worker termination
instead of waiting until all threads have joined, we are now supplying a callback that will be invoked once all threads have terminated. you can use this callback to free the worker struct
2014-09-24 16:16:29 +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
89cd310cf6 notifications on request cancellation 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
Konstantin Käfer
b94635f704 parse cache-control and last-modified headers 2014-09-24 16:12:03 +02:00
Konstantin Käfer
28446bed24 compress data and store type 2014-09-24 16:12:02 +02:00
Konstantin Käfer
34fe7dc627 add basic request caching with sqlite 2014-09-24 16:12:02 +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