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

252 Commits

Author SHA1 Message Date
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
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
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
214f99673f fix variable shadowing 2014-10-22 18:19:01 +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
5a87fb337d first attempt at using mason to install packages 
[skip ci]
 2014-10-20 17:55:49 +02: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
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
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
Mike Morris
65df83ce4c bump mapnik-packaging, remove unnecessary view.make_active calls 2014-09-19 16:16:44 -04:00
Mike Morris
9d369ec742 dont make_active when clearing buffers, call make_inactive at end of Map::prepare() 2014-09-16 18:00:52 -04:00
Mike Morris
57fb4b984d don't terminate after Map::run 2014-09-10 19:23:40 -04:00
Mike Morris
c03beb070b fix Map::terminate? 2014-09-10 19:15:03 -04: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
7a4c914d05 Move notify_map_change() from a global callback, to a callback in 
View.

This allows for their to me more than one Map object alive at a
time.

Fixes mapbox/mapbox-gl-native#346

Conflicts:
	common/glfw_view.hpp
	include/llmr/map/view.hpp
	include/mbgl/map/transform.hpp
	src/map/map.cpp
	src/map/transform.cpp
	test/headless.cpp
 2014-09-10 18:47:13 -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
c1280f0b38 Revert "coalesce texture uploads at the beginning of a frame" 
This reverts commit 8c2c7f769f.

See #454

Conflicts:
	src/geometry/glyph_atlas.cpp
	src/geometry/sprite_atlas.cpp
 2014-09-03 18:12:39 -07:00
Mike Morris
a8021e84f8 Merge branch 'master' into libuv010 2014-08-29 15:43:13 -04:00
John Firebaugh
c13cc4aa38 Record frame history in the correct place 
Fixes numerous issues with rendering tests.
 2014-08-28 16:43:03 -07:00
John Firebaugh
9f734ee61d background-opacity support 2014-08-28 10:43:53 -07:00
John Firebaugh
e2c2ab843e Render background with plain shader 2014-08-27 18:22:20 -07:00
Mike Morris
050b00cb58 Merge branch 'master' into libuv010 
Conflicts:
	setup-libraries.sh
 2014-08-26 16:55:08 -04:00
Konstantin Käfer
0f73a0192e Merge pull request #439 from mapbox/clipping 
Compute unique clip IDSs per tile
 2014-08-26 17:42:53 +02:00
Mike Morris
7ae3b8e8ee Merge branch 'master' into libuv010 2014-08-25 16:13:24 -04:00
John Firebaugh
3d9a293258 Support for Mapbox fontstack API 2014-08-22 17:14:51 -07:00
Lauren Budorick
0168612ed3 Load TileJSON; support inline TileJSON sources 
Fixes #412
Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
 2014-08-21 16:12:27 -07:00
Konstantin Käfer
863b4577e4 compute unique clip ids per tile, taking covering children into account 
fixes #206
fixes #220
refs #229
 2014-08-21 15:02:08 +02:00
Mike Morris
3466f36412 bump mapnik-packaging, conform to libuv 0.10 api 2014-08-20 19:43:29 -04:00
Konstantin Käfer
5a59b5f5fc fix warnings 2014-08-18 14:05:52 +02:00
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Konstantin Käfer
8c2c7f769f coalesce texture uploads at the beginning of a frame 2014-08-15 15:10:49 +02:00
Konstantin Käfer
18b1469e9e use unified RenderPass type 2014-08-12 15:24:02 +02:00
Konstantin Käfer
213b6ad4dc Merge branch 'master' into rasterize 
[skip ci]
 2014-08-12 15:12:31 +02:00
Konstantin Käfer
6f80264291 remove uv.h dependency from header files 2014-08-12 11:45:30 +02:00
Lauren Budorick
1ad2f26b9d VICTORY 2014-08-11 12:13:23 -07:00